[Depmix-commits] r460 - in pkg/depmixS4: . R

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

Author: ingmarvisser
Date: 2011-06-15 12:26:59 +0200 (Wed, 15 Jun 2011)
New Revision: 460

Modified:
   pkg/depmixS4/DESCRIPTION
   pkg/depmixS4/NAMESPACE
   pkg/depmixS4/NEWS
   pkg/depmixS4/R/allGenerics.R
Log:
This time really using nobs generic from stats4.

Modified: pkg/depmixS4/DESCRIPTION
===================================================================
--- pkg/depmixS4/DESCRIPTION	2011-06-15 10:00:05 UTC (rev 459)
+++ pkg/depmixS4/DESCRIPTION	2011-06-15 10:26:59 UTC (rev 460)
@@ -1,6 +1,6 @@
 Package: depmixS4
-Version: 1.0-3
-Date: 2011-03-22
+Version: 1.1-0
+Date: 2011-06-15
 Title: Dependent Mixture Models - Hidden Markov Models of GLMs and Other Distributions in S4
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>
 Maintainer: Ingmar Visser <i.visser at uva.nl>

Modified: pkg/depmixS4/NAMESPACE
===================================================================
--- pkg/depmixS4/NAMESPACE	2011-06-15 10:00:05 UTC (rev 459)
+++ pkg/depmixS4/NAMESPACE	2011-06-15 10:26:59 UTC (rev 460)
@@ -2,7 +2,7 @@
 
 importFrom(stats, predict, simulate)
 
-importFrom(stats4, AIC, BIC, logLik)
+importFrom(stats4, AIC, BIC, logLik, nobs)
 
 export(	
 	makeDepmix,

Modified: pkg/depmixS4/NEWS
===================================================================
--- pkg/depmixS4/NEWS	2011-06-15 10:00:05 UTC (rev 459)
+++ pkg/depmixS4/NEWS	2011-06-15 10:26:59 UTC (rev 460)
@@ -1,5 +1,8 @@
 
-Changes in depmixS4 version 1.0-4
+Changes in depmixS4 version 1.??
+  
+  o Using nobs generic from stats/stats4 rather than defining them 
+    anew (which gave clashes with other packages that did the same).
 
   o Fixed a bug in simulation of gaussian response model, which was 
     returning NaNs due to an error in assignment of the sd parameter
@@ -8,7 +11,7 @@
 
 Changes in depmixS4 version 1.0-3
 
-  o Using AIC/BIC/logLik/nobs generics from stats/stats4 rather than 
+  o Using AIC/BIC/logLik generics from stats/stats4 rather than 
     defining them anew (which gave clashes with other packages that did 
     the same).
 

Modified: pkg/depmixS4/R/allGenerics.R
===================================================================
--- pkg/depmixS4/R/allGenerics.R	2011-06-15 10:00:05 UTC (rev 459)
+++ pkg/depmixS4/R/allGenerics.R	2011-06-15 10:26:59 UTC (rev 460)
@@ -43,8 +43,6 @@
 
 setGeneric("nlin", function(object, ...) standardGeneric("nlin"))
 
-setGeneric("nobs", function(object, ...) standardGeneric("nobs"))
-
 setGeneric("getConstraints", function(object, ...) standardGeneric("getConstraints"))
 
 setGeneric("is.stationary", function(object,...) standardGeneric("is.stationary"))
@@ -75,6 +73,7 @@
 # setGeneric("getModel", function(object, ...) standardGeneric("getModel"))
 
 # these are imported from stats4
+# setGeneric("nobs", function(object, ...) standardGeneric("nobs"))
 # setGeneric("logLik", function(object, ...) standardGeneric("logLik"))
 # setGeneric("AIC", function(object, ..., k=2) standardGeneric("AIC"))
 # setGeneric("BIC", function(object, ...) standardGeneric("BIC"))