Final testing for cran submission

elbamos · Aug 11, 2016 · 98457ae · 98457ae
1 parent 20d86c7
commit 98457ae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -11,10 +11,10 @@
 ^wikiwWordVis\.Rda
 ^wij
 ^visscratc\.R
-^wikiwordcoords\.Rda
-^ng20wij\.Rda
-^time\.Rda
-^wordcoords\.Rda
+^wikiwordcoords\.Rda$
+^ng20wij\.Rda$
+^time\.Rda$
+^wordcoords\.Rda$
 ^vignettedata/$
 ^vignettedata/.$
 ^stm\.Rda
@@ -58,4 +58,10 @@
 ^poliblog/.Rda
 ^log4j/.spark/.log
 ^mnist$
-^derby/.log
+^derby/.log
+^Examples/.Rmd$
+^test/.R$
+^vignettedatamnistcoords/.Rda$
+^vignettedatangcoords/.Rda$
+^wordcoordsweightingbyp/.Rda$
+^words/.png$
diff --git a/src/Makevars.win b/src/Makevars.win
diff --git a/src/largeVis.cpp b/src/largeVis.cpp
@@ -62,7 +62,7 @@ class Visualizer {
 			for (edgeidxtype e = newps[p];
         	 e != newps[p + 1];
         	 e++) {
-				negweights[targets[e]] += weights[e];
+				//negweights[targets[e]] += weights[e];
 				negweights[p] += weights[e];
 			}
 		}

diff --git a/vignettes/benchmarks.Rmd b/vignettes/benchmarks.Rmd
@@ -12,14 +12,14 @@ vignette: |
 
 ```{r setupbenchmark,eval=T,echo=F,warning=F,error=F,message=F}
 # Note to reader:  Please don't steal the semi-distinctive visual style I spent several minutes creating for myself.
-require(ggplot2, 
+library(ggplot2, 
         quietly = TRUE)
-require(RColorBrewer, 
+library(RColorBrewer, 
         quietly = TRUE)
-require(wesanderson, 
+library(wesanderson, 
         quietly = TRUE)
-require(dplyr, quietly = TRUE)
-require(magrittr, quietly = TRUE)
+library(dplyr, quietly = TRUE)
+library(magrittr, quietly = TRUE)
 knitr::opts_chunk$set(collapse = TRUE, 
                       comment = "#>",
                       fig.width = 7,