prep release

bleutner · Nov 7, 2016 · ea20b2f · ea20b2f
1 parent 4116276
commit ea20b2f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 45 deletions.
diff --git a/NEWS b/NEWS
@@ -1,7 +1,7 @@
 RStoolbox 0.1.6
 =====================================
 Fixes:
-* fix import issue: deprecated functions from caret 
+* fix import issue: replace deprecated export from caret 
 
 RStoolbox 0.1.5
 =====================================

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,4 +1,4 @@
-# Generated by using Rcpp::compileAttributes() -> do not edit by hand
+# This file was generated by Rcpp::compileAttributes
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 classQA <- function(x, rcl) {

diff --git a/cran-comments.md b/cran-comments.md
@@ -3,7 +3,7 @@ This is a patch release, which fixes current CRAN errors on multiple platforms d
 ### CRAN checks
 ### Test environments
 * Ubuntu 16.10 64bit (release)
-* Debian 8.1 (devel, clang/UBSAN and VALGRIND) 
+* r-hub (devel, clang/UBSAN and VALGRIND) 
 * Ubuntu 12.04 (on travis-ci), (oldrel, release, devel)
 * Win-builder (release, devel)
 
@@ -22,4 +22,4 @@ none
 
 ### Changelog RStoolbox 0.1.6
 Fixes:
-* fixes current CRAN errors on multiple platforms due to updated caret package
+* fix import issue: replace deprecated export from caret 
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -1,4 +1,4 @@
-// Generated by using Rcpp::compileAttributes() -> do not edit by hand
+// This file was generated by Rcpp::compileAttributes
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 #include <RcppArmadillo.h>
@@ -10,122 +10,122 @@ using namespace Rcpp;
 IntegerVector classQA(NumericVector& x, NumericMatrix rcl);
 RcppExport SEXP RStoolbox_classQA(SEXP xSEXP, SEXP rclSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericVector& >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericMatrix >::type rcl(rclSEXP);
-    rcpp_result_gen = Rcpp::wrap(classQA(x, rcl));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(classQA(x, rcl));
+    return __result;
 END_RCPP
 }
 // entropyCpp
 NumericVector entropyCpp(NumericMatrix& x);
 RcppExport SEXP RStoolbox_entropyCpp(SEXP xSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix& >::type x(xSEXP);
-    rcpp_result_gen = Rcpp::wrap(entropyCpp(x));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(entropyCpp(x));
+    return __result;
 END_RCPP
 }
 // gainOffsetRescale
 NumericMatrix gainOffsetRescale(NumericMatrix x, NumericVector g, NumericVector o, LogicalVector clamp);
 RcppExport SEXP RStoolbox_gainOffsetRescale(SEXP xSEXP, SEXP gSEXP, SEXP oSEXP, SEXP clampSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericVector >::type g(gSEXP);
     Rcpp::traits::input_parameter< NumericVector >::type o(oSEXP);
     Rcpp::traits::input_parameter< LogicalVector >::type clamp(clampSEXP);
-    rcpp_result_gen = Rcpp::wrap(gainOffsetRescale(x, g, o, clamp));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(gainOffsetRescale(x, g, o, clamp));
+    return __result;
 END_RCPP
 }
 // normImageCpp
 NumericMatrix normImageCpp(NumericMatrix& x, NumericVector& M, NumericVector& S);
 RcppExport SEXP RStoolbox_normImageCpp(SEXP xSEXP, SEXP MSEXP, SEXP SSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix& >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericVector& >::type M(MSEXP);
     Rcpp::traits::input_parameter< NumericVector& >::type S(SSEXP);
-    rcpp_result_gen = Rcpp::wrap(normImageCpp(x, M, S));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(normImageCpp(x, M, S));
+    return __result;
 END_RCPP
 }
 // predKmeansCpp
 IntegerVector predKmeansCpp(NumericMatrix x, NumericMatrix centers);
 RcppExport SEXP RStoolbox_predKmeansCpp(SEXP xSEXP, SEXP centersSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericMatrix >::type centers(centersSEXP);
-    rcpp_result_gen = Rcpp::wrap(predKmeansCpp(x, centers));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(predKmeansCpp(x, centers));
+    return __result;
 END_RCPP
 }
 // predictMlcCpp
 arma::mat predictMlcCpp(NumericMatrix newdata, List model, int nclasses);
 RcppExport SEXP RStoolbox_predictMlcCpp(SEXP newdataSEXP, SEXP modelSEXP, SEXP nclassesSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix >::type newdata(newdataSEXP);
     Rcpp::traits::input_parameter< List >::type model(modelSEXP);
     Rcpp::traits::input_parameter< int >::type nclasses(nclassesSEXP);
-    rcpp_result_gen = Rcpp::wrap(predictMlcCpp(newdata, model, nclasses));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(predictMlcCpp(newdata, model, nclasses));
+    return __result;
 END_RCPP
 }
 // pwSimilarityCpp
 NumericVector pwSimilarityCpp(NumericMatrix& img, NumericMatrix& ref, int method);
 RcppExport SEXP RStoolbox_pwSimilarityCpp(SEXP imgSEXP, SEXP refSEXP, SEXP methodSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix& >::type img(imgSEXP);
     Rcpp::traits::input_parameter< NumericMatrix& >::type ref(refSEXP);
     Rcpp::traits::input_parameter< int >::type method(methodSEXP);
-    rcpp_result_gen = Rcpp::wrap(pwSimilarityCpp(img, ref, method));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(pwSimilarityCpp(img, ref, method));
+    return __result;
 END_RCPP
 }
 // rescaleImageCpp
 NumericMatrix rescaleImageCpp(NumericMatrix x, NumericVector scal, NumericVector xmin, NumericVector ymin);
 RcppExport SEXP RStoolbox_rescaleImageCpp(SEXP xSEXP, SEXP scalSEXP, SEXP xminSEXP, SEXP yminSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericVector >::type scal(scalSEXP);
     Rcpp::traits::input_parameter< NumericVector >::type xmin(xminSEXP);
     Rcpp::traits::input_parameter< NumericVector >::type ymin(yminSEXP);
-    rcpp_result_gen = Rcpp::wrap(rescaleImageCpp(x, scal, xmin, ymin));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(rescaleImageCpp(x, scal, xmin, ymin));
+    return __result;
 END_RCPP
 }
 // specSimC
 NumericMatrix specSimC(NumericMatrix& x, NumericMatrix& em);
 RcppExport SEXP RStoolbox_specSimC(SEXP xSEXP, SEXP emSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix& >::type x(xSEXP);
     Rcpp::traits::input_parameter< NumericMatrix& >::type em(emSEXP);
-    rcpp_result_gen = Rcpp::wrap(specSimC(x, em));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(specSimC(x, em));
+    return __result;
 END_RCPP
 }
 // spectralIndicesCpp
 NumericMatrix spectralIndicesCpp(NumericMatrix x, CharacterVector indices, const int redBand, const int blueBand, const int greenBand, const int nirBand, const int swir2Band, const int swir1Band, const double L, const double s, const double G, const double C1, const double C2, double Levi, const double swir2ccc, const double swir2cdiff, const double sf);
 RcppExport SEXP RStoolbox_spectralIndicesCpp(SEXP xSEXP, SEXP indicesSEXP, SEXP redBandSEXP, SEXP blueBandSEXP, SEXP greenBandSEXP, SEXP nirBandSEXP, SEXP swir2BandSEXP, SEXP swir1BandSEXP, SEXP LSEXP, SEXP sSEXP, SEXP GSEXP, SEXP C1SEXP, SEXP C2SEXP, SEXP LeviSEXP, SEXP swir2cccSEXP, SEXP swir2cdiffSEXP, SEXP sfSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::RObject __result;
+    Rcpp::RNGScope __rngScope;
     Rcpp::traits::input_parameter< NumericMatrix >::type x(xSEXP);
     Rcpp::traits::input_parameter< CharacterVector >::type indices(indicesSEXP);
     Rcpp::traits::input_parameter< const int >::type redBand(redBandSEXP);
@@ -143,7 +143,7 @@ BEGIN_RCPP
     Rcpp::traits::input_parameter< const double >::type swir2ccc(swir2cccSEXP);
     Rcpp::traits::input_parameter< const double >::type swir2cdiff(swir2cdiffSEXP);
     Rcpp::traits::input_parameter< const double >::type sf(sfSEXP);
-    rcpp_result_gen = Rcpp::wrap(spectralIndicesCpp(x, indices, redBand, blueBand, greenBand, nirBand, swir2Band, swir1Band, L, s, G, C1, C2, Levi, swir2ccc, swir2cdiff, sf));
-    return rcpp_result_gen;
+    __result = Rcpp::wrap(spectralIndicesCpp(x, indices, redBand, blueBand, greenBand, nirBand, swir2Band, swir1Band, L, s, G, C1, C2, Levi, swir2ccc, swir2cdiff, sf));
+    return __result;
 END_RCPP
 }