version 2.0.0

.Rinstignore

@@ -0,0 +1 @@
+doc/A_Taxonomy_of_Estimators.tex

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: maSAE
 Title: Mandallaz' Model-Assisted Small Area Estimators
-Version: 1.0.0
+Version: 2.0.0
 Authors@R: 
     c(person(given = "Andreas Dominik",
              family = "Cullmann",
@@ -23,14 +23,14 @@ License: BSD_2_clause + file LICENSE
 URL: https://gitlab.com/fvafrCU/maSAE
 Imports: methods, stats
 Suggests: devtools, forestinventory, knitr, microbenchmark, nlme,
-        pkgload, rmarkdown, rprojroot, RUnit, testthat
-VignetteBuilder: utils, knitr
+        pkgload, rmarkdown, rprojroot, RUnit, R.rsp, testthat
+VignetteBuilder: utils, knitr, R.rsp
 RoxygenNote: 7.0.2
 NeedsCompilation: no
-Packaged: 2020-01-09 14:00:54 UTC; qwer
+Packaged: 2020-03-13 18:04:33 UTC; qwer
 Author: Andreas Dominik Cullmann [aut, cre],
   Daniel Mandallaz [ctb],
   Alexander Francis Massey [ctb]
 Maintainer: Andreas Dominik Cullmann <fvafrcu@mailbox.org>
 Repository: CRAN
-Date/Publication: 2020-01-10 00:20:02 UTC
+Date/Publication: 2020-03-13 18:50:02 UTC

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2019
-COPYRIGHT HOLDER: Andreas Dominik Cullmann
+YEAR: 2014-2020
+COPYRIGHT HOLDER: Andreas Dominik Cullmann

MD5

@@ -1,42 +1,66 @@
-ade9479805b74a199dae06780974d431 *DESCRIPTION
-61e87a2b25355b0ebb6d10e8c00614cb *LICENSE
-47c092c900030f36ee358e8fcb469715 *NAMESPACE
-fe3e7dccad80c6ffc7d23988e8ef5925 *NEWS.md
-f6a5f6abe9f24304a0a8ad2cf55dfd30 *R/allClasses.R
-6d0ccc6d866f2d1aba51f4e08435c1fd *R/allConstructors.R
+5a4391ddb0cb6bd65143b0844f6efb8d *DESCRIPTION
+b99c6b665ca1d207dfa08a80ef9a81a3 *LICENSE
+dab03a922abff1204322266d1693e04b *NAMESPACE
+4ccd854b4ad5926b2a6a40670c757fe0 *NEWS.md
+5110ca558a82a8e0c74359ee3bb6f244 *R/allClasses.R
+4fdb3363715a0a5ce914a15aaf85a98f *R/allConstructors.R
 2850805718b412cf33839a70ebb09b51 *R/allGenerics.R
+fc941b4c890e1771db6a82c7f1d11d63 *R/bind_data.R
 05c1f9adba91de9e2c58656498c16a28 *R/data.R
-5085e447cb44af4eb9f06cfa2748bfe7 *R/maSAE-package.R
-19cfe166fc13c3e0c4c2fe16b81518df *R/predict-methods.R
+09ebbef19aa7aed4ef910da4d55112ae *R/maSAE-package.R
+76bb807e739fe96935d3ed4483a83256 *R/predict-functions.R
+6a2f7db04f47e5d2baf87bb3deb5047c *R/predict-functions_old.R
+e7eedaf319e213fec773e84b149a10de *R/predict-methods.R
 54b27ed146712c422bdeb19dd85e6fe3 *R/throw.R
-524808cd480aa3b7fe192d209e8eb995 *README.md
-48dae80339e49c8f7842c4e6cf6d3bac *build/vignette.rds
+859cad83e3be0883fb4349b64c4b36e1 *README.md
+549ea02815ed517a776b4c11aa17df90 *build/vignette.rds
 d4f06007a1a3925e8ce86cee3588aa1f *data/s0.txt
 a87b986f20ff87e1d423becaf2faf67e *data/s1.txt
 4abf372266bca851c84659396f8f77fa *data/s2.txt
 af29b920ba0289ebe838ec0c256a3be5 *demo/00Index
 8369a23949093f740b1ffc9ef570dafb *demo/design.R
 f7a5064ed96bb6697cc16f2cf5b5d21a *demo/maSAE.R
-371003bc6e82655d75594c145274622b *inst/doc/maSAE.R
-9c980129795e6141962bb437b38cbeb8 *inst/doc/maSAE.Rnw
-9da813e52d169a8cf3ff752a6e4f2467 *inst/doc/maSAE.pdf
-8ad37380590a006d8024be10c085b68e *inst/runit_tests/runit-throw.R
-091fc5bdccd696a47c36e9ce157dee44 *man/maSAE-internal.Rd
-c65b692b3164881af35f7b1ee6eff39e *man/maSAE-package.Rd
-112ca80cc4b518f9e1ef7773da535c5b *man/predict-methods.Rd
+802c22a1a74609e9b4170bb35a868eae *inst/doc/A_Taxonomy_of_Estimators.pdf
+07392a6a537aa5f9e430906d740091f9 *inst/doc/A_Taxonomy_of_Estimators.tex
+f45a29a1b66ca066ee0af677bd429e8d *inst/doc/forestinventory_and_maSAE.R
+7ad264b176c75f72e45db105e802fef8 *inst/doc/forestinventory_and_maSAE.Rmd
+fdff3f4081ec31164a8795a4eed4c1b8 *inst/doc/forestinventory_and_maSAE.html
+624c26ea95af7cc081eddb785ec4a4f0 *inst/doc/maSAE.R
+f4bba9cdc8ea496f595e6c2badc0f1c1 *inst/doc/maSAE.Rnw
+f6e8057ef2d2a7b1dddf9a33b85c8c27 *inst/doc/maSAE.pdf
+55a515a191229eb4ef0f0b6e9c31dec5 *inst/runit_tests/runit-cl_2p.R
+8695fef0216e240f4e753dfccc521f9e *inst/runit_tests/runit-cl_3p.R
+9b67166aa5928844266af1d8f386f64b *inst/runit_tests/runit-forestinventory.R
+98875bb0573e71f6efe36113b3999a59 *inst/runit_tests/runit-forestinventory_maSAE.R
+7a395ae0f3e859a226f798e990eb2975 *inst/runit_tests/runit-forestinventory_partially.R
+b2313f2d1eae68a2dd6c52d48f3ebb99 *inst/runit_tests/runit-lm.R
+5f43ad8143e05c2c52977f5952d2c189 *inst/runit_tests/runit-means.R
+2d26494ade838cb8560ce7f4de7a893d *inst/runit_tests/runit-throw.R
+c270fd2d182893882c4771942b534161 *inst/runit_tests/runit-uc_2p.R
+c730ce3bfacad922ea452e29f559d027 *inst/runit_tests/runit-uc_3p.R
+9bf11ac90c46cfd559230b97c4e206fd *inst/runit_tests/runit-v1.R
+7ec8c7c3c70fe49bba46a8e2c4ebb4c0 *inst/runit_tests/setup.R
+1fdd109ce9a2fc998e7df9111433e500 *man/bind_data.Rd
+1006a9405c23ce22421fb230f41c4b73 *man/maSAE-internal.Rd
+e610bd0ebf0550f36f5aa7567188d1d8 *man/maSAE-package.Rd
+c86fde0c93e2d7fc4545c6013b57cb3d *man/predict-methods.Rd
 c89eb8c16adc9119d8b705f653a722d7 *man/s0.Rd
 985dbe63c90fafba2a48c792edc53915 *man/s1.Rd
 8895fa2bfa63fb5bed94b24f7b22b55a *man/s2.Rd
-dd0e498ac40c9798b7c91be71d183f2a *man/saObj.Rd
+d4a51fc7bb01858250f801b2e97e6637 *man/saObj.Rd
 8bdb3a7a09eb60d19d0b8a06cd17adb6 *man/sadObj-class.Rd
-6f4e3def9d002b6253e423ab180600f5 *man/saeObj-class.Rd
+030dc15d7c623a6c1f1bf1ae648084fd *man/saeObj-class.Rd
 70769a7ad3e420227ae056cd7d51f0c7 *man/savObj-class.Rd
 7ee158de9629603656049e200d2da453 *man/throw.Rd
-1e7f95045083e3659ff014b3ddc39c04 *tests/runit.R
+a493645af1e76fdeaf9669a3561fe877 *tests/runit.R
 915d781d2b4889f65149568d9c8f969f *tests/testthat.R
-d2f400ff4c213c9c2e0ac40aa9b7b47f *tests/testthat/test-classes.R
-beef3ff65810e6fd69479821660765f4 *tests/testthat/test-predict.R
+d3025ff7c511e903860b8fcd3e48e702 *tests/testthat/test-classes.R
 d1cc917f3153c39d9abef492ab0f31b6 *tests/testthat/test-throw.R
+07392a6a537aa5f9e430906d740091f9 *vignettes/A_Taxonomy_of_Estimators.tex
 9944665a2c521432a8d899eb3617df35 *vignettes/Rao.R
+8f398c0fd1c101134e25c8fded3f912c *vignettes/bib.bib
 9cd4878892d3fc01f283da95199196e4 *vignettes/bibliography.bib
-9c980129795e6141962bb437b38cbeb8 *vignettes/maSAE.Rnw
+7ad264b176c75f72e45db105e802fef8 *vignettes/forestinventory_and_maSAE.Rmd
+f4bba9cdc8ea496f595e6c2badc0f1c1 *vignettes/maSAE.Rnw
+68a9be5fabf751837f1f69c50a107571 *vignettes/tex/clustered.tex
+aea9b22505f4006de4a4c56bf1b5917f *vignettes/tex/unclustered.tex

NAMESPACE

@@ -1,10 +1,8 @@
-import("methods")
-importFrom("stats", "var")
-exportPattern("saObj")
-exportMethods(
-    "predict" 
-)
-exportClasses(
-     "saeObj",
-     "sadObj"
-)
+# Generated by roxygen2: do not edit by hand
+
+export(bind_data)
+export(predict)
+export(saObj)
+exportClasses(sadObj)
+exportClasses(saeObj)
+exportClasses(savObj)

NEWS.md

@@ -1,3 +1,41 @@
+# maSAE 2.0.0
+
+## Major Modifications
+* I have added slot `auxiliaryWeights` to class `saeObj`, allowing for weighting 
+the auxiliary information for incomplete spatial support. This is inspired by
+package `forestinventory`.
+* I have added the (pseudo) small area estimator and the (pseudo) synthetic
+estimator to the output while removing the attributes hinting to Mandallaz'
+publications.
+
+This lead to refactoring the functions used in method `predict`.
+I have nearly halved the lines of code in these functions, they are now _much_ 
+easier to read, understand and maintain.
+
+__The return value predict() has changed, it is giving 
+the (pseudo) small area estimator and the (pseudo) synthetic estimator as well 
+but not the attributes hinting to Mandallaz'
+publications__
+
+## Sticking with version 1.0.0
+If you don't care about weights and (pseudo) small area estimator and the (pseudo) synthetic
+estimators, you might want to stick with the old predict method from version 1.0.0. 
+You can use  
+`predict(..., version = "1.0.0)`  
+or set 
+`options(maSAE_version = "1.0.0")`
+to do so.
+The predictions for the extended (pseudo) synthetic estimator and its variance
+are identical for version 1.0.0 and 2.0.0. This is ensured by tests in
+runit\_tests/runit-v1.R.
+
+## Minor Modifications
+* Fixed tests for R 4.0.0 setting stringsAsFactors to FALSE by default.
+* Added function `bind_data` to coerce different sampling phase data into a
+  suitable `data.frame`.
+* Added a vignette comparing packages `maASE` and `forestinventory`.
+* Added a vignette that clarifies the estimators.
+
 # maSAE 1.0.0
 
 * Formalized tests using testthat.