[Pastecs-commits] r10 - in pkg: . R

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

Author: phgrosjean
Date: 2014-03-02 10:00:05 +0100 (Sun, 02 Mar 2014)
New Revision: 10

Modified:
   pkg/DESCRIPTION
   pkg/R/stat.desc.R
   pkg/R/stat.slide.R
   pkg/R/trend.test.R
Log:
Clean up of DESCRIPTION file
require(boot) eliminated: in NAMESPACE now

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-09-15 20:03:20 UTC (rev 9)
+++ pkg/DESCRIPTION	2014-03-02 09:00:05 UTC (rev 10)
@@ -1,11 +1,19 @@
 Package: pastecs
 Title: Package for Analysis of Space-Time Ecological Series
-Version: 1.3-15
-Date: 2013-07-13
-Author: Frederic Ibanez <ibanez at obs-vlfr.fr>, Philippe Grosjean <phgrosjean at sciviews.org> & Michele Etienne <etienne at obs-vlfr.fr>
+Version: 1.3-16
+Date: 2014-03-02
+Author: Philippe Grosjean [aut, cre],
+  Frederic Ibanez [aut, cre],
+  Michele Etienne [ctb]
+Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
+  email = "phgrosjean at sciviews.org"),
+  person("Frederic", "Ibanez", role = c("aut", "cre"),
+  email = "ibanez at obs-vlfr.fr"),
+  person("Michele", "Etienne", role = "ctb",
+  email = "etienne at obs-vlfr.fr"))
+Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 Description: Regulation, decomposition and analysis of space-time series. The pastecs library is a PNEC-Art4 and IFREMER (Benoit Beliaeff <Benoit.Beliaeff at ifremer.fr>) initiative to bring PASSTEC 2000 (http://www.obs-vlfr.fr/~enseigne/anado/passtec/passtec.htm) functionalities to R.
 URL: http://www.sciviews.org/pastecs
 Encoding: latin1
-Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
 License: GPL (>= 2)
-Depends: boot, stats
\ No newline at end of file
+Depends: boot, stats

Modified: pkg/R/stat.desc.R
===================================================================
--- pkg/R/stat.desc.R	2013-09-15 20:03:20 UTC (rev 9)
+++ pkg/R/stat.desc.R	2014-03-02 09:00:05 UTC (rev 10)
@@ -45,7 +45,7 @@
 				Res2 <- list(median=Median, mean=Mean, SE.mean=SEMean, CI.mean=CIMean, var=Var, std.dev=StdDev, coef.var=CoefVar)
 			} else Res2 <- NULL
 			if (norm==TRUE) {
-				Skew <- sum((x-mean(x))^3)/(length(x)*sqrt(var(x))^3)			# From e1071 R library
+				Skew <- sum((x-mean(x))^3)/(length(x)*sqrt(var(x))^3)			# From e1071
 				Kurt <- sum((x-mean(x))^4)/(length(x)*var(x)^2) - 3				# Idem
 				SE <- sqrt(6*Nbrval*(Nbrval-1)/(Nbrval-2)/(Nbrval+1)/(Nbrval+3))
 				# +/- sqrt(6/Nbrval) for Nbrval>100, see Sokal & Rohlf, p. 139

Modified: pkg/R/stat.slide.R
===================================================================
--- pkg/R/stat.slide.R	2013-09-15 20:03:20 UTC (rev 9)
+++ pkg/R/stat.slide.R	2014-03-02 09:00:05 UTC (rev 10)
@@ -50,7 +50,7 @@
 				Res2 <- list(median=Median, mean=Mean, SE.mean=SEMean, CI.mean=CIMean, var=Var, std.dev=StdDev, coef.var=CoefVar)
 			} else Res2 <- NULL
 			if (norm==TRUE) {
-				Skew <- sum((y-mean(y))^3)/(length(y)*sqrt(var(y))^3)			# From e1071 R library
+				Skew <- sum((y-mean(y))^3)/(length(y)*sqrt(var(y))^3)			# From e1071
 				Kurt <- sum((y-mean(y))^4)/(length(y)*var(y)^2) - 3				# Idem
 				SE <- sqrt(6*Nbrval*(Nbrval-1)/(Nbrval-2)/(Nbrval+1)/(Nbrval+3))
 				# +/- sqrt(6/Nbrval) for Nbrval>100, see Sokal & Rohlf, p. 139

Modified: pkg/R/trend.test.R
===================================================================
--- pkg/R/trend.test.R	2013-09-15 20:03:20 UTC (rev 9)
+++ pkg/R/trend.test.R	2014-03-02 09:00:05 UTC (rev 10)
@@ -30,7 +30,6 @@
 			rhos <- apply(data.rank, 2, cor, rank(time(Tseries)))
 			rhos
 		}	
-		require(boot)
 		if (is.matrix(x) == TRUE && ncol(x) > 1) {
 			res <- tsboot(x, test.trends, R = R, sim = "fixed", l = 1)
 		} else {