[Gmm-commits] r141 - in pkg/gmm4: . R vignettes

[noreply at r-forge.r-project.org]

Author: chaussep
Date: 2019-10-09 23:24:22 +0200 (Wed, 09 Oct 2019)
New Revision: 141

Modified:
   pkg/gmm4/DESCRIPTION
   pkg/gmm4/R/gmmModels-methods.R
   pkg/gmm4/vignettes/gmmS4.pdf
Log:
small vignette update, one bug fix for formulaGmm

Modified: pkg/gmm4/DESCRIPTION
===================================================================
--- pkg/gmm4/DESCRIPTION	2019-05-15 20:06:53 UTC (rev 140)
+++ pkg/gmm4/DESCRIPTION	2019-10-09 21:24:22 UTC (rev 141)
@@ -1,13 +1,13 @@
 Package: gmm4
 Version: 0.0-2
-Date: 2018-05-29
+Date: 2019-10-09
 Title: S4 Generalized Method of Moments
 Author: Pierre Chausse <pchausse at uwaterloo.ca>
 Maintainer: Pierre Chausse <pchausse at uwaterloo.ca>
-Description: Here is a complete restructured Gmm package using S4 only type of
+Description: Here is a complete restructured GMM package using S4 only type of
 	     classes and methods. It is in a very early stage and suggestions are
 	     welcome. See the vignette for more details.
-Depends: R (>= 2.10.0), sandwich
+Depends: R (>= 3.0.0), sandwich
 Imports: stats, methods
 Suggests: lmtest, knitr, texreg
 Collate: 'allClasses.R' 'validity.R' 'gmmData.R' 'gmmModels-methods.R'
@@ -20,4 +20,4 @@
 License: GPL (>= 2)
 NeedsCompilation: no
 VignetteBuilder: knitr
-Packaged: 2018-06-14 04:40:03 UTC; pierre
+Packaged: 2019-10-09 04:40:03 UTC; pierre

Modified: pkg/gmm4/R/gmmModels-methods.R
===================================================================
--- pkg/gmm4/R/gmmModels-methods.R	2019-05-15 20:06:53 UTC (rev 140)
+++ pkg/gmm4/R/gmmModels-methods.R	2019-10-09 21:24:22 UTC (rev 141)
@@ -438,7 +438,7 @@
                               {
                                   type <- "weights"
                               } else {
-                                  if (class(object) == "functionGmm" & object at vcov == "iid")
+                                  if (class(object) %in% c("formulaGmm", "functionGmm") & object at vcov == "iid")
                                       object at vcov <- "MDS"
                                   if (object at vcov == "MDS")
                                       {

Modified: pkg/gmm4/vignettes/gmmS4.pdf
===================================================================
(Binary files differ)