diff --git a/DESCRIPTION b/DESCRIPTION index fa6215f1..86bbb09a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -40,7 +40,7 @@ NeedsCompilation: yes Depends: R (>= 4.0.0) Imports: - BayesTools (>= 0.1.3), + BayesTools (>= 0.2.0), runjags, bridgesampling, rjags, diff --git a/inst/REFERENCES.bib b/inst/REFERENCES.bib index b5505961..bd128065 100644 --- a/inst/REFERENCES.bib +++ b/inst/REFERENCES.bib @@ -62,12 +62,11 @@ @unpublished{bartos2021no doi = {10.31234/osf.io/kvsp7} } -@unpublished{bartos2020adjusting, +@article{bartos2020adjusting, title = {Adjusting for publication bias in {JASP} & {R} -- selection models, {PET-PEESE}, and robust {B}ayesian meta-analysis}, author = {Barto{\v{s}}, Franti{\v{s}}ek and Maier, Maximilian and Quintana, Daniel S and Wagenmakers, Eric-Jan}, - year = {2021}, - journal = {PsyArXiv}, - note = {preprint at \url{https://doi.org/10.31234/osf.io/75bqn}}, + year = {in press}, + journal = {Advances in Methods and Practices in Psychological Science}, doi = {10.31234/osf.io/75bqn} } diff --git a/src/Makevars.in b/src/Makevars.in index bfe4a44d..5c7be845 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -19,7 +19,7 @@ ############### PKG_CPPFLAGS=@JAGS_CFLAGS@ -D JAGS_MAJOR_FORCED=0$(JAGS_MAJOR_VERSION) -D JAGS_MAJOR_ASSUMED=0 -PKG_LIBS=@JAGS_LIBS@ @JAGS_RPATH@ -ljrmath -llapack +PKG_LIBS=@JAGS_LIBS@ @JAGS_RPATH@ -ljrmath -llapack ############### diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt index 0d7c13fc..03a786cd 100644 --- a/src/Makevars.ucrt +++ b/src/Makevars.ucrt @@ -8,10 +8,10 @@ ### Note: This windows makefile requires the JAGS_ROOT variable to be set ### ### This file allows compilation with JAGS 4 (or later) without modifying RoBMA. -### To force the package to compile assuming a given JAGS version is installed, use the +### To force the package to compile assuming a given JAGS version is installed, use the ### JAGS_MAJOR_FORCED environmental variable. This might be necessary on windows if you have ### JAGS installed in a non-standard location. -### +### ###################################################################################################### ## Conditionally set the JAGS_ROOT variable (if it is not already set) to a location specified by the CRAN team: @@ -62,7 +62,7 @@ endif # Set the CPPFLAGS accordingly # Prepending 0 to JAGS_MAJOR_VERSION prevents it being set as blank (the C++ code requires a number) -JAGS_MAJOR_ASSUMED := 4 +JAGS_MAJOR_ASSUMED := 4 PKG_CPPFLAGS=-I"$(JAGS_ROOT)/include" -D JAGS_MAJOR_ASSUMED=$(JAGS_MAJOR_ASSUMED) -D JAGS_MAJOR_FORCED=0$(JAGS_MAJOR_VERSION) PKG_LIBS=-L"$(JAGS_ROOT)/${R_ARCH}/bin" -ljags-$(JAGS_MAJOR) -ljrmath-0 @@ -73,7 +73,12 @@ PKG_LIBS=-L"$(JAGS_ROOT)/${R_ARCH}/bin" -ljags-$(JAGS_MAJOR) -ljrmath-0 ### NB: the objects in distributions/jags are only necessary for JAGS <=3, and are excluded by the sources when compiling against JAGS >= 4 ############### -OBJECTS = distributions/DWN1.o distributions/DWN2.o distributions/DWT1.o distributions/DWT2.o transformations/z.o transformations/r.o transformations/d.o transformations/logOR.o transformations/transformations_common.o init.o RoBMA.o testRoBMA.o +OBJECTS = distributions/DMN.o distributions/DWMN1.o distributions/DWMN2.o distributions/DMNv.o distributions/DWMN1v.o distributions/DWMN2v.o \ + distributions/DWN1.o distributions/DWN2.o distributions/DWT1.o distributions/DWT2.o \ + transformations/z.o transformations/r.o transformations/d.o transformations/logOR.o \ + functions/wmnorm.o functions/mnorm.o \ + source/tools.o source/mnorm.o source/wmnorm.o source/transformations.o \ + init.o RoBMA.o testRoBMA.o ############### @@ -85,6 +90,11 @@ OBJECTS = distributions/DWN1.o distributions/DWN2.o distributions/DWT1.o distrib # PKG_CPPFLAGS=-I"$(JAGS_ROOT)/include" # PKG_LIBS=-L"$(JAGS_ROOT)/${R_ARCH}/bin" -ljags-4 -# OBJECTS = distributions/DWN1.o distributions/DWN2.o distributions/DWT1.o distributions/DWT2.o transformations/z.o transformations/r.o transformations/d.o transformations/logOR.o transformations/transformations_common.o init.o RoBMA.o testRoBMA.o +# OBJECTS = distributions/DMN.o distributions/DWMN1.o distributions/DWMN2.o distributions/DMNv.o distributions/DWMN1v.o distributions/DWMN2v.o \ +# distributions/DWN1.o distributions/DWN2.o distributions/DWT1.o distributions/DWT2.o \ +# transformations/z.o transformations/r.o transformations/d.o transformations/logOR.o \ +# functions/wmnorm.o functions/mnorm.o \ +# source/tools.o source/mnorm.o source/wmnorm.o source/transformations.o \ +# init.o RoBMA.o testRoBMA.o -############### \ No newline at end of file +############### diff --git a/src/source/mnorm.cc b/src/source/mnorm.cc index a0de070b..bdbbc50a 100644 --- a/src/source/mnorm.cc +++ b/src/source/mnorm.cc @@ -243,7 +243,7 @@ bool inverse(double const *matrix, int const K, double *inverse) // Find determinant of A[][] double det = determinant(&matrix[0], K, K); if (det == 0){ - cout << "Singular matrix, can't find its inverse" << endl; + //cout << "Singular matrix, can't find its inverse" << endl; return false; }