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 1568, Sat Sep 16 15:17:27 2006 UTC revision 1654, Fri Oct 27 16:58:15 2006 UTC
# Line 4  Line 4 
4    
5  SEXP Csparse_validate(SEXP x)  SEXP Csparse_validate(SEXP x)
6  {  {
7      cholmod_sparse *chx = as_cholmod_sparse(x);      /* NB: we do *NOT* check a potential 'x' slot here, at all */
8      SEXP pslot = GET_SLOT(x, Matrix_pSym),      SEXP pslot = GET_SLOT(x, Matrix_pSym),
9          islot = GET_SLOT(x, Matrix_iSym);          islot = GET_SLOT(x, Matrix_iSym);
10      int j, k, ncol = length(pslot) - 1,      int j, k, ncol, nrow, sorted,
11          *dims = INTEGER(GET_SLOT(x, Matrix_DimSym)),          *dims = INTEGER(GET_SLOT(x, Matrix_DimSym)),
12          nrow, sorted, *xp = INTEGER(pslot),          *xp = INTEGER(pslot),
13          *xi = INTEGER(islot);          *xi = INTEGER(islot);
14    
15      nrow = dims[0];      nrow = dims[0];
16      if (length(pslot) <= 0)      ncol = dims[1];
17          return mkString(_("slot p must have length > 0"));      if (length(pslot) != dims[1] + 1)
18            return mkString(_("slot p must have length = ncol(.) + 1"));
19      if (xp[0] != 0)      if (xp[0] != 0)
20          return mkString(_("first element of slot p must be zero"));          return mkString(_("first element of slot p must be zero"));
21      if (length(islot) != xp[ncol])      if (length(islot) != xp[ncol])
# Line 31  Line 32 
32          for (k = xp[j] + 1; k < xp[j + 1]; k++)          for (k = xp[j] + 1; k < xp[j + 1]; k++)
33              if (xi[k] < xi[k - 1]) sorted = FALSE;              if (xi[k] < xi[k - 1]) sorted = FALSE;
34      }      }
35      if (!sorted) cholmod_sort(chx, &c);      if (!sorted) {
36            cholmod_sparse *chx = as_cholmod_sparse(x);
37            cholmod_sort(chx, &c);
38      Free(chx);      Free(chx);
39        }
40      return ScalarLogical(1);      return ScalarLogical(1);
41  }  }
42    
# Line 104  Line 108 
108                                GET_SLOT(x, Matrix_DimNamesSym));                                GET_SLOT(x, Matrix_DimNamesSym));
109  }  }
110    
111    SEXP Csparse_general_to_symmetric(SEXP x, SEXP uplo)
112    {
113        cholmod_sparse *chx = as_cholmod_sparse(x), *chgx;
114        int uploT = (*CHAR(asChar(uplo)) == 'U') ? -1 : 1;
115        int Rkind = (chx->xtype == CHOLMOD_REAL) ? Real_kind(x) : 0;
116    
117        chgx = cholmod_copy(chx, /* stype: */ uploT, chx->xtype, &c);
118        /* xtype: pattern, "real", complex or .. */
119        Free(chx);
120        return chm_sparse_to_SEXP(chgx, 1, 0, Rkind, "",
121                                  GET_SLOT(x, Matrix_DimNamesSym));
122    }
123    
124  SEXP Csparse_transpose(SEXP x, SEXP tri)  SEXP Csparse_transpose(SEXP x, SEXP tri)
125  {  {
126      cholmod_sparse *chx = as_cholmod_sparse(x);      cholmod_sparse *chx = as_cholmod_sparse(x);
# Line 182  Line 199 
199          chxt = cholmod_transpose(chx, chx->xtype, &c);          chxt = cholmod_transpose(chx, chx->xtype, &c);
200      chcp = cholmod_aat((!tr) ? chxt : chx, (int *) NULL, 0, chx->xtype, &c);      chcp = cholmod_aat((!tr) ? chxt : chx, (int *) NULL, 0, chx->xtype, &c);
201      if(!chcp)      if(!chcp)
202          error("Csparse_crossprod(): error return from cholmod_aat()");          error(_("Csparse_crossprod(): error return from cholmod_aat()"));
203      cholmod_band_inplace(0, chcp->ncol, chcp->xtype, chcp, &c);      cholmod_band_inplace(0, chcp->ncol, chcp->xtype, chcp, &c);
204      chcp->stype = 1;      chcp->stype = 1;
205      if (trip) {      if (trip) {
# Line 201  Line 218 
218      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);      return chm_sparse_to_SEXP(chcp, 1, 0, 0, "", dn);
219  }  }
220    
221    SEXP Csparse_drop(SEXP x, SEXP tol)
222    {
223        cholmod_sparse *chx = as_cholmod_sparse(x),
224            *ans = cholmod_copy(chx, chx->stype, chx->xtype, &c);
225        double dtol = asReal(tol);
226        int Rkind = (chx->xtype == CHOLMOD_REAL) ? Real_kind(x) : 0;
227    
228        if(!cholmod_drop(dtol, ans, &c))
229            error(_("cholmod_drop() failed"));
230        Free(chx);
231        /* FIXME: currently drops dimnames */
232        return chm_sparse_to_SEXP(ans, 1, 0, Rkind, "", R_NilValue);
233    }
234    
235    
236  SEXP Csparse_horzcat(SEXP x, SEXP y)  SEXP Csparse_horzcat(SEXP x, SEXP y)
237  {  {
238      cholmod_sparse *chx = as_cholmod_sparse(x),      cholmod_sparse *chx = as_cholmod_sparse(x),

Legend:
Removed from v.1568  
changed lines
  Added in v.1654

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