[Depmix-commits] r567 - pkg/depmixS4/R

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

Author: ingmarvisser
Date: 2012-09-18 13:01:46 +0200 (Tue, 18 Sep 2012)
New Revision: 567

Modified:
   pkg/depmixS4/R/depmixfit.R
   pkg/depmixS4/R/llratio.R
Log:
comments and stuff ...

Modified: pkg/depmixS4/R/depmixfit.R
===================================================================
--- pkg/depmixS4/R/depmixfit.R	2012-09-18 08:36:03 UTC (rev 566)
+++ pkg/depmixS4/R/depmixfit.R	2012-09-18 11:01:46 UTC (rev 567)
@@ -64,11 +64,11 @@
 			# set those fixed parameters in the appropriate submodels
 			object <- setpars(object,fixed,which="fixed")			
 			
-		    # get the full set of parameters
-		    allpars <- getpars(object)
-						
+			# get the full set of parameters
+			allpars <- getpars(object)
+			
 			# get the reduced set of parameters, ie the ones that will be optimized
-		    pars <- allpars[!fixed]
+			pars <- allpars[!fixed]
 		    
 			constraints <- getConstraints(object)
 			

Modified: pkg/depmixS4/R/llratio.R
===================================================================
--- pkg/depmixS4/R/llratio.R	2012-09-18 08:36:03 UTC (rev 566)
+++ pkg/depmixS4/R/llratio.R	2012-09-18 11:01:46 UTC (rev 567)
@@ -20,6 +20,6 @@
 setMethod("show","llratio",
 	function(object) {
 		pvalue=round(pchisq(object at value,object at df,lower=FALSE),3)
-		cat("log Likelihood ratio: ", round(object at value,3), " (df=",object at df,"), p=",pvalue,"\n",sep="")
+		cat("log Likelihood ratio (chi^2): ", round(object at value,3), " (df=",object at df,"), p=",pvalue,".\n",sep="")
 	}
 )