version 1.8.9

DESCRIPTION

@@ -1,16 +1,16 @@
 Package: adehabitat
-Version: 1.8.7
-Date: 2009/05/04
+Version: 1.8.9
+Date: 2012/02/28
 Title: Analysis of habitat selection by animals
 Author: Clement Calenge, contributions from Mathieu Basille, Stephane
         Dray and Scott Fortmann-Roe
 Maintainer: Clement Calenge <clement.calenge@oncfs.gouv.fr>
-Depends: R (>= 2.10.0), ade4
-Suggests: gpclib, sp, spatstat, MASS, tkrplot, shapefiles, CircStats
+Depends: R (>= 2.10.0), ade4, tkrplot, shapefiles
+Suggests: gpclib, sp, spatstat, MASS, CircStats
 Description: A collection of tools for the analysis of habitat
         selection by animals
 License: GPL (>= 2)
 URL: https://www.faunalia.it/animove/trac/
-Packaged: 2011-09-09 09:51:01 UTC; calenge
+Packaged: 2012-02-28 16:05:53 UTC; calenge
 Repository: CRAN
-Date/Publication: 2011-09-09 13:08:25
+Date/Publication: 2012-02-28 18:02:44

MD5

@@ -1,6 +1,7 @@
 17a433380c461e9c5af3bb4f0f1a0238 *CONTENTS
-d0978c642bbe85cab2169e2f69e5aa0f *DESCRIPTION
+71427d0b403f579782af286bbac8a734 *DESCRIPTION
 59e4370faccf8b1c9b7165be866f4508 *INDEX
+7cc0a5ce54fadd9e2f6302cc91dc7166 *NAMESPACE
 5d7432ea7f62b9c0c83708e09dddb331 *R/NNCH.r
 14b8232ec33b076b670f2ad3eec788a8 *R/altr.r
 ed47128e7493b9ecb5564454fe0a8825 *R/angles.r
@@ -34,7 +35,7 @@ ce4f3ab78c157e06bd9dc44d6965c87c *R/colasc.r
 b91ff3a06f466cbd34bd0f60a784d55e *R/cutltraj.r
 24612d2b133fa106a8959e78865042a3 *R/data2enfa.r
 df6d963685c45d4f131719535e2ae53d *R/dchi.r
-86c3e78c80aee37de554150afec15242 *R/debut.r
+233bcc5e17781b0fab9f74b85afa2c1b *R/debut.r
 524761b1d18431f037c59b380f91eb6d *R/df2kasc.r
 20264d21df986f04abea40dde3491bbb *R/df2traj.r
 f1240fd3cdcd47f15293597d2db56f5b *R/distfacmap.r
@@ -360,4 +361,4 @@ fc28d8af7d53ed96111a30e76623fbef *man/wawotest.Rd
 5b676cfe8529035bc0fb5f1cfe10a047 *man/whale.Rd
 6dad3787feceb89ae1934d4d4315c03e *man/which.ltraj.Rd
 246f1cc5c28586a5c690c9748965a56d *man/wi.Rd
-8b9e4101d90b811fb91d5abe87460674 *src/tests.c
+84fb4c82fc679dd4d9ef8a8296fb795e *src/tests.c

NAMESPACE

@@ -0,0 +1,71 @@
+useDynLib(adehabitat)
+
+import(ade4,tkrplot)
+importFrom(shapefiles, convert.to.shapefile)
+exportPattern("^[^\\.]")
+
+S3method(print, ltraj)
+S3method(print, clusthr)
+S3method(print, dunnfa)
+S3method(print, esr)
+S3method(print, engenetalI)
+S3method(print, engenetalII)
+S3method(print, gnesfa)
+S3method(print, madifa)
+S3method(print, liker)
+S3method(print, modpartltraj)
+S3method(print, partltraj)
+S3method(print, NNCH)
+S3method(print, asc)
+S3method(print, compana)
+S3method(print, dataenfa)
+S3method(print, enfa)
+S3method(print, kasc)
+S3method(print, khr)
+S3method(print, kselect)
+S3method(print, plotsahr)
+S3method(print, sahrlocs)
+S3method(print, rand.kselect)
+S3method(print, traj)
+S3method(print, wiI)
+S3method(print, wiII)
+S3method(print, wiIII)
+
+S3method(plot, clusthr)
+S3method(kplot, kselect)
+S3method(plot, madifa)
+S3method(plot, partltraj)
+S3method(plot, NNCH)
+S3method(plot, narea)
+S3method(plot, area)
+S3method(plot, asc)
+S3method(plot, fipati)
+S3method(plot, hrsize)
+S3method(plot, kselect)
+S3method(plot, kver)
+S3method(plot, ltraj)
+S3method(plot, sahrlocs)
+S3method(plot, traj)
+S3method(plot, wi)
+
+S3method(summary, traj)
+S3method(summary, ltraj)
+S3method(summary, NNCH)
+
+S3method(image, asc)
+S3method(image, kasc)
+S3method(image, khr)
+S3method(image, sahrlocs)
+
+S3method(lowres, asc)
+S3method(lowres, kasc)
+
+S3method(qqchi, ltraj)
+S3method(qqchi, default)
+
+S3method(subsetmap, asc)
+S3method(subsetmap, kasc)
+
+S3method(wawotest, ltraj)
+S3method(wawotest, default)
+

R/debut.r

@@ -1,13 +1,11 @@
 ##### Chargement de base
-
-.First.lib <- function(lib, pkg) {
+.onAttach <- function(libname, pkgname)
+{
     msg <- paste("Be careful: it is now recommended to use the new",
                  "packages adehabitatMA, adehabitatLT, adehabitatHR, and adehabitatHS.\n",
                  "These 4 packages are intended to become the future of adehabitat.\n",
                  "The \"classical\" version of adehabitat will still be maintained for some\n",
                  "time, but no new method will be added to the package.\n",
                  sep="")
-    cat(msg)
-    library.dynam("adehabitat", pkg, lib)
+    packageStartupMessage(msg)
 }
-

src/tests.c

@@ -952,7 +952,7 @@ void DiagobgComp (int n0, double **w, double *d, int *rang)
 	  if (d[i] / d[1] < 0.00001) d[i] = 0.0;
 	  if (d[i] != 0.0) *rang = *rang + 1;
 	*/
-	if (d[i] > 0.0) *rang = *rang + 1;
+	if (d[i] > 0.00000000000001) *rang = *rang + 1;
     }
     freevec(s);
 } /* DiagoCompbg */
@@ -3615,14 +3615,22 @@ void wml(double **used, double **avail, double *wmla, int na, int nh,
 	det1 = 1;
 	det2 = 1;
 
-	for (i = 1; i <= rg1; i++) {
-	    det1 = det1 * vp1[i];
+	if (rg1 != nh-1) {
+	    det1 = 0;
+	} else {
+	    for (i = 1; i <= rg1; i++) {
+		det1 = det1 * vp1[i];
+	    }
 	}
 
-	for (i = 1; i <= rg2; i++) {
-	    det2 = det2 * vp2[i];
+	if (rg2 != nh-1) {
+	    det2 = 0;
+	} else {
+	    for (i = 1; i <= rg2; i++) {
+		det2 = det2 * vp2[i];
+	    }
 	}
-	
+
 	wmla[k] = det1 / det2;
 	for (i = 1; i <= (nh-1); i++)
 	    nbassocie[k] = nbassocie[k] + nadlr[i];