SCM Repository

[matrix] Diff of /pkg/src/Csparse.c

[matrix] / pkg / src / Csparse.c

Diff of /pkg/src/Csparse.c

-revision 2120, Tue Mar  4 21:44:41 2008 UTC
+revision 2125, Fri Mar  7 07:58:26 2008 UTC
 Line 206
      CHM_SP
          cha = AS_CHM_SP(Csparse_diagU2N(a)),
          chb = AS_CHM_SP(Csparse_diagU2N(b)),
-         chc = cholmod_ssmult(cha, chb, 0, cha->xtype, 1, &c);
+         chc = cholmod_ssmult(cha, chb, /*out_stype:*/ 0,
+                              cha->xtype, /*out sorted:*/ 1, &c);
+     const char *cl_a = class_P(a), *cl_b = class_P(b);
+     char diag[] = {'\0', '\0'};
+     int uploT = 0;
      SEXP dn = allocVector(VECSXP, 2);
      R_CheckStack();
+     /* Preserve triangularity and even unit-triangularity if appropriate.
+      * Note that in that case, the multiplication itself should happen
+      * faster.  But there's no support for that in CHOLMOD */
+     /* UGLY hack -- rather should have (fast!) C-level version of
+      *       is(a, "triangularMatrix") etc */
+     if (cl_a[1] == 't' && cl_b[1] == 't')
+         /* FIXME: fails for "Cholesky","BunchKaufmann"..*/
+         if(*uplo_P(a) == *uplo_P(b)) { /* both upper, or both lower tri. */
+             uploT = (*uplo_P(a) == 'U') ? 1 : -1;
+             if(*diag_P(a) == 'U' && *diag_P(b) == 'U') { /* return UNIT-triag. */
+                 /* "remove the diagonal entries": */
+                 chm_diagN2U(chc, uploT, /* do_realloc */ FALSE);
+                 diag[0]= 'U';
+             }
+             else diag[0]= 'N';
+         }
      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */
                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), 0)));
      SET_VECTOR_ELT(dn, 1,
                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), 1)));
-     return chm_sparse_to_SEXP(chc, 1, 0, 0, "", dn);
+     return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);
  }
  SEXP Csparse_Csparse_crossprod(SEXP a, SEXP b, SEXP trans)
-Line 224
+Line 245
          cha = AS_CHM_SP(Csparse_diagU2N(a)),
          chb = AS_CHM_SP(Csparse_diagU2N(b)),
          chTr, chc;
+     const char *cl_a = class_P(a), *cl_b = class_P(b);
+     char diag[] = {'\0', '\0'};
+     int uploT = 0;
      SEXP dn = allocVector(VECSXP, 2);
      R_CheckStack();
      chTr = cholmod_transpose((tr) ? chb : cha, chb->xtype, &c);
      chc = cholmod_ssmult((tr) ? cha : chTr, (tr) ? chTr : chb,
-, cha->xtype, 1, &c);
+                          /*out_stype:*/ 0, cha->xtype, /*out sorted:*/ 1, &c);
      cholmod_free_sparse(&chTr, &c);
+     /* Preserve triangularity and unit-triangularity if appropriate;
+      * see Csparse_Csparse_prod() for comments */
+     if (cl_a[1] == 't' && cl_b[1] == 't')
+         if(*uplo_P(a) != *uplo_P(b)) { /* one 'U', the other 'L' */
+             uploT = (*uplo_P(b) == 'U') ? 1 : -1;
+             if(*diag_P(a) == 'U' && *diag_P(b) == 'U') { /* return UNIT-triag. */
+                 chm_diagN2U(chc, uploT, /* do_realloc */ FALSE);
+                 diag[0]= 'U';
+             }
+             else diag[0]= 'N';
+         }
      SET_VECTOR_ELT(dn, 0,       /* establish dimnames */
                     duplicate(VECTOR_ELT(GET_SLOT(a, Matrix_DimNamesSym), (tr) ? 0 : 1)));
      SET_VECTOR_ELT(dn, 1,
                     duplicate(VECTOR_ELT(GET_SLOT(b, Matrix_DimNamesSym), (tr) ? 0 : 1)));
-     return chm_sparse_to_SEXP(chc, 1, 0, 0, "", dn);
+     return chm_sparse_to_SEXP(chc, 1, uploT, /*Rkind*/0, diag, dn);
  }
  SEXP Csparse_dense_prod(SEXP a, SEXP b)
-Line 279
+Line 315
      return chm_dense_to_SEXP(chc, 1, 0, dn);
  }
- /* Computes   x'x  or  x x'  -- see Csparse_Csparse_crossprod above for  x'y and x y' */
+ /* Computes   x'x  or  x x' -- *also* for Tsparse (triplet = TRUE)
+    see Csparse_Csparse_crossprod above for  x'y and x y' */
  SEXP Csparse_crossprod(SEXP x, SEXP trans, SEXP triplet)
  {
      int trip = asLogical(triplet),
-Line 362
+Line 399
      const char *cl = class_P(x);
      /* dtCMatrix, etc; [1] = the second character =?= 't' for triangular */
      if (cl[1] != 't' || *diag_P(x) != 'U') {
-         /* "trivially fast" when not triangular (<==> no 'diag' slot), or not *unit* triangular */
+         /* "trivially fast" when not triangular (<==> no 'diag' slot),
+            or not *unit* triangular */
          return (x);
      }
-     else {
+     else { /* unit triangular (diag='U'): "fill the diagonal" & diag:= "N" */
          CHM_SP chx = AS_CHM_SP(x);
          CHM_SP eye = cholmod_speye(chx->nrow, chx->ncol, chx->xtype, &c);
          double one[] = {1, 0};
-Line 379
+Line 417
                                    GET_SLOT(x, Matrix_DimNamesSym));
      }
  }
+ SEXP Csparse_diagN2U(SEXP x)
+ {
+     const char *cl = class_P(x);
+     /* dtCMatrix, etc; [1] = the second character =?= 't' for triangular */
+     if (cl[1] != 't' || *diag_P(x) != 'N') {
+         /* "trivially fast" when not triangular (<==> no 'diag' slot),
+            or already *unit* triangular */
+         return (x);
+     }
+     else { /* triangular with diag='N'): now drop the diagonal */
+         /* duplicate, since chx will be modified: */
+         CHM_SP chx = AS_CHM_SP(duplicate(x));
+         int uploT = (*uplo_P(x) == 'U') ? 1 : -1,
+             Rkind = (chx->xtype != CHOLMOD_PATTERN) ? Real_kind(x) : 0;
+         R_CheckStack();
+         chm_diagN2U(chx, uploT, /* do_realloc */ FALSE);
+         return chm_sparse_to_SEXP(chx, /*dofree*/ 0/* or 1 ?? */,
+                                   uploT, Rkind, "U",
+                                   GET_SLOT(x, Matrix_DimNamesSym));
+     }
+ }
  SEXP Csparse_submatrix(SEXP x, SEXP i, SEXP j)
  {

 Legend:



Removed from v.2120
 


changed lines


 
Added in v.2125
 Legend:



Removed from v.2120
 


changed lines


 
Added in v.2125
-Removed from v.2120
+Added in v.2125

root@r-forge.r-project.org	ViewVC Help
Powered by ViewVC 1.0.0