SCM

SCM Repository

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

Diff of /pkg/src/dspMatrix.c

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

revision 1866, Mon Jun 4 17:11:11 2007 UTC revision 1867, Mon Jun 4 17:13:02 2007 UTC
# Line 15  Line 15 
15      }      }
16  }  }
17    
18  double get_norm_sp(SEXP obj, char *typstr)  double get_norm_sp(SEXP obj, const char *typstr)
19  {  {
20      char typnm[] = {'\0', '\0'};      char typnm[] = {'\0', '\0'};
21      int *dims = INTEGER(GET_SLOT(obj, Matrix_DimSym));      int *dims = INTEGER(GET_SLOT(obj, Matrix_DimSym));
# Line 109  Line 109 
109      SEXP val = PROTECT(dup_mMatrix_as_dgeMatrix(b));      SEXP val = PROTECT(dup_mMatrix_as_dgeMatrix(b));
110      int *bdims = INTEGER(GET_SLOT(val, Matrix_DimSym));      int *bdims = INTEGER(GET_SLOT(val, Matrix_DimSym));
111      int i, ione = 1, n = bdims[0], nrhs = bdims[1];      int i, ione = 1, n = bdims[0], nrhs = bdims[1];
112      char *uplo = uplo_P(a);      const char *uplo = uplo_P(a);
113      double *ax = REAL(GET_SLOT(a, Matrix_xSym)), one = 1., zero = 0.,      double *ax = REAL(GET_SLOT(a, Matrix_xSym)), one = 1., zero = 0.,
114          *vx = REAL(GET_SLOT(val, Matrix_xSym));          *vx = REAL(GET_SLOT(val, Matrix_xSym));
115      double *bx = Memcpy(Calloc(n * nrhs, double), vx, n * nrhs);      double *bx = Memcpy(Calloc(n * nrhs, double), vx, n * nrhs);
# Line 133  Line 133 
133          uploP = GET_SLOT(x, Matrix_uploSym);          uploP = GET_SLOT(x, Matrix_uploSym);
134      int *dims = INTEGER(dimP), *perm, info;      int *dims = INTEGER(dimP), *perm, info;
135      int n = dims[0];      int n = dims[0];
136      char *uplo = CHAR(STRING_ELT(uploP, 0));      const char *uplo = CHAR(STRING_ELT(uploP, 0));
137    
138      if (val != R_NilValue) return val;      if (val != R_NilValue) return val;
139      dims = INTEGER(dimP);      dims = INTEGER(dimP);

Legend:
Removed from v.1866  
changed lines
  Added in v.1867

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