[Depmix-commits] r80 - in trunk: . R inst

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

Author: ingmarvisser
Date: 2008-03-08 14:07:54 +0100 (Sat, 08 Mar 2008)
New Revision: 80

Modified:
   trunk/DESCRIPTION
   trunk/R/allGenerics.R
   trunk/R/responses.R
   trunk/inst/CITATION
Log:
Minor changes

Modified: trunk/DESCRIPTION
===================================================================
--- trunk/DESCRIPTION	2008-03-07 16:26:14 UTC (rev 79)
+++ trunk/DESCRIPTION	2008-03-08 13:07:54 UTC (rev 80)
@@ -1,11 +1,12 @@
 Package: depmixS4
-Version: 0.1
+Version: 0.1-0
 Date: 2008-03-07
 Title: Dependent Mixture Models
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>
 Maintainer: Ingmar Visser <i.visser at uva.nl>
 Depends: R (>= 2.6.0), nnet
 Suggests: Rdonlp2
-Description: Fit latent (hidden) Markov models on mixed categorical and continuous (timeseries) data, otherwise known as dependent mixture models
+Description: Fit latent (hidden) Markov models on mixed categorical and continuous (timeseries)
+   data, otherwise known as dependent mixture models
 License: GPL (>=2)
 URL: http://depmix.r-forge.r-project.org/

Modified: trunk/R/allGenerics.R
===================================================================
--- trunk/R/allGenerics.R	2008-03-07 16:26:14 UTC (rev 79)
+++ trunk/R/allGenerics.R	2008-03-08 13:07:54 UTC (rev 80)
@@ -3,6 +3,12 @@
 # Started by Ingmar Visser, march 2008
 # 
 
+.First.lib <- function(lib, pkg) {
+	require(nnet)
+}
+
+.Last.lib <- function(libpath) {}
+
 # Guess what: all generics
 
 setGeneric("depmix", function(response=any, transition=any, ...) standardGeneric("depmix"))

Modified: trunk/R/responses.R
===================================================================
--- trunk/R/responses.R	2008-03-07 16:26:14 UTC (rev 79)
+++ trunk/R/responses.R	2008-03-08 13:07:54 UTC (rev 80)
@@ -281,7 +281,7 @@
 
 setMethod("fit","MULTINOMresponse",
 	function(object,w) {
-		require(nnet)
+# 		require(nnet)
 		pars <- object at parameters
 		base <- object at family$base # delete me
 		y <- object at y[,-base]
@@ -551,7 +551,7 @@
 		}
 		
 		nnetfit <- function() {
-			require(nnet)
+# 			require(nnet)
 			pars <- object at parameters
 			base <- object at family$base # delete me
 			#y <- object at y[,-base]
@@ -579,7 +579,7 @@
 			pars
 		}
 		
-		require(nnet)
+# 		require(nnet)
 		pars <- object at parameters
 		base <- object at family$base # delete me
 		#y <- object at y[,-base]

Modified: trunk/inst/CITATION
===================================================================
--- trunk/inst/CITATION	2008-03-07 16:26:14 UTC (rev 79)
+++ trunk/inst/CITATION	2008-03-08 13:07:54 UTC (rev 80)
@@ -1,14 +1,15 @@
 citHeader("To cite package depmix in publications, use the following:")
 
 citEntry(entry="Article",
-	title = "{depmix}: An R-package for fitting mixture models on mixed
+	title = "{depmixS4}: An R-package for fitting mixture models on mixed
 	multivariate data with Markov dependencies",
-	author = person(first="Ingmar", last="Visser"),
+	author = personList(person(first="Ingmar", last="Visser"), 
+		person(first="Maarten", last="Speekenbrink")),
 	journal = "R-package manual",
 	year = "2007",
 	url = "http://cran.r-project.org",
-	textVersion = paste("Ingmar Visser (2007).  Depmix: An R-package 
-	for fitting mixture models on mixed multivariate data with Markov
+	textVersion = paste("Ingmar Visser & Maarten Speekenbrink (2007).  DepmixS4: 
+	An R-package for fitting mixture models on mixed multivariate data with Markov
 	dependencies. R-package manual and introduction into Dependent 
 	Mixture models") 
 )