SCM

SCM Repository

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

Diff of /pkg/Matrix/src/Csparse.c

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

revision 1375, Tue Aug 15 18:21:49 2006 UTC revision 1419, Tue Aug 22 22:49:17 2006 UTC
# Line 73  Line 73 
73    
74      Free(chxs);      Free(chxs);
75      if (asLogical(tri)) {       /* triangular sparse matrices */      if (asLogical(tri)) {       /* triangular sparse matrices */
76          uploT = (strcmp(CHAR(asChar(GET_SLOT(x, Matrix_uploSym))), "U")) ?          uploT = (*uplo_P(x) == 'U') ? -1 : 1;
77              -1 : 1;          diag = diag_P(x);
         diag = CHAR(asChar(GET_SLOT(x, Matrix_diagSym)));  
78      }      }
79      return chm_triplet_to_SEXP(chxt, 1, uploT, diag,      return chm_triplet_to_SEXP(chxt, 1, uploT, diag,
80                                 GET_SLOT(x, Matrix_DimNamesSym));                                 GET_SLOT(x, Matrix_DimNamesSym));
# Line 108  Line 107 
107      SET_VECTOR_ELT(dn, 1, tmp);      SET_VECTOR_ELT(dn, 1, tmp);
108      UNPROTECT(1);      UNPROTECT(1);
109      if (asLogical(tri)) {       /* triangular sparse matrices */      if (asLogical(tri)) {       /* triangular sparse matrices */
110          uploT = (strcmp(CHAR(asChar(GET_SLOT(x, Matrix_uploSym))), "U")) ?          uploT = (*uplo_P(x) == 'U') ? -1 : 1;
111              1 : -1;             /* switch upper and lower for transpose */          diag = diag_P(x);
         diag = CHAR(asChar(GET_SLOT(x, Matrix_diagSym)));  
112      }      }
113      return chm_sparse_to_SEXP(chxt, 1, uploT, diag, dn);      return chm_sparse_to_SEXP(chxt, 1, uploT, diag, dn);
114  }  }

Legend:
Removed from v.1375  
changed lines
  Added in v.1419

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