[Depmix-commits] r259 - / tags trunk trunk/R trunk/man

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

Author: ingmarvisser
Date: 2009-02-18 13:47:03 +0100 (Wed, 18 Feb 2009)
New Revision: 259

Added:
   tags/release-0.2-0/
Removed:
   pkg/
Modified:
   trunk/NEWS
   trunk/R/freepars.R
   trunk/man/AIC.Rd
   trunk/man/balance.Rd
Log:
Added tag for release 0.2-0

Copied: tags/release-0.2-0 (from rev 251, pkg)

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-02-18 12:14:39 UTC (rev 258)
+++ trunk/NEWS	2009-02-18 12:47:03 UTC (rev 259)
@@ -21,8 +21,6 @@
   o added example of the use of conrows argument in fitting functions and other 
     minor updates in documentation
   
-  o 
-
 Changes in depmixS4 version 0.2-0
 
   o restructured R and Rd (help) files; added depmixS4 help with a short

Modified: trunk/R/freepars.R
===================================================================
--- trunk/R/freepars.R	2009-02-18 12:14:39 UTC (rev 258)
+++ trunk/R/freepars.R	2009-02-18 12:47:03 UTC (rev 259)
@@ -27,7 +27,7 @@
 setMethod("nlin","mix.fitted",
 	function(object) {
 		conMat <- object at conMat[which(object at lin.lower==object at lin.upper),,drop=FALSE]
-		if(nrow(conMat==0)) nlin <- 0 
+		if(nrow(conMat)==0) nlin <- 0 
 		else nlin <- qr(conMat)$rank
 		nlin
 	}
@@ -36,7 +36,7 @@
 setMethod("nlin","depmix.fitted",
 	function(object) {
 		conMat <- object at conMat[which(object at lin.lower==object at lin.upper),,drop=FALSE]
-		if(nrow(conMat==0)) nlin <- 0 
+		if(nrow(conMat)==0) nlin <- 0 
 		else nlin <- qr(conMat)$rank
 		nlin
 	}
Modified: trunk/man/AIC.Rd
===================================================================
--- trunk/man/AIC.Rd	2009-02-18 12:14:39 UTC (rev 258)
+++ trunk/man/AIC.Rd	2009-02-18 12:47:03 UTC (rev 259)
@@ -35,6 +35,7 @@
 }
 
 \references{
+	
 	H. Akaike.  Information theory and an extension of the maximum
 	likelihood principle.  In B. N. Petrov and F. Csaki, editors, Second
 	international symposium on information theory, pages 267Ð281.

Modified: trunk/man/balance.Rd
===================================================================
--- trunk/man/balance.Rd	2009-02-18 12:14:39 UTC (rev 258)
+++ trunk/man/balance.Rd	2009-02-18 12:47:03 UTC (rev 259)
@@ -1,45 +1,45 @@
-\name{balance}
-
-\docType{data}
-
-\alias{balance}
-
-\title{Balance Scale Data}
-
-\description{Balance scale data of four distance items from 779 subjects;
-participants' ages are included.}
-
-\usage{data(balance)}
-
-\format{
-  
-  A data frame with 779 observations on the following variables.
-
-  \describe{
-	\item{\code{sex}}{Participants' sex.}
-	\item{\code{agedays}}{Age in days.}
-	\item{\code{age}}{Age in years.}
-	\item{\code{t1}}{Trichotomously scored distance item.}
-	\item{\code{t2}}{Trichotomously scored distance item.}
-	\item{\code{t3}}{Trichotomously scored distance item.}
-	\item{\code{t4}}{Trichotomously scored distance item.}
-	\item{\code{d1}}{Dichotomously scored distance item.}
-	\item{\code{d2}}{Dichotomously scored distance item.}
-	\item{\code{d3}}{Dichotomously scored distance item.}
-	\item{\code{d4}}{Dichotomously scored distance item.}
-  }
-}
-
-\source{
-
-	Brenda Jansen (2001),\emph{Development of reasoning on the balance
-	scale task: Psychometric assessment of cognitive strategies}.  PhD
-	thesis, University of Amsterdam, Department of Psychology.
-
-}
-
-\examples{
-data(balance)
-}
-
-\keyword{datasets}
+\name{balance}
+
+\docType{data}
+
+\alias{balance}
+
+\title{Balance Scale Data}
+
+\description{Balance scale data of four distance items from 779 subjects;
+participants' ages are included.}
+
+\usage{data(balance)}
+
+\format{
+  
+  A data frame with 779 observations on the following variables.
+
+  \describe{
+	\item{\code{sex}}{Participants' sex.}
+	\item{\code{agedays}}{Age in days.}
+	\item{\code{age}}{Age in years.}
+	\item{\code{t1}}{Trichotomously scored distance item.}
+	\item{\code{t2}}{Trichotomously scored distance item.}
+	\item{\code{t3}}{Trichotomously scored distance item.}
+	\item{\code{t4}}{Trichotomously scored distance item.}
+	\item{\code{d1}}{Dichotomously scored distance item.}
+	\item{\code{d2}}{Dichotomously scored distance item.}
+	\item{\code{d3}}{Dichotomously scored distance item.}
+	\item{\code{d4}}{Dichotomously scored distance item.}
+  }
+}
+
+\source{
+
+	Brenda Jansen (2001),\emph{Development of reasoning on the balance
+	scale task: Psychometric assessment of cognitive strategies}.  PhD
+	thesis, University of Amsterdam, Department of Psychology.
+
+}
+
+\examples{
+data(balance)
+}
+
+\keyword{datasets}