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 386, Mon Dec 13 15:59:24 2004 UTC revision 397, Thu Dec 16 19:15:32 2004 UTC
# Line 1684  Line 1684 
1684   * @param rep pointer to the converged ssclme object   * @param rep pointer to the converged ssclme object
1685   * @param fitted pointer to the fitted values   * @param fitted pointer to the fitted values
1686   * @param residuals pointer to the residuals   * @param residuals pointer to the residuals
1687     * @param terms pointer to a terms object (redundant if model is non-empty)
1688     * @param assign pointer to an integer assign vector
1689     * @param contrasts pointer to a list of contrast function names
1690   *   *
1691   * @return an lme object   * @return an lme object
1692   */   */
1693  SEXP ssclme_to_lme(SEXP call, SEXP facs, SEXP x, SEXP model, SEXP REML,  SEXP ssclme_to_lme(SEXP call, SEXP facs, SEXP x, SEXP model, SEXP REML,
1694                     SEXP rep, SEXP fitted, SEXP residuals)                     SEXP rep, SEXP fitted, SEXP residuals, SEXP terms,
1695                       SEXP assign, SEXP contrasts)
1696  {  {
1697      SEXP ans = PROTECT(NEW_OBJECT(MAKE_CLASS("lme")));      SEXP ans = PROTECT(NEW_OBJECT(MAKE_CLASS("lme")));
1698    
# Line 1700  Line 1704 
1704      SET_SLOT(ans, install("rep"), rep);      SET_SLOT(ans, install("rep"), rep);
1705      SET_SLOT(ans, install("fitted"), fitted);      SET_SLOT(ans, install("fitted"), fitted);
1706      SET_SLOT(ans, install("residuals"), residuals);      SET_SLOT(ans, install("residuals"), residuals);
1707        SET_SLOT(ans, install("terms"), terms);
1708        SET_SLOT(ans, install("assign"), assign);
1709        SET_SLOT(ans, install("contrasts"), contrasts);
1710      UNPROTECT(1);      UNPROTECT(1);
1711      return ans;      return ans;
1712  }  }

Legend:
Removed from v.386  
changed lines
  Added in v.397

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