[Depmix-commits] r330 - trunk/R

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

Author: ingmarvisser
Date: 2010-01-29 15:13:30 +0100 (Fri, 29 Jan 2010)
New Revision: 330

Modified:
   trunk/R/allGenerics.R
Log:
Removed AIC and logLik generics which are now imported from stats.

Modified: trunk/R/allGenerics.R
===================================================================
--- trunk/R/allGenerics.R	2010-01-28 16:06:19 UTC (rev 329)
+++ trunk/R/allGenerics.R	2010-01-29 14:13:30 UTC (rev 330)
@@ -4,7 +4,11 @@
 # 
 
 .First.lib <- function(lib, pkg) { 
+	require(stats)
+	require(methods)
+	require(MASS)
  	require(nnet)
+	require(MCMCpack)
 }
 
 .Last.lib <- function(libpath) {}
@@ -15,9 +19,9 @@
 		respstart=NULL,trstart=NULL,instart=NULL,ntimes=NULL, ...) standardGeneric("depmix"))
 
 setGeneric("GLMresponse", function(formula, data = NULL, family = gaussian(), pstart =
-                 NULL, fixed = NULL, prob=TRUE, ...) standardGeneric("GLMresponse"))
-                 
-setGeneric("MVNresponse", function(formula,data,pstart=NULL,fixed=NULL,...) standardGeneric("MVNresponse"))
+                 NULL, fixed = NULL, prob=TRUE, ...) standardGeneric("GLMresponse"))
+                 
+setGeneric("MVNresponse", function(formula, data = NULL,pstart=NULL,fixed=NULL,...) standardGeneric("MVNresponse"))
 
 setGeneric("transInit", function(formula, nstates, data = NULL, family = multinomial(),
                  pstart = NULL, fixed = NULL, prob=TRUE, ...) standardGeneric("transInit"))
@@ -36,7 +40,7 @@
 
 setGeneric("nlin", function(object, ...) standardGeneric("nlin"))
 
-setGeneric("logLik", function(object, ...) standardGeneric("logLik"))
+# setGeneric("logLik", function(object, ...) standardGeneric("logLik"))
 
 setGeneric("fit", function(object, ...) standardGeneric("fit"))
 
@@ -48,7 +52,7 @@
 
 setGeneric("predict", function(object, ...) standardGeneric("predict"))
 
-setGeneric("AIC", function(object, ..., k=2) standardGeneric("AIC"))
+# setGeneric("AIC", function(object, ..., k=2) standardGeneric("AIC"))
 
 setGeneric("BIC", function(object, ...) standardGeneric("BIC"))