SCM

SCM Repository

[matrix] Diff of /pkg/Matrix/src/chm_common.c
ViewVC logotype

Diff of /pkg/Matrix/src/chm_common.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3269, Wed Mar 21 23:15:18 2018 UTC revision 3270, Fri Mar 23 08:50:48 2018 UTC
# Line 384  Line 384 
384          DOFREE_MAYBE;          DOFREE_MAYBE;
385          error(_("unknown xtype in cholmod_sparse object"));          error(_("unknown xtype in cholmod_sparse object"));
386      }      }
387      ans = PROTECT(NEW_OBJECT(MAKE_CLASS(cls)));      ans = PROTECT(NEW_OBJECT_OF_CLASS(cls));
388                                  /* allocate and copy common slots */                                  /* allocate and copy common slots */
389      nnz = longi ? cholmod_l_nnz(a, &cl) : cholmod_nnz(a, &c);      nnz = longi ? cholmod_l_nnz(a, &cl) : cholmod_nnz(a, &c);
390      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));
# Line 616  Line 616 
616          DOFREE_MAYBE;          DOFREE_MAYBE;
617          error(_("unknown xtype in cholmod_triplet object"));          error(_("unknown xtype in cholmod_triplet object"));
618      }      }
619      ans = PROTECT(NEW_OBJECT(MAKE_CLASS(cl)));      ans = PROTECT(NEW_OBJECT_OF_CLASS(cl));
620                                  /* allocate and copy common slots */                                  /* allocate and copy common slots */
621      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));
622      dims[0] = a->nrow; dims[1] = a->ncol;      dims[0] = a->nrow; dims[1] = a->ncol;
# Line 874  Line 874 
874          error(_("unknown xtype"));          error(_("unknown xtype"));
875      }      }
876    
877      ans = PROTECT(NEW_OBJECT(MAKE_CLASS(cl)));      ans = PROTECT(NEW_OBJECT_OF_CLASS(cl));
878                                  /* allocate and copy common slots */                                  /* allocate and copy common slots */
879      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));
880      if(transp) {      if(transp) {
# Line 1156  Line 1156 
1156          error(_("f->xtype of %d not recognized"), f->xtype);          error(_("f->xtype of %d not recognized"), f->xtype);
1157      }      }
1158    
1159      ans = PROTECT(NEW_OBJECT(MAKE_CLASS(class)));      ans = PROTECT(NEW_OBJECT_OF_CLASS(class));
1160      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));      dims = INTEGER(ALLOC_SLOT(ans, Matrix_DimSym, INTSXP, 2));
1161      dims[0] = dims[1] = f->n;      dims[0] = dims[1] = f->n;
1162                                  /* copy component of known length */                                  /* copy component of known length */

Legend:
Removed from v.3269  
changed lines
  Added in v.3270

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