Final changes

andrewzm · Jan 14, 2015 · 2994437 · 2994437
1 parent 8764cba
commit 2994437
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/cran-comments.md b/cran-comments.md
@@ -3,16 +3,18 @@
 * Changed title to include the word 'image'. It now reads as 'Wavelet-Based Enhanced FDR for Signal Detection in Noisy Images'
 * Changed 'criteria' to 'criterion' in DESCRIPTION
 * Checked also on R-devel (OK) 
-* Put long-running vignettes in inst/doc. The minimal vignette then points the user to 'Other documentation' by typing in help(packages="EFDR"). These documents were generated using RMarkdown prior to submission of this package.
+* Put long-running tutorials in inst/doc. 
 
 ## Test environments
 * local ubuntu 14.04, R 3.1.2
 * Windows 8, R 3.1.2
 * win-builder (release)
 * R-devel
+* OS X Mavericks, R 3.1.2
 
 ## R CMD check results
-There were no ERRORs, WARNINGs or NOTEs. 
+There were no ERRORs, WARNINGs.
+There was one NOTE because this is a new submission.
 
 ## Downstream dependencies
 There are no downstream dependencies
diff --git a/inst/doc/EFDR_SST.Rmd b/inst/doc/EFDR_SST.Rmd
@@ -67,7 +67,7 @@ The only unusual things here are the setting of `n1` and `n2` which denote the i
 
 ```{r,cache=TRUE,results='hide'}
 ### Carry out EFDR on every frame
-cl <- makeCluster(parallel)
+cl <- makeCluster(2)
 registerDoParallel(cl)
 
 X <- foreach (t = unique(sst$time),.combine=rbind) %dopar% {
@@ -96,7 +96,7 @@ world<-map_data('world')%>%
   subset(long > 80 & long < 340)
 
 base_plot <- ggplot() + 
-	  theme(panel.background = element_rect(fill='white', colour='black'),
+    theme(panel.background = element_rect(fill='white', colour='black'),
              text = element_text(size=20),
              panel.grid.major =  element_line(colour = "light gray", size = 0.05),
              panel.border  = element_rect(fill=NA, colour='black')) + 
@@ -164,4 +164,4 @@ plot_time(12*12 + 12)
 ```{r,fig.height=6,fig.width=6,interval=1}
 #August 1997 strong El Niño event
 plot_time(27*12 + 8)
-```
+```
diff --git a/inst/doc/EFDR_SST.html b/inst/doc/EFDR_SST.html
diff --git a/vignettes/EFDR_documents.Rmd b/vignettes/EFDR_documents.Rmd
@@ -7,10 +7,9 @@ vignette: >
 ---
 
 Enhanced False Discovery Rate (EFDR) tutorials
-
 ===================
   **Andrew Zammit Mangion**
 
-  **04-Dec-2014**
+  **14-Jan-2015**
 
-  Since the main function of this package `test.efdr` is computationally intensive, we do not distribute vignettes so as not to bog down CRAN servers during vignette building. Instead we provide two tutorials as documentation with the package. These can be accessed through the link *User guides, package vignettes and other documentation* in the HTML help page which can be loaded by typing `help(package = "EFDR")`. 
+  Since the main function of this package `test.efdr` is computationally intensive, we do not distribute vignettes so as not to bog down CRAN servers during vignette building. Instead we provide two tutorials as documentation with the package. These can be accessed through the link *User guides, package vignettes and other documentation* in the HTML help page which can be loaded by typing `help(package="EFDR",help_type="html")` in the console.