full vignette added to the package, but excluded from buildin it in R…

…. GDAL added for Travis-CI
hzambran · Dec 18, 2019 · 1bb4a82 · 1bb4a82
1 parent 9fdb502
commit 1bb4a82
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,3 +2,5 @@ README.md
 .git
 .travis.yml
 _config.yml
+vignettes/RFmerge-RainfallExample-full.Rmd
+vignettes/RFmerge-RainfallExample-full.pdf
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+# Full vignette
+vignettes/RFmerge-RainfallExample-full.Rmd
+vignettes/RFmerge-RainfallExample-full.pdf
+
 # History files
 .Rhistory
 .Rapp.history

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -17,4 +17,4 @@ BugReports: https://github.com/hzambran/RFmerge/issues
 LazyLoad: yes
 NeedsCompilation: no
 Repository: CRAN
-Packaged: Wed Dec 18 16:37:21 -03 2019; hzambran
+Packaged: Wed Dec 18 17:37:21 -03 2019; hzambran
diff --git a/man/RFmerge-package.Rd b/man/RFmerge-package.Rd
@@ -23,7 +23,7 @@ Version: \tab 0.1-1\cr
 Date: \tab 2019-12-18\cr
 License: \tab GPL >= 3 \cr
 LazyLoad: \tab yes\cr
-Packaged: \tab Wed Dec 18 16:37:21 -03 2019; MZB \cr
+Packaged: \tab Wed Dec 18 17:37:21 -03 2019; MZB \cr
 BuiltUnder: \tab R version 3.6.2 (2019-12-12) -- "Dark and Stormy Night" ; x86_64-pc-linux-gnu (64-bit) \cr
 }
 %%~~ An overview of how to use the package, including the most important functions ~~

diff --git a/vignettes/RFmerge-RainfallExample-minimal.Rmd b/vignettes/RFmerge-RainfallExample-minimal.Rmd
@@ -353,8 +353,11 @@ nse.table  <- data.frame(ID=eval.gis[["ID"]], CHIRPS=tmp, PERSIANN_CDR=tmp, RF_M
 # Computing the NSE between the observed rainfall measured in each one of the raingauges 
 # of the training dataset and CHIRPSv2, PERSIANN-CDR, the merged product `rfmep`:
 
-for (i in 1:nsres) 
-  nse.table[, (i+1)] = NSE(sim= sres[[i]], obs = eval.ts)
+for (i in 1:nsres) {
+  ldates <- time(eval.ts)
+  lsim   <- zoo(sres[[i]], ldates)
+  nse.table[, (i+1)] = NSE(sim= lsim, obs= eval.ts)
+} # FOR end
 
 # Boxplot with a graphical comparison
 sres.cols <- c("powderblue", "palegoldenrod", "mediumseagreen")