[Vegan-commits] r1841 - pkg/vegan/R

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

Author: jarioksa
Date: 2011-09-12 22:09:33 +0200 (Mon, 12 Sep 2011)
New Revision: 1841

Modified:
   pkg/vegan/R/tsallis.R
   pkg/vegan/R/tsallisaccum.R
Log:
undo commits that escaped from my private tests

Modified: pkg/vegan/R/tsallis.R
===================================================================
--- pkg/vegan/R/tsallis.R	2011-09-12 17:16:57 UTC (rev 1840)
+++ pkg/vegan/R/tsallis.R	2011-09-12 20:09:33 UTC (rev 1841)
@@ -36,7 +36,7 @@
             }
         }
     }
-    #result <- as.data.frame(result)
+    result <- as.data.frame(result)
     if (any(dim(result) == 1)) 
         result <- unlist(result, use.names = TRUE)
     class(result) <- c("tsallis", "renyi", class(result))

Modified: pkg/vegan/R/tsallisaccum.R
===================================================================
--- pkg/vegan/R/tsallisaccum.R	2011-09-12 17:16:57 UTC (rev 1840)
+++ pkg/vegan/R/tsallisaccum.R	2011-09-12 20:09:33 UTC (rev 1841)
@@ -1,5 +1,5 @@
-`tsallisaccum` <-
-    function (x, scales = seq(0, 2, 0.2), permutations = 100, raw = FALSE, ...)
+tsallisaccum <-
+function (x, scales = seq(0, 2, 0.2), permutations = 100, raw = FALSE, ...)
 {
     x <- as.matrix(x)
     n <- nrow(x)