unit tests and prepping for merge

dustinfife · Feb 26, 2020 · 3d9ea12 · 3d9ea12
1 parent 9d8ca5f
commit 3d9ea12
Show file tree

Hide file tree

Showing 29 changed files with 3,201 additions and 101 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -17,6 +17,8 @@ README_files/
 tests/
 ^doc$
 ^Meta$
+jasp_documentation/
+paranormal.csv
 EJ notes.rtf
 R/flexplota.b.R
 # stuff to ignore jasp when doing CMD check

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -18,7 +18,8 @@ Imports: cowplot,
 	forcats, 
 	purrr,
 	plyr,
-	R6
+	R6,
+	ggplot2
 Suggests: jmvcore (>= 0.8.5), 
 	vdiffr,
 	knitr,

diff --git a/NAMESPACE b/NAMESPACE
@@ -14,15 +14,11 @@ export(bf.bic)
 export(compare.fits)
 export(estimates)
 export(flexplot)
-export(flexplot_jasp2)
 export(flip_data)
 export(geom_jitterd)
 export(glinmod)
-export(glinmod_jasp)
-export(linmod_jasp)
 export(make.formula)
 export(mixed.mod.visual)
-export(mixedmod_jasp)
 export(model.comparison)
 export(position_jitterd)
 export(position_jitterdodged)

diff --git a/R/flexplot.R b/R/flexplot.R
@@ -95,7 +95,7 @@ flexplot = function(formula, data=NULL, related=F,
 		sample=Inf, 
 		prediction = NULL, suppress_smooth=F, alpha=.99977, plot.string=F, silent=F,
 		third.eye=NULL,
-		plot.type = c("histogram", "qq", "density", "boxplot", "violin")){
+		plot.type = c("histogram")){
 
 	#data = exercise_data
 	##### use the following to debug flexplot

diff --git a/R/glinmod.R b/R/glinmod.R
@@ -21,7 +21,7 @@
 ##' glinmod(weight.loss~gender, data=exercise_data)
 ##' ## pass parameters to flexplot
 ##' glinmod(weight.loss~gender + motivation, data=exercise_data, 
-##'		se=FALSE, method="lm")
+##'		method="lm")
 glinmod = function(f, data, plot=TRUE, ...){
 
 	#### run the lm

diff --git a/README.Rmd b/README.Rmd
@@ -40,7 +40,7 @@ A more complete manual for flexplot can be found at the [Psych Arxiv](https://ps
 # install the stable version
 devtools::install_github("dustinfife/flexplot")
 # install the development version
-devtools::install_github("dustinfife/flexplot", repo="development")
+devtools::install_github("dustinfife/flexplot", ref="development")
 ```
 
 

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Arxiv](https://psyarxiv.com/kh9c3)
 # install the stable version
 devtools::install_github("dustinfife/flexplot")
 # install the development version
-devtools::install_github("dustinfife/flexplot", repo="development")
+devtools::install_github("dustinfife/flexplot", ref="development")
 ```
 
 ## Usage
@@ -143,7 +143,7 @@ model.comparison(full.mod, reduced.mod)
 #> 
 #> $pred.difference
 #>    0%   25%   50%   75%  100% 
-#> 0.003 0.040 0.084 0.158 0.585
+#> 0.033 0.460 0.962 1.814 6.736
 ```
 
 ## Getting help

diff --git a/README_files/figure-gfm/unnamed-chunk-3-1.png b/README_files/figure-gfm/unnamed-chunk-3-1.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-2.png b/README_files/figure-gfm/unnamed-chunk-3-2.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-3.png b/README_files/figure-gfm/unnamed-chunk-3-3.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-4.png b/README_files/figure-gfm/unnamed-chunk-3-4.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-5.png b/README_files/figure-gfm/unnamed-chunk-3-5.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-6.png b/README_files/figure-gfm/unnamed-chunk-3-6.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-7.png b/README_files/figure-gfm/unnamed-chunk-3-7.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-8.png b/README_files/figure-gfm/unnamed-chunk-3-8.png
diff --git a/README_files/figure-gfm/unnamed-chunk-3-9.png b/README_files/figure-gfm/unnamed-chunk-3-9.png
diff --git a/man/flexplot.Rd b/man/flexplot.Rd
diff --git a/man/flexplot_jasp2.Rd b/man/flexplot_jasp2.Rd
diff --git a/man/glinmod.Rd b/man/glinmod.Rd
diff --git a/man/glinmod_jasp.Rd b/man/glinmod_jasp.Rd
diff --git a/man/linmod_jasp.Rd b/man/linmod_jasp.Rd
diff --git a/man/mixedmod_jasp.Rd b/man/mixedmod_jasp.Rd
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,8 @@ Imports: cowplot, @@
     	forcats,
     	purrr,
     	plyr,
-    	R6
+    	R6,
+    	ggplot2
     Suggests: jmvcore (>= 0.8.5),
     	vdiffr,
     	knitr,
@@ Expand Down @@