Subversion Repositories OpenMx

Compare Revisions

Ignore whitespace Rev 1647 → Rev 1648

/trunk/R/MxMatrix.R
166,18 → 166,11
} else {
name <- x@name
}
labels <- as.matrix(x@labels[i,j])
values <- as.matrix(x@values[i,j])
free <- as.matrix(x@free[i,j])
lbound <- as.matrix(x@lbound[i,j])
ubound <- as.matrix(x@ubound[i,j])
if(!missing(i) && missing(j) && length(i) == 1) {
labels <- t(labels)
values <- t(values)
free <- t(free)
lbound <- t(lbound)
ubound <- t(ubound)
}
labels <- as.matrix(x@labels[i, j, drop = drop])
values <- as.matrix(x@values[i, j, drop = drop])
free <- as.matrix(x@free[i, j, drop = drop])
lbound <- as.matrix(x@lbound[i, j, drop = drop])
ubound <- as.matrix(x@ubound[i, j, drop = drop])
type <- class(x)[[1]]
nrow <- nrow(labels)
ncol <- ncol(labels)
/trunk/CHANGES
4,6 → 4,7
* allow non-RAM objective functions in RAM model
* change model type names to 'default' and 'RAM'
* no longer explicitly transforming RAM + raw data models into FIML models
* fixed bug in MxMatrix indexing operator
 
Pre-Release 999.0.0-1609 (April 7, 2011)
========================================
/tags/stable-1.0/R/MxMatrix.R
161,18 → 161,11
} else {
name <- x@name
}
labels <- as.matrix(x@labels[i,j])
values <- as.matrix(x@values[i,j])
free <- as.matrix(x@free[i,j])
lbound <- as.matrix(x@lbound[i,j])
ubound <- as.matrix(x@ubound[i,j])
if(!missing(i) && missing(j) && length(i) == 1) {
labels <- t(labels)
values <- t(values)
free <- t(free)
lbound <- t(lbound)
ubound <- t(ubound)
}
labels <- as.matrix(x@labels[i, j, drop = drop])
values <- as.matrix(x@values[i, j, drop = drop])
free <- as.matrix(x@free[i, j, drop = drop])
lbound <- as.matrix(x@lbound[i, j, drop = drop])
ubound <- as.matrix(x@ubound[i, j, drop = drop])
type <- class(x)[[1]]
nrow <- nrow(labels)
ncol <- ncol(labels)
/tags/stable-1.0/CHANGES
1,6 → 1,7
svn repository
==============
* error checking in front-end for non-positive-definite observed covariance matrices
* fix bug in MxMatrix indexing operator
 
Release 1.0.6-1581 (March 10, 2011)
===================================