[Vegan-commits] r575 - in pkg/lmodel2: . R

[noreply at r-forge.r-project.org]

Author: jarioksa
Date: 2008-11-19 18:29:53 +0100 (Wed, 19 Nov 2008)
New Revision: 575

Modified:
   pkg/lmodel2/DESCRIPTION
   pkg/lmodel2/R/lmodel2.R
Log:
lmodel2: final freedom from vegan dependence -- inlining vegan::pasteCall functionality

Modified: pkg/lmodel2/DESCRIPTION
===================================================================
--- pkg/lmodel2/DESCRIPTION	2008-11-19 17:11:04 UTC (rev 574)
+++ pkg/lmodel2/DESCRIPTION	2008-11-19 17:29:53 UTC (rev 575)
@@ -5,7 +5,6 @@
 Date: 2008-11-19
 Author: Pierre Legendre
 Maintainer: Jari Oksanen <jari.oksanen at oulu.fi>
-Depends: vegan
 Description: Computes model II simple linear regression using ordinary
  least squares (OLS), major axis (MA), standard major axis (SMA), and
  ranged major axis (RMA).

Modified: pkg/lmodel2/R/lmodel2.R
===================================================================
--- pkg/lmodel2/R/lmodel2.R	2008-11-19 17:11:04 UTC (rev 574)
+++ pkg/lmodel2/R/lmodel2.R	2008-11-19 17:29:53 UTC (rev 575)
@@ -198,7 +198,8 @@
     
     ## Permutation tests
     if((nperm > 0) & (rsquare > epsilon)) {
-        require(vegan) || stop("requires package 'vegan'")
+        ## requires vegan if permuted.index2 used in permutest
+        ## require(vegan) || stop("requires package 'vegan'")
         res8 <- permutest.lmodel2(yx, yx.2, b.ols, b.ma, b.rma/ratio,
                           RMA, ratio, nperm, epsilon)
     }
@@ -303,7 +304,9 @@
 {
 ## Print the regression results
     cat("\nModel II regression\n\n")
-    writeLines(strwrap(pasteCall(x$call)))
+    writeLines(strwrap(paste("Call:",
+                             paste(deparse(x$call), collapse=" "),
+                             "\n")))
     cat("\n")
     cat("n =",x$n,"  r =",x$r,"  r-square =",x$rsquare,'\n')
     cat("Parametric P-values:   2-tailed =",x$P.param,