Version 0-8-11

Changes

+Wed Feb 26 2014
+  * remove DUP=FALSE in .C call.
 
 Tue Dec 03 2013
   * remove [again] printf in C++ code

DESCRIPTION

 Package: amap
-Version: 0.8-10
+Version: 0.8-11
 Date: 2013-12-13
 Title: Another Multidimensional Analysis Package
 Author: Antoine Lucas

R/dist.R

@@ -29,7 +29,6 @@ Dist <- function(x, method="euclidean", nbproc = 2, diag=FALSE, upper=FALSE)
 	    method= as.integer(method),
             nbproc = as.integer(nbproc),
             ierr=as.integer(0),
-	    DUP = FALSE,
             NAOK=TRUE,
             PACKAGE="amap"
             )$d

R/hcluster.R

 ## Hierarchical clustering
 ##
 ## Created       : 18/11/02
-## Last Modified : Time-stamp: <2011-11-04 22:55:20 antoine>
+## Last Modified : Time-stamp: <2014-02-26 19:03:13 antoine>
 ##
 ## This function is a "mix" of function dist and function hclust.
 ##
@@ -67,7 +67,6 @@ hclusterpar <- hcluster <- function (x, method = "euclidean", diag = FALSE, uppe
             nbprocess  = as.integer(nbproc),
             precision  = as.integer(precision),
             res  = as.integer (1),
-            DUP = FALSE,
             NAOK=TRUE,
             PACKAGE= "amap")
 

tests/amap-test.Rout.save

 
-R Under development (unstable) (2013-11-22 r64286) -- "Unsuffered Consequences"
-Copyright (C) 2013 The R Foundation for Statistical Computing
+R Under development (unstable) (2014-02-24 r65073) -- "Unsuffered Consequences"
+Copyright (C) 2014 The R Foundation for Statistical Computing
 Platform: x86_64-unknown-linux-gnu (64-bit)
 
-R est un logiciel libre livré sans AUCUNE GARANTIE.
-Vous pouvez le redistribuer sous certaines conditions.
-Tapez 'license()' ou 'licence()' pour plus de détails.
+R is free software and comes with ABSOLUTELY NO WARRANTY.
+You are welcome to redistribute it under certain conditions.
+Type 'license()' or 'licence()' for distribution details.
 
-R est un projet collaboratif avec de nombreux contributeurs.
-Tapez 'contributors()' pour plus d'information et
-'citation()' pour la façon de le citer dans les publications.
+R is a collaborative project with many contributors.
+Type 'contributors()' for more information and
+'citation()' on how to cite R or R packages in publications.
 
-Tapez 'demo()' pour des démonstrations, 'help()' pour l'aide
-en ligne ou 'help.start()' pour obtenir l'aide au format HTML.
-Tapez 'q()' pour quitter R.
+Type 'demo()' for some demos, 'help()' for on-line help, or
+'help.start()' for an HTML browser interface to help.
+Type 'q()' to quit R.
 
 > 
 > library(amap)
@@ -6354,6 +6354,10 @@ Cluster method   : centroid2
 Distance         : abscorrelation 
 Number of objects: 50 
 
+Warning messages:
+1: empty cluster: try a better set of initial centers 
+2: empty cluster: try a better set of initial centers 
+3: empty cluster: try a better set of initial centers 
 > 
 > hc <- hcluster(USArrests, nbproc=1)
 > print(hc)
@@ -6422,3 +6426,6 @@ Eigen values:
 [1] 3.2817172 1.0106413 0.4610868 0.3944977
 > 
 > 
+> proc.time()
+   user  system elapsed 
+  2.250   0.700   2.876