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 2495, Wed Nov 11 08:45:21 2009 UTC pkg/Matrix/src/Csparse.c revision 2586, Sun Jul 25 02:32:06 2010 UTC
# Line 371  Line 371 
371  #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY  #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
372      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;      CHM_TR cht = trip ? AS_CHM_TR(x) : (CHM_TR) NULL;
373  #else /* workaround needed:*/  #else /* workaround needed:*/
374      CHM_TR cht = trip ? AS_CHM_TR__(Tsparse_diagU2N(x)) : (CHM_TR) NULL;      SEXP xx = PROTECT(Tsparse_diagU2N(x));
375        CHM_TR cht = trip ? AS_CHM_TR__(xx) : (CHM_TR) NULL;
376  #endif  #endif
377      CHM_SP chcp, chxt,      CHM_SP chcp, chxt,
378          chx = (trip ?          chx = (trip ?
# Line 394  Line 395 
395                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),                     duplicate(VECTOR_ELT(GET_SLOT(x, Matrix_DimNamesSym),
396                                          (tr) ? 0 : 1)));                                          (tr) ? 0 : 1)));
397      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));      SET_VECTOR_ELT(dn, 1, duplicate(VECTOR_ELT(dn, 0)));
398    #ifdef AS_CHM_DIAGU2N_FIXED_FINALLY
399      UNPROTECT(1);      UNPROTECT(1);
400    #else
401        UNPROTECT(2);
402    #endif
403      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);
404  }  }
405    
# Line 420  Line 425 
425  SEXP Csparse_horzcat(SEXP x, SEXP y)  SEXP Csparse_horzcat(SEXP x, SEXP y)
426  {  {
427      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);
428      int Rkind = 0; /* only for "d" - FIXME */      int Rk_x = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0,
429            Rk_y = (chy->xtype != CHOLMOD_PATTERN) ? Real_kind(y) : 0,
430            Rkind = /* logical if both x and y are */ (Rk_x == 1 && Rk_y == 1) ? 1 : 0;
431      R_CheckStack();      R_CheckStack();
432    
433      /* FIXME: currently drops dimnames */      /* TODO: currently drops dimnames - and we fix at R level */
434      return chm_sparse_to_SEXP(cholmod_l_horzcat(chx, chy, 1, &c),      return chm_sparse_to_SEXP(cholmod_l_horzcat(chx, chy, 1, &c),
435                                1, 0, Rkind, "", R_NilValue);                                1, 0, Rkind, "", R_NilValue);
436  }  }
# Line 431  Line 438 
438  SEXP Csparse_vertcat(SEXP x, SEXP y)  SEXP Csparse_vertcat(SEXP x, SEXP y)
439  {  {
440      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);      CHM_SP chx = AS_CHM_SP__(x), chy = AS_CHM_SP__(y);
441      int Rkind = 0; /* only for "d" - FIXME */      int Rk_x = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0,
442            Rk_y = (chy->xtype != CHOLMOD_PATTERN) ? Real_kind(y) : 0,
443            Rkind = /* logical if both x and y are */ (Rk_x == 1 && Rk_y == 1) ? 1 : 0;
444      R_CheckStack();      R_CheckStack();
445    
446      /* FIXME: currently drops dimnames */      /* TODO: currently drops dimnames - and we fix at R level */
447      return chm_sparse_to_SEXP(cholmod_l_vertcat(chx, chy, 1, &c),      return chm_sparse_to_SEXP(cholmod_l_vertcat(chx, chy, 1, &c),
448                                1, 0, Rkind, "", R_NilValue);                                1, 0, Rkind, "", R_NilValue);
449  }  }
# Line 498  Line 507 
507      }      }
508  }  }
509    
510    /**
511     * "Indexing" aka subsetting : Compute  x[i,j], also for vectors i and j
512     * Working via CHOLMOD_submatrix, see ./CHOLMOD/MatrixOps/cholmod_submatrix.c
513     * @param x CsparseMatrix
514     * @param i row     indices (0-origin), or NULL (R's)
515     * @param j columns indices (0-origin), or NULL
516     *
517     * @return x[i,j]  still CsparseMatrix --- currently, this loses dimnames
518     */
519  SEXP Csparse_submatrix(SEXP x, SEXP i, SEXP j)  SEXP Csparse_submatrix(SEXP x, SEXP i, SEXP j)
520  {  {
521      CHM_SP chx = AS_CHM_SP__(x);      CHM_SP chx = AS_CHM_SP(x); /* << does diagU2N() when needed */
522      int rsize = (isNull(i)) ? -1 : LENGTH(i),      int rsize = (isNull(i)) ? -1 : LENGTH(i),
523          csize = (isNull(j)) ? -1 : LENGTH(j);          csize = (isNull(j)) ? -1 : LENGTH(j);
524      int Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;      int Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
# Line 511  Line 529 
529      if (csize >= 0 && !isInteger(j))      if (csize >= 0 && !isInteger(j))
530          error(_("Index j must be NULL or integer"));          error(_("Index j must be NULL or integer"));
531    
532      return chm_sparse_to_SEXP(cholmod_l_submatrix(chx, INTEGER(i), rsize,      if (chx->stype) /* symmetricMatrix */
533                                                  INTEGER(j), csize,          /* for now, cholmod_submatrix() only accepts "generalMatrix" */
534            chx = cholmod_l_copy(chx, /* stype: */ 0, chx->xtype, &c);
535    
536        return chm_sparse_to_SEXP(cholmod_l_submatrix(chx,
537                                    (rsize < 0) ? NULL : INTEGER(i), rsize,
538                                    (csize < 0) ? NULL : INTEGER(j), csize,
539                                                  TRUE, TRUE, &c),                                                  TRUE, TRUE, &c),
540                                1, 0, Rkind, "",                                1, 0, Rkind, "",
541                                /* FIXME: drops dimnames */ R_NilValue);                                /* FIXME: drops dimnames */ R_NilValue);

Legend:
Removed from v.2495  
changed lines
  Added in v.2586

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