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 2731, Mon Oct 17 18:07:09 2011 UTC revision 2772, Wed Mar 7 13:47:37 2012 UTC
# Line 566  Line 566 
566      }      }
567      else { /* triangular with diag='N'): now drop the diagonal */      else { /* triangular with diag='N'): now drop the diagonal */
568          /* duplicate, since chx will be modified: */          /* duplicate, since chx will be modified: */
569          CHM_SP chx = AS_CHM_SP__(duplicate(x));          SEXP xx = PROTECT(duplicate(x));
570            CHM_SP chx = AS_CHM_SP__(xx);
571          int uploT = (*uplo_P(x) == 'U') ? 1 : -1,          int uploT = (*uplo_P(x) == 'U') ? 1 : -1,
572              Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;              Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
573          R_CheckStack();          R_CheckStack();
574    
575          chm_diagN2U(chx, uploT, /* do_realloc */ FALSE);          chm_diagN2U(chx, uploT, /* do_realloc */ FALSE);
576    
577            UNPROTECT(1);
578          return chm_sparse_to_SEXP(chx, /*dofree*/ 0/* or 1 ?? */,          return chm_sparse_to_SEXP(chx, /*dofree*/ 0/* or 1 ?? */,
579                                    uploT, Rkind, "U",                                    uploT, Rkind, "U",
580                                    GET_SLOT(x, Matrix_DimNamesSym));                                    GET_SLOT(x, Matrix_DimNamesSym));

Legend:
Removed from v.2731  
changed lines
  Added in v.2772

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