SCM

SCM Repository

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

Diff of /pkg/src/ssclme.c

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

revision 249, Thu Jul 15 03:06:39 2004 UTC revision 250, Tue Aug 17 16:50:27 2004 UTC
# Line 1200  Line 1200 
1200  static void EMsteps_verbose_print(SEXP x, int iter, int REML)  static void EMsteps_verbose_print(SEXP x, int iter, int REML)
1201  {  {
1202      SEXP coef = PROTECT(ssclme_coef(x, ScalarLogical(0)));      SEXP coef = PROTECT(ssclme_coef(x, ScalarLogical(0)));
1203      int lc = length(coef); double *cc = REAL(coef);      int i, lc = length(coef);
1204        double *cc = REAL(coef), *dev = REAL(GET_SLOT(x, Matrix_devianceSym));
1205    
1206    
1207      ssclme_factor(x);      ssclme_factor(x);
1208      if (iter == 0) Rprintf("  EM iterations\n");      if (iter == 0) Rprintf("  EM iterations\n");
# Line 1232  Line 1234 
1234          nEM = asInteger(nsteps),          nEM = asInteger(nsteps),
1235          nf = length(Omega),          nf = length(Omega),
1236          verbose = asLogical(verb);          verbose = asLogical(verb);
     double  
         *dev = REAL(GET_SLOT(x, Matrix_devianceSym));  
1237    
1238      if (verbose) EMsteps_verbose_print(x, 0, REML);      if (verbose) EMsteps_verbose_print(x, 0, REML);
1239      for (iter = 0; iter < nEM; iter++) {      for (iter = 0; iter < nEM; iter++) {
# Line 1380  Line 1380 
1380          int *nc = INTEGER(GET_SLOT(x, Matrix_ncSym));          int *nc = INTEGER(GET_SLOT(x, Matrix_ncSym));
1381          SEXP val = PROTECT(allocVector(REALSXP, coef_length(length(ans), nc)));          SEXP val = PROTECT(allocVector(REALSXP, coef_length(length(ans), nc)));
1382    
1383          upperTri_as_vector(ans, nc, val);          upperTriList_to_vector(ans, nc, val);
1384          UNPROTECT(2);          UNPROTECT(2);
1385          return val;          return val;
1386      }      }

Legend:
Removed from v.249  
changed lines
  Added in v.250

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge