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

pkg/src/Csparse.c revision 2319, Sun Jan 18 20:04:54 2009 UTC pkg/Matrix/src/Csparse.c revision 2646, Mon Feb 21 10:57:49 2011 UTC
# Line 161  Line 161 
161      return chm_dense_to_SEXP(chxd, 1, Rkind, GET_SLOT(x, Matrix_DimNamesSym));      return chm_dense_to_SEXP(chxd, 1, Rkind, GET_SLOT(x, Matrix_DimNamesSym));
162  }  }
163    
164    // FIXME: do not go via CHM (should not be too hard, to just *drop* the x-slot, right?
165  SEXP Csparse_to_nz_pattern(SEXP x, SEXP tri)  SEXP Csparse_to_nz_pattern(SEXP x, SEXP tri)
166  {  {
167      CHM_SP chxs = AS_CHM_SP__(x);      CHM_SP chxs = AS_CHM_SP__(x);
# Line 174  Line 175 
175                                GET_SLOT(x, Matrix_DimNamesSym));                                GET_SLOT(x, Matrix_DimNamesSym));
176  }  }
177    
178    // n.CMatrix --> [dli].CMatrix  (not going through CHM!)
179    SEXP nz_pattern_to_Csparse(SEXP x, SEXP res_kind)
180    {
181        return nz2Csparse(x, asInteger(res_kind));
182    }
183    // n.CMatrix --> [dli].CMatrix  (not going through CHM!)
184    SEXP nz2Csparse(SEXP x, enum x_slot_kind r_kind)
185    {
186        const char *cl_x = class_P(x);
187        if(cl_x[0] != 'n') error(_("not a 'n.CMatrix'"));
188        if(cl_x[2] != 'C') error(_("not a CsparseMatrix"));
189        int nnz = LENGTH(GET_SLOT(x, Matrix_iSym));
190        SEXP ans;
191        char *ncl = strdup(cl_x);
192        double *dx_x; int *ix_x;
193        ncl[0] = (r_kind == x_double ? 'd' :
194                  (r_kind == x_logical ? 'l' :
195                   /* else (for now):  r_kind == x_integer : */ 'i'));
196        PROTECT(ans = NEW_OBJECT(MAKE_CLASS(ncl)));
197        // create a correct 'x' slot:
198        switch(r_kind) {
199            int i;
200        case x_double: // 'd'
201            dx_x = REAL(ALLOC_SLOT(ans, Matrix_xSym, REALSXP, nnz));
202            for (i=0; i < nnz; i++) dx_x[i] = 1.;
203            break;
204        case x_logical: // 'l'
205            ix_x = LOGICAL(ALLOC_SLOT(ans, Matrix_xSym, LGLSXP, nnz));
206            for (i=0; i < nnz; i++) ix_x[i] = TRUE;
207            break;
208        case x_integer: // 'i'
209            ix_x = INTEGER(ALLOC_SLOT(ans, Matrix_xSym, INTSXP, nnz));
210            for (i=0; i < nnz; i++) ix_x[i] = 1;
211            break;
212    
213        default:
214            error(_("nz2Csparse(): invalid/non-implemented r_kind = %d"),
215                  r_kind);
216        }
217    
218        // now copy all other slots :
219        slot_dup(ans, x, Matrix_iSym);
220        slot_dup(ans, x, Matrix_pSym);
221        slot_dup(ans, x, Matrix_DimSym);
222        slot_dup(ans, x, Matrix_DimNamesSym);
223        if(ncl[1] != 'g') { // symmetric or triangular ...
224            slot_dup_if_has(ans, x, Matrix_uploSym);
225            slot_dup_if_has(ans, x, Matrix_diagSym);
226        }
227        UNPROTECT(1);
228        return ans;
229    }
230    
231  SEXP Csparse_to_matrix(SEXP x)  SEXP Csparse_to_matrix(SEXP x)
232  {  {
233      return chm_dense_to_matrix(cholmod_l_sparse_to_dense(AS_CHM_SP__(x), &c),      return chm_dense_to_matrix(cholmod_l_sparse_to_dense(AS_CHM_SP__(x), &c),
# Line 248  Line 302 
302          cha = AS_CHM_SP(a),          cha = AS_CHM_SP(a),
303          chb = AS_CHM_SP(b),          chb = AS_CHM_SP(b),
304          chc = cholmod_l_ssmult(cha, chb, /*out_stype:*/ 0,          chc = cholmod_l_ssmult(cha, chb, /*out_stype:*/ 0,
305                               cha->xtype, /*out sorted:*/ 1, &c);                                 /* values:= is_numeric (T/F) */ cha->xtype > 0,
306                                   /*out sorted:*/ 1, &c);
307      const char *cl_a = class_P(a), *cl_b = class_P(b);      const char *cl_a = class_P(a), *cl_b = class_P(b);
308      char diag[] = {'\0', '\0'};      char diag[] = {'\0', '\0'};
309      int uploT = 0;      int uploT = 0;
310      SEXP dn = allocVector(VECSXP, 2);      SEXP dn = PROTECT(allocVector(VECSXP, 2));
311      R_CheckStack();      R_CheckStack();
312    
313    #ifdef DEBUG_Matrix_verbose
314        Rprintf("DBG Csparse_C*_prod(%s, %s)\n", cl_a, cl_b);
315    #endif
316    
317      /* Preserve triangularity and even unit-triangularity if appropriate.      /* Preserve triangularity and even unit-triangularity if appropriate.
318       * Note that in that case, the multiplication itself should happen       * Note that in that case, the multiplication itself should happen
319       * faster.  But there's no support for that in CHOLMOD */       * faster.  But there's no support for that in CHOLMOD */
# Line 276  Line 335 
335                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 0)));                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 0)));
336      SET_VECTOR_ELT(dn, 1,      SET_VECTOR_ELT(dn, 1,
337                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), 1)));                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), 1)));
338        UNPROTECT(1);
339      return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);      return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);
340  }  }
341    
# Line 289  Line 349 
349      const char *cl_a = class_P(a), *cl_b = class_P(b);      const char *cl_a = class_P(a), *cl_b = class_P(b);
350      char diag[] = {'\0', '\0'};      char diag[] = {'\0', '\0'};
351      int uploT = 0;      int uploT = 0;
352      SEXP dn = allocVector(VECSXP, 2);      SEXP dn = PROTECT(allocVector(VECSXP, 2));
353      R_CheckStack();      R_CheckStack();
354    
355      chTr = cholmod_l_transpose((tr) ? chb : cha, chb->xtype, &c);      chTr = cholmod_l_transpose((tr) ? chb : cha, chb->xtype, &c);
# Line 308  Line 368 
368              }              }
369              else diag[0]= 'N';              else diag[0]= 'N';
370          }          }
   
371      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */
372                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), (tr) ? 0 : 1)));                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), (tr) ? 0 : 1)));
373      SET_VECTOR_ELT(dn, 1,      SET_VECTOR_ELT(dn, 1,
374                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), (tr) ? 0 : 1)));                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), (tr) ? 0 : 1)));
375        UNPROTECT(1);
376      return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);      return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);
377  }  }
378    
# Line 325  Line 385 
385                                          chb->xtype, &c);                                          chb->xtype, &c);
386      SEXP dn = PROTECT(allocVector(VECSXP, 2));      SEXP dn = PROTECT(allocVector(VECSXP, 2));
387      double one[] = {1,0}, zero[] = {0,0};      double one[] = {1,0}, zero[] = {0,0};
388        int nprot = 2;
389      R_CheckStack();      R_CheckStack();
390        /* Tim Davis, please FIXME:  currently (2010-11) *fails* when  a  is a pattern matrix:*/
391        if(cha->xtype == CHOLMOD_PATTERN) {
392            /* warning(_("Csparse_dense_prod(): cholmod_sdmult() not yet implemented for pattern./ ngCMatrix" */
393            /*        " --> slightly inefficient coercion")); */
394    
395            // This *fails* to produce a CHOLMOD_REAL ..
396            // CHM_SP chd = cholmod_l_copy(cha, cha->stype, CHOLMOD_REAL, &c);
397            // --> use our Matrix-classes
398            SEXP da = PROTECT(nz2Csparse(a, x_double)); nprot++;
399            cha = AS_CHM_SP(da);
400        }
401      cholmod_l_sdmult(cha, 0, one, zero, chb, chc, &c);      cholmod_l_sdmult(cha, 0, one, zero, chb, chc, &c);
402      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */
403                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 0)));                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 0)));
404      SET_VECTOR_ELT(dn, 1,      SET_VECTOR_ELT(dn, 1,
405                     duplicate(VECTOR_ELT(GET_SLOT(b_M, Matrix_DimNamesSym), 1)));                     duplicate(VECTOR_ELT(GET_SLOT(b_M, Matrix_DimNamesSym), 1)));
406      UNPROTECT(2);      UNPROTECT(nprot);
407      return chm_dense_to_SEXP(chc, 1, 0, dn);      return chm_dense_to_SEXP(chc, 1, 0, dn);
408  }  }
409    
# Line 343  Line 414 
414      CHM_DN chb = AS_CHM_DN(b_M);      CHM_DN chb = AS_CHM_DN(b_M);
415      CHM_DN chc = cholmod_l_allocate_dense(cha->ncol, chb->ncol, cha->ncol,      CHM_DN chc = cholmod_l_allocate_dense(cha->ncol, chb->ncol, cha->ncol,
416                                          chb->xtype, &c);                                          chb->xtype, &c);
417      SEXP dn = PROTECT(allocVector(VECSXP, 2));      SEXP dn = PROTECT(allocVector(VECSXP, 2)); int nprot = 2;
418      double one[] = {1,0}, zero[] = {0,0};      double one[] = {1,0}, zero[] = {0,0};
419      R_CheckStack();      R_CheckStack();
420        // -- see Csparse_dense_prod() above :
421        if(cha->xtype == CHOLMOD_PATTERN) {
422            SEXP da = PROTECT(nz2Csparse(a, x_double)); nprot++;
423            cha = AS_CHM_SP(da);
424        }
425      cholmod_l_sdmult(cha, 1, one, zero, chb, chc, &c);      cholmod_l_sdmult(cha, 1, one, zero, chb, chc, &c);
426      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */
427                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 1)));                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 1)));
428      SET_VECTOR_ELT(dn, 1,      SET_VECTOR_ELT(dn, 1,
429                     duplicate(VECTOR_ELT(GET_SLOT(b_M, Matrix_DimNamesSym), 1)));                     duplicate(VECTOR_ELT(GET_SLOT(b_M, Matrix_DimNamesSym), 1)));
430      UNPROTECT(2);      UNPROTECT(nprot);
431      return chm_dense_to_SEXP(chc, 1, 0, dn);      return chm_dense_to_SEXP(chc, 1, 0, dn);
432  }  }
433    
# Line 362  Line 437 
437  {  {
438      int trip = asLogical(triplet),      int trip = asLogical(triplet),
439          tr   = asLogical(trans); /* gets reversed because _aat is tcrossprod */          tr   = asLogical(trans); /* gets reversed because _aat is tcrossprod */
440    #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
441      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;
442    #else /* workaround needed:*/
443        SEXP xx = PROTECT(Tsparse_diagU2N(x));
444        CHM_TR cht = trip ? AS_CHM_TR__(xx) : (CHM_TR) NULL;
445    #endif
446      CHM_SP chcp, chxt,      CHM_SP chcp, chxt,
447          chx = (trip ?          chx = (trip ?
448                 cholmod_l_triplet_to_sparse(cht, cht->nnz, &c) :                 cholmod_l_triplet_to_sparse(cht, cht->nnz, &c) :
# Line 384  Line 464 
464                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),
465                                          (tr) ? 0 : 1)));                                          (tr) ? 0 : 1)));
466      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));
467    #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
468      UNPROTECT(1);      UNPROTECT(1);
469    #else
470        UNPROTECT(2);
471    #endif
472      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);
473  }  }
474    
475    /* Csparse_drop(x, tol):  drop entries with absolute value < tol, i.e,
476    *  at least all "explicit" zeros */
477  SEXP Csparse_drop(SEXP x, SEXP tol)  SEXP Csparse_drop(SEXP x, SEXP tol)
478  {  {
479      const char *cl = class_P(x);      const char *cl = class_P(x);
# Line 410  Line 496 
496  SEXP Csparse_horzcat(SEXP x, SEXP y)  SEXP Csparse_horzcat(SEXP x, SEXP y)
497  {  {
498      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);
499      int Rkind = 0; /* only for "d" - FIXME */      int Rk_x = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0,
500            Rk_y = (chy->xtype != CHOLMOD_PATTERN) ? Real_kind(y) : 0,
501            Rkind = /* logical if both x and y are */ (Rk_x == 1 && Rk_y == 1) ? 1 : 0;
502      R_CheckStack();      R_CheckStack();
503    
504      /* FIXME: currently drops dimnames */      /* TODO: currently drops dimnames - and we fix at R level */
505      return chm_sparse_to_SEXP(cholmod_l_horzcat(chx, chy, 1, &c),      return chm_sparse_to_SEXP(cholmod_l_horzcat(chx, chy, 1, &c),
506                                1, 0, Rkind, "", R_NilValue);                                1, 0, Rkind, "", R_NilValue);
507  }  }
# Line 421  Line 509 
509  SEXP Csparse_vertcat(SEXP x, SEXP y)  SEXP Csparse_vertcat(SEXP x, SEXP y)
510  {  {
511      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);
512      int Rkind = 0; /* only for "d" - FIXME */      int Rk_x = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0,
513            Rk_y = (chy->xtype != CHOLMOD_PATTERN) ? Real_kind(y) : 0,
514            Rkind = /* logical if both x and y are */ (Rk_x == 1 && Rk_y == 1) ? 1 : 0;
515      R_CheckStack();      R_CheckStack();
516    
517      /* FIXME: currently drops dimnames */      /* TODO: currently drops dimnames - and we fix at R level */
518      return chm_sparse_to_SEXP(cholmod_l_vertcat(chx, chy, 1, &c),      return chm_sparse_to_SEXP(cholmod_l_vertcat(chx, chy, 1, &c),
519                                1, 0, Rkind, "", R_NilValue);                                1, 0, Rkind, "", R_NilValue);
520  }  }
# Line 488  Line 578 
578      }      }
579  }  }
580    
581    /**
582     * "Indexing" aka subsetting : Compute  x[i,j], also for vectors i and j
583     * Working via CHOLMOD_submatrix, see ./CHOLMOD/MatrixOps/cholmod_submatrix.c
584     * @param x CsparseMatrix
585     * @param i row     indices (0-origin), or NULL (R's)
586     * @param j columns indices (0-origin), or NULL
587     *
588     * @return x[i,j]  still CsparseMatrix --- currently, this loses dimnames
589     */
590  SEXP Csparse_submatrix(SEXP x, SEXP i, SEXP j)  SEXP Csparse_submatrix(SEXP x, SEXP i, SEXP j)
591  {  {
592      CHM_SP chx = AS_CHM_SP__(x);      CHM_SP chx = AS_CHM_SP(x); /* << does diagU2N() when needed */
593      int rsize = (isNull(i)) ? -1 : LENGTH(i),      int rsize = (isNull(i)) ? -1 : LENGTH(i),
594          csize = (isNull(j)) ? -1 : LENGTH(j);          csize = (isNull(j)) ? -1 : LENGTH(j);
595      int Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;      int Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
# Line 501  Line 600 
600      if (csize >= 0 && !isInteger(j))      if (csize >= 0 && !isInteger(j))
601          error(_("Index j must be NULL or integer"));          error(_("Index j must be NULL or integer"));
602    
603      return chm_sparse_to_SEXP(cholmod_l_submatrix(chx, INTEGER(i), rsize,      if (chx->stype) /* symmetricMatrix */
604                                                  INTEGER(j), csize,          /* for now, cholmod_submatrix() only accepts "generalMatrix" */
605            chx = cholmod_l_copy(chx, /* stype: */ 0, chx->xtype, &c);
606    
607        return chm_sparse_to_SEXP(cholmod_l_submatrix(chx,
608                                    (rsize < 0) ? NULL : INTEGER(i), rsize,
609                                    (csize < 0) ? NULL : INTEGER(j), csize,
610                                                  TRUE, TRUE, &c),                                                  TRUE, TRUE, &c),
611                                1, 0, Rkind, "",                                1, 0, Rkind, "",
612                                /* FIXME: drops dimnames */ R_NilValue);                                /* FIXME: drops dimnames */ R_NilValue);
# Line 599  Line 703 
703          break;          break;
704    
705      default: /* -1 from above */      default: /* -1 from above */
706          error("diag_tC(): invalid 'resultKind'");          error(_("diag_tC(): invalid 'resultKind'"));
707          /* Wall: */ ans = R_NilValue; v = REAL(ans);          /* Wall: */ ans = R_NilValue; v = REAL(ans);
708      }      }
709    
# Line 675  Line 779 
779                  if (p[ii] > p[ii + 1])                  if (p[ii] > p[ii + 1])
780                      error(_("p must be non-decreasing"));                      error(_("p must be non-decreasing"));
781              if (p[np] != nnz)              if (p[np] != nnz)
782                  error(_("p[np] = %d != nnz = %d"), p[np], nnz);                  error("p[np] = %d != nnz = %d", p[np], nnz);
783              ij = Calloc(nnz, int);              ij = Calloc(nnz, int);
784              if (mi) {              if (mi) {
785                  i = ij;                  i = ij;
# Line 759  Line 863 
863      case 'l':      case 'l':
864          error(_("code not yet written for cls = \"lgCMatrix\""));          error(_("code not yet written for cls = \"lgCMatrix\""));
865      }      }
866    /* FIXME: dimnames are *NOT* put there yet (if non-NULL) */
867      cholmod_l_free_sparse(&A, &c);      cholmod_l_free_sparse(&A, &c);
868      UNPROTECT(1);      UNPROTECT(1);
869      return ans;      return ans;

Legend:
Removed from v.2319  
changed lines
  Added in v.2646

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