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 2673, Fri May 20 16:19:18 2011 UTC revision 2772, Wed Mar 7 13:47:37 2012 UTC
# Line 1  Line 1 
1                          /* Sparse matrices in compressed column-oriented form */                          /* Sparse matrices in compressed column-oriented form */
2    
3  #include "Csparse.h"  #include "Csparse.h"
4  #include "Tsparse.h"  #include "Tsparse.h"
5  #include "chm_common.h"  #include "chm_common.h"
# Line 565  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));
# Line 600  Line 603 
603      if (csize >= 0 && !isInteger(j))      if (csize >= 0 && !isInteger(j))
604          error(_("Index j must be NULL or integer"));          error(_("Index j must be NULL or integer"));
605    
606      if (chx->stype) /* symmetricMatrix */      if (!chx->stype) {/* non-symmetric Matrix */
         /* for now, cholmod_submatrix() only accepts "generalMatrix" */  
         chx = cholmod_copy(chx, /* stype: */ 0, chx->xtype, &c);  
   
607      return chm_sparse_to_SEXP(cholmod_submatrix(chx,      return chm_sparse_to_SEXP(cholmod_submatrix(chx,
608                                  (rsize < 0) ? NULL : INTEGER(i), rsize,                                  (rsize < 0) ? NULL : INTEGER(i), rsize,
609                                  (csize < 0) ? NULL : INTEGER(j), csize,                                  (csize < 0) ? NULL : INTEGER(j), csize,
# Line 611  Line 611 
611                                1, 0, Rkind, "",                                1, 0, Rkind, "",
612                                /* FIXME: drops dimnames */ R_NilValue);                                /* FIXME: drops dimnames */ R_NilValue);
613  }  }
614                                    /* for now, cholmod_submatrix() only accepts "generalMatrix" */
615        CHM_SP tmp = cholmod_copy(chx, /* stype: */ 0, chx->xtype, &c);
616        CHM_SP ans = cholmod_submatrix(tmp,
617                                       (rsize < 0) ? NULL : INTEGER(i), rsize,
618                                       (csize < 0) ? NULL : INTEGER(j), csize,
619                                       TRUE, TRUE, &c);
620        cholmod_free_sparse(&tmp, &c);
621        return chm_sparse_to_SEXP(ans, 1, 0, Rkind, "", R_NilValue);
622    }
623    
624  /**  #define _d_Csp_
625   * Subassignment:  x[i,j]  <- value  #include "t_Csparse_subassign.c"
  *  
  * @param x  
  * @param i_ integer row    index 0-origin vector (as returned from R .ind.prep2())  
  * @param j_ integer column index 0-origin vector  
  * @param value currently must be a dsparseVector {which is recycled if needed}  
  *  
  * @return a Csparse matrix like x, but with the values replaced  
  */  
 SEXP Csparse_subassign(SEXP x, SEXP i_, SEXP j_, SEXP value)  
 {  
     static const char  
         *valid_cM [] = {"dgCMatrix",// the only one, for "the moment", more later  
                         ""},  
         *valid_spv[] = {"dsparseVector",  
                         ""};  
   
     int ctype = Matrix_check_class_etc(x, valid_cM);  
     if (ctype < 0)  
         error(_("invalid class of 'x' in Csparse_subassign()"));  
     // value: assume a  "dsparseVector" for now -- slots: (i, length, x)  
     ctype = Matrix_check_class_etc(value, valid_spv);  
     if (ctype < 0)  
         error(_("invalid class of 'value' in Csparse_subassign()"));  
   
     SEXP ans,  
         pslot = GET_SLOT(x, Matrix_pSym),  
         islot = GET_SLOT(x, Matrix_iSym),  
         i_cp = PROTECT((TYPEOF(i_) == INTSXP) ?  
                        duplicate(i_) : coerceVector(i_, INTSXP)),  
         j_cp = PROTECT((TYPEOF(j_) == INTSXP) ?  
                        duplicate(j_) : coerceVector(j_, INTSXP)),  
         // for d.CMatrix and l.CMatrix  but not n.CMatrix:  
         xslot = GET_SLOT(x, Matrix_xSym);  
   
     int *dims = INTEGER(GET_SLOT(x, Matrix_DimSym)),  
         nrow = dims[0],  
         ncol = dims[1],  
         *xp = INTEGER(pslot),  
         *xi = INTEGER(islot),  
         *ii = INTEGER(i_cp), len_i = LENGTH(i_cp),  
         *jj = INTEGER(j_cp), len_j = LENGTH(j_cp),  
         i, j, k;  
     int    *val_i = INTEGER(GET_SLOT(value, Matrix_iSym));  
     // for dsparseVector only:  
     double *val_x =   REAL (GET_SLOT(value, Matrix_xSym));  
     int len_val = asInteger(GET_SLOT(value, Matrix_lengthSym));  
     int p_last = xp[0];  
   
     // for d.CMatrix only:  
     double *xx = REAL(xslot);  
     double ind; // the index that goes all the way from 1:(len_i * len_j)  
   
     PROTECT(ans = duplicate(x));  
     for(j = 0; j < ncol; j++) {  
 // FIXME  
 // ....  
 // ....  
 // ....  
 // ....  
   
626    
627    #define _l_Csp_
628    #include "t_Csparse_subassign.c"
629    
630    #define _i_Csp_
631    #include "t_Csparse_subassign.c"
632    
633    #define _n_Csp_
634    #include "t_Csparse_subassign.c"
635    
636    #define _z_Csp_
637    #include "t_Csparse_subassign.c"
638    
639    
 // ....  
 // ....  
 // ....  
 // ....  
 // ....  
     }  
     UNPROTECT(3);  
     return ans;  
 }  
640    
641  SEXP Csparse_MatrixMarket(SEXP x, SEXP fname)  SEXP Csparse_MatrixMarket(SEXP x, SEXP fname)
642  {  {

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

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