Some last corrections before publication on CRAN

melff · Nov 4, 2020 · 0c362f7 · 0c362f7
1 parent eec929e
commit 0c362f7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/pkg/inst/ChangeLog b/pkg/inst/ChangeLog
@@ -1,3 +1,14 @@
+2020-11-03:
+  - Correct URLs in DESCRIPTION
+
+2020-09-09:
+  - Fix reference to weights in 'predict()' methods
+
+2020-08-06:
+  - Let 'mclogit'/'mblogit' handle empty responses (i.e. where counts sum to
+    zero) correclty.
+  - Make 'mclogit' complain about non-numeric responses  
+
 2020-07-17:
   - Documented prediction methods.
   - Improved flexibility of prediction methods. 

diff --git a/pkg/inst/NEWS.Rd b/pkg/inst/NEWS.Rd
@@ -9,7 +9,7 @@
       alternative to PQL.
       \item As an alternative to extending a logit model with random
       effects, it is now possible to add an over-dispersion parameter to
-      logit model.
+      the model.
       \item In addition to approximate the ML estimator, MQL and PQL
       have a variant that approximates the REML estimator.
       \item There is now a \code{simulate()} method for objects returned
@@ -20,6 +20,13 @@
       (unless requested otherwise).
     }
   }
+  \subsection{BUGFIXES}{
+    \itemize{
+      \item \code{mclogit} now handles empty responses (i.e. counts that
+      sum to zero) correclty.
+      \item \code{mclogit} now flags non-numeric response vectors as an error.
+    }
+  }
 }
 
 \section{Version 0.7}{

diff --git a/pkg/man/electors.Rd b/pkg/man/electors.Rd
@@ -28,19 +28,20 @@ summary(mclogit(
   cbind(Freq,interaction(time,class))~econ.left/class+welfare/class+auth/class,
   data=electors))
 
+\donttest{# This takes a bit longer.
 summary(mclogit(
   cbind(Freq,interaction(time,class))~econ.left/class+welfare/class+auth/class,
   random=~1|party.time,
   data=within(electors,party.time<-interaction(party,time))))
 
-\donttest{summary(mclogit(
+summary(mclogit(
   cbind(Freq,interaction(time,class))~econ.left/(class*time)+welfare/class+auth/class,
   random=~1|party.time,
   data=within(electors,{
         party.time <-interaction(party,time)
         econ.left.sq <- (econ.left-mean(econ.left))^2
-        })))}
-
+        })))
+}
 }
 
 \keyword{datasets}
diff --git a/pkg/man/mclogit.Rd b/pkg/man/mclogit.Rd
@@ -193,13 +193,15 @@ summary(mclogit(
   data=Transport
   ))
 
+\donttest{ # This takes a bit longer.
 data(electors)
 
 summary(mclogit(
   cbind(Freq,interaction(time,class))~econ.left/class+welfare/class+auth/class,
   random=~1|party.time,
   data=within(electors,party.time<-interaction(party,time))))
 }
+}
 \keyword{models}
 \keyword{regression}
 

diff --git a/pkg/man/predict.Rd b/pkg/man/predict.Rd
@@ -57,7 +57,7 @@ head(pred.house.mblogit <- predict(house.mblogit,
                                    type="response"))
 str(pred.house.mblogit <- predict(house.mblogit,se=TRUE,
                                   type="response"))
-
+\donttest{ # This takes a bit longer.
 data(electors)
 (mcre <- mclogit(
     cbind(Freq,interaction(time,class))~econ.left/class+welfare/class+auth/class,
@@ -69,5 +69,5 @@ str(predict(mcre,type="response"))
 
 str(predict(mcre,se.fit=TRUE))
 str(predict(mcre,type="response",se.fit=TRUE))
-
+}
 }