[Depmix-commits] r67 - in trunk: . R

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

Author: ingmarvisser
Date: 2008-03-07 14:51:41 +0100 (Fri, 07 Mar 2008)
New Revision: 67

Modified:
   trunk/R/depmix.R
   trunk/depmixNew-test1.R
   trunk/depmixNew-test2.R
   trunk/depmixNew-test3.R
Log:
Minor changes (comments and sourc()'s etc

Modified: trunk/R/depmix.R
===================================================================
--- trunk/R/depmix.R	2008-03-07 13:45:15 UTC (rev 66)
+++ trunk/R/depmix.R	2008-03-07 13:51:41 UTC (rev 67)
@@ -330,9 +330,6 @@
 
 setGeneric("logLik", function(object, ...) standardGeneric("logLik"))
 
-source("lystig.R")
-source("fb.R")
-
 # depends on getpars and nobs
 setMethod("logLik",signature(object="depmix"),
 	function(object,method="lystig") { # TODO: initial dens and response densities are recomputed here, but this is also done in setpars at least for the response densities !!!!!!!!

Modified: trunk/depmixNew-test1.R
===================================================================
--- trunk/depmixNew-test1.R	2008-03-07 13:45:15 UTC (rev 66)
+++ trunk/depmixNew-test1.R	2008-03-07 13:51:41 UTC (rev 67)
@@ -16,8 +16,8 @@
 
 setwd("/Users/ivisser/Documents/projects/depmixProject/depmixNew/rforge/depmix/trunk/")
 
-source("responses.R")
-source("depmix.R")
+source("R/responses.R")
+source("R/depmix.R")
 
 load("data/speed.Rda")
 
@@ -150,8 +150,8 @@
 # SPECIFYING MODELS THE EASY WAY
 # 
 
-mod <- depmix(rt~1,data=speed,nstates=2)
-mod
+# mod <- depmix(rt~1,data=speed,nstates=2)
+# mod
 
 
 

Modified: trunk/depmixNew-test2.R
===================================================================
--- trunk/depmixNew-test2.R	2008-03-07 13:45:15 UTC (rev 66)
+++ trunk/depmixNew-test2.R	2008-03-07 13:51:41 UTC (rev 67)
@@ -9,13 +9,14 @@
 
 setwd("/Users/ivisser/Documents/projects/depmixProject/depmixNew/rforge/depmix/trunk/")
 
-source("responses.R")
-source("depmix.R")
-source("depmix.fitted.R")
-source("llratio.R")
+source("R/responses.R")
+source("R/depmix.R")
+source("R/depmix.fitted.R")
+source("R/llratio.R")
+source("R/EM.R")
+source("R/lystig.R")
+source("R/fb.R")
 
-source("EM.R")
-
 load("data/speed.Rda")
 
 # 
Modified: trunk/depmixNew-test3.R
===================================================================
--- trunk/depmixNew-test3.R	2008-03-07 13:45:15 UTC (rev 66)
+++ trunk/depmixNew-test3.R	2008-03-07 13:51:41 UTC (rev 67)
@@ -13,15 +13,14 @@
 
 load("data/balance.rda")
 
-source("responses.R")
-source("depmix.R")
-source("depmix.fitted.R")
+source("R/responses.R")
+source("R/depmix.R")
+source("R/depmix.fitted.R")
+source("R/llratio.R")
+source("R/lystig.R")
+source("R/fb.R")
+source("R/EM.R")
 
-source("llratio.R")
-source("lystig.R")
-source("fb.R")
-source("EM.R")
-
 # now fit some latent class models
 trstart=c(1,0,0,1)
 instart=c(0.5,0.5)