SCM

SCM Repository

[matrix] Diff of /pkg/src/dsyMatrix.c
ViewVC logotype

Diff of /pkg/src/dsyMatrix.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 475, Tue Feb 1 14:44:06 2005 UTC revision 476, Wed Feb 2 11:51:24 2005 UTC
# Line 113  Line 113 
113          rcondSym = Matrix_rcondSym;          rcondSym = Matrix_rcondSym;
114    
115      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));
116      SET_SLOT(val, Matrix_factorization, allocVector(VECSXP, 0));      SET_SLOT(val, Matrix_factorSym, allocVector(VECSXP, 0));
117      SET_SLOT(val, rcondSym, duplicate(GET_SLOT(from, rcondSym)));      SET_SLOT(val, rcondSym, duplicate(GET_SLOT(from, rcondSym)));
118      SET_SLOT(val, Matrix_xSym, duplicate(GET_SLOT(from, Matrix_xSym)));      SET_SLOT(val, Matrix_xSym, duplicate(GET_SLOT(from, Matrix_xSym)));
119      SET_SLOT(val, Matrix_DimSym,      SET_SLOT(val, Matrix_DimSym,
# Line 149  Line 149 
149          error("Matrices are not conformable for multiplication");          error("Matrices are not conformable for multiplication");
150      if (m < 1 || n < 1 || k < 1)      if (m < 1 || n < 1 || k < 1)
151          error("Matrices with zero extents cannot be multiplied");          error("Matrices with zero extents cannot be multiplied");
152      SET_SLOT(val, Matrix_factorization, allocVector(VECSXP, 0));      SET_SLOT(val, Matrix_factorSym, allocVector(VECSXP, 0));
153      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));
154      SET_SLOT(val, Matrix_xSym, allocVector(REALSXP, m * n));      SET_SLOT(val, Matrix_xSym, allocVector(REALSXP, m * n));
155      SET_SLOT(val, Matrix_DimSym, allocVector(INTSXP, 2));      SET_SLOT(val, Matrix_DimSym, allocVector(INTSXP, 2));
# Line 178  Line 178 
178      if (m < 1 || n < 1 || k < 1)      if (m < 1 || n < 1 || k < 1)
179          error("Matrices with zero extents cannot be multiplied");          error("Matrices with zero extents cannot be multiplied");
180      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));      SET_SLOT(val, Matrix_rcondSym, allocVector(REALSXP, 0));
181      SET_SLOT(val, Matrix_factorization, allocVector(VECSXP, 0));      SET_SLOT(val, Matrix_factorSym, allocVector(VECSXP, 0));
182      SET_SLOT(val, Matrix_xSym, allocVector(REALSXP, m * n));      SET_SLOT(val, Matrix_xSym, allocVector(REALSXP, m * n));
183      SET_SLOT(val, Matrix_DimSym, allocVector(INTSXP, 2));      SET_SLOT(val, Matrix_DimSym, allocVector(INTSXP, 2));
184      cdims = INTEGER(GET_SLOT(val, Matrix_DimSym));      cdims = INTEGER(GET_SLOT(val, Matrix_DimSym));

Legend:
Removed from v.475  
changed lines
  Added in v.476

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge