Small fixes so devtools::build() might work

IQSS · Feb 18, 2015 · bb860db · bb860db
1 parent 3a814c1
commit bb860db
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 32 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -38,38 +38,38 @@ Suggests:
 Collate:
     'utils.R'
     'model-zelig.R'
+    'model-weibull.R'
     'model-tobit.R'
+    'model-bayes.R'
+    'model-tobit-bayes.R'
     'model-glm.R'
     'model-binchoice.R'
+    'model-logit.R'
+    'model-relogit.R'
+    'model-quantile.R'
     'model-probit.R'
+    'model-gee.R'
+    'model-binchoice-gee.R'
+    'model-probit-gee.R'
+    'model-probit-bayes.R'
     'model-poisson.R'
+    'model-poisson-gee.R'
+    'model-poisson-bayes.R'
+    'model-oprobit-bayes.R'
     'model-normal.R'
+    'model-normal-gee.R'
+    'model-normal-bayes.R'
     'model-negbinom.R'
+    'model-mlogit-bayes.R'
     'model-ls.R'
     'model-lognorm.R'
-    'model-logit.R'
-    'model-gamma.R'
-    'model-exp.R'
-    'model-relogit.R'
-    'model-quantile.R'
-    'model-gee.R'
-    'model-binchoice-gee.R'
     'model-logit-gee.R'
-    'model-probit-gee.R'
+    'model-logit-bayes.R'
+    'model-gamma.R'
     'model-gamma-gee.R'
-    'model-normal-gee.R'
-    'model-poisson-gee.R'
-    'model-bayes.R'
     'model-factor-bayes.R'
-    'model-logit-bayes.R'
-    'model-mlogit-bayes.R'
-    'model-normal-bayes.R'
-    'model-oprobit-bayes.R'
-    'model-poisson-bayes.R'
-    'model-probit-bayes.R'
-    'model-tobit-bayes.R'
-    'model-weibull.R'
+    'model-exp.R'
     'create-json.R'
-    'wrappers.R'
     'plots.R'
+    'wrappers.R'
 VignetteBuilder: knitr
diff --git a/R/create-json.R b/R/create-json.R
@@ -139,8 +139,8 @@ zeligmodels <- list(zelig5models = list("ls" = z5ls$ljson,
                     "tobitbayes" = z5tobitbayes$ljson,
                     "weibull" = z5weibull$ljson))
 
-cat(toJSON(zeligmodels, pretty = TRUE),
-    file = file.path("inst/JSON", "zelig5models.json"))
+# cat(toJSON(zeligmodels, pretty = TRUE),
+#     file = file.path("inst/JSON", "zelig5models.json"))
 
 # cat(toJSON(zeligmodels, pretty = TRUE))
 

diff --git a/R/model-binchoice-gee.R b/R/model-binchoice-gee.R
@@ -1,3 +1,6 @@
+#' @include model-zelig.R
+#' @include model-binchoice.R
+#' @include model-gee.R
 zbinchoicegee <- setRefClass("Zelig-binchoice-gee",
                            contains = c("Zelig-gee",
                                         "Zelig-binchoice"))

diff --git a/R/model-normal-bayes.R b/R/model-normal-bayes.R
@@ -1,6 +1,6 @@
 #' @include model-zelig.R
 #' @include model-bayes.R
-#' @include model-normal
+#' @include model-normal.R
 
 znormalbayes <- setRefClass("Zelig-normal-bayes",
                              contains = c("Zelig-bayes",

diff --git a/R/model-poisson-bayes.R b/R/model-poisson-bayes.R
@@ -1,6 +1,6 @@
 #' @include model-zelig.R
 #' @include model-bayes.R
-#' @include model-poisson
+#' @include model-poisson.R
 
 zpoissonbayes <- setRefClass("Zelig-poisson-bayes",
                              contains = c("Zelig-bayes",

diff --git a/R/model-probit-gee.R b/R/model-probit-gee.R
@@ -1,3 +1,4 @@
+#' @include model-binchoice-gee.R
 zprobitgee <- setRefClass("Zelig-probit-gee",
                           contains = c("Zelig-binchoice-gee"))
 

diff --git a/R/model-tobit-bayes.R b/R/model-tobit-bayes.R
@@ -1,6 +1,6 @@
 #' @include model-zelig.R
-#' @include model-probit.R
-
+#' @include model-bayes.R
+#' @include model-tobit.R
 ztobitbayes <- setRefClass("Zelig-tobit-bayes",
                            contains = c("Zelig-bayes",
                                         "Zelig-tobit"))

diff --git a/Zelig.Rproj b/Zelig.Rproj
@@ -13,5 +13,6 @@ RnwWeave: knitr
 LaTeX: pdfLaTeX
 
 BuildType: Package
+PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
 PackageRoxygenize: rd
diff --git a/man/Median.Rd b/man/Median.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/utils.R
 \name{Median}
 \alias{Median}
 \title{Compute the Statistical Median of a Vector}

diff --git a/man/Mode.Rd b/man/Mode.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/utils.R
 \name{Mode}
 \alias{Mode}
 \title{Compute the Statistical Mode of a Vector}

diff --git a/man/Zelig-class.Rd b/man/Zelig-class.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/model-zelig.R
 \docType{class}
 \name{Zelig-class}
 \alias{Zelig-class}

diff --git a/man/plot.ci.Rd b/man/plot.ci.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/plots.R
 \name{plot.ci}
 \alias{plot.ci}
 \title{Method for plotting qi simulations across a range within a variable, with confidence intervals}

diff --git a/man/plot.qi.Rd b/man/plot.qi.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/plots.R
 \name{plot.qi}
 \alias{plot.qi}
 \title{Default Plot Design For Zelig Model QI's}

diff --git a/man/simulations.plot.Rd b/man/simulations.plot.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.0): do not edit by hand
+% Please edit documentation in R/plots.R
 \name{simulations.plot}
 \alias{simulations.plot}
 \title{Plot Quantities of Interest in a Zelig-fashion}