From noreply at r-forge.r-project.org  Wed Apr 18 14:53:02 2012
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Wed, 18 Apr 2012 14:53:02 +0200 (CEST)
Subject: [Earthmovdist-commits] r30 - pkg/src
Message-ID: <20120418125302.38E3E181123@r-forge.r-project.org>

Author: edd
Date: 2012-04-18 14:53:01 +0200 (Wed, 18 Apr 2012)
New Revision: 30

Modified:
   pkg/src/Makevars.win
Log:
overdue update to current variant reflecting 32/64 bit architecture


Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-10-14 18:52:05 UTC (rev 29)
+++ pkg/src/Makevars.win	2012-04-18 12:53:01 UTC (rev 30)
@@ -1,3 +1,3 @@
-# We need to know where libRcpp.so and Rcpp.h reside
-# PKG_CPPFLAGS = $(shell Rscript.exe -e "Rcpp:::CxxFlags()")
-PKG_LIBS = $(shell Rscript.exe -e "Rcpp:::LdFlags()")
+
+## Use the R_HOME indirection to support installations of multiple R version
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")


From noreply at r-forge.r-project.org  Wed Apr 18 16:39:51 2012
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Wed, 18 Apr 2012 16:39:51 +0200 (CEST)
Subject: [Earthmovdist-commits] r31 - pkg/src
Message-ID: <20120418143952.15150181373@r-forge.r-project.org>

Author: edd
Date: 2012-04-18 16:39:51 +0200 (Wed, 18 Apr 2012)
New Revision: 31

Modified:
   pkg/src/emdL1.cpp
Log:
use Rprintf() instead of printf()


Modified: pkg/src/emdL1.cpp
===================================================================
--- pkg/src/emdL1.cpp	2012-04-18 12:53:01 UTC (rev 30)
+++ pkg/src/emdL1.cpp	2012-04-18 14:39:51 UTC (rev 31)
@@ -74,6 +74,8 @@
 #include <math.h>
 #include "emdL1.h"
 
+#include <R.h>			// for Rprintf()
+
 /******************************************************************************
 	Construction and deconstruction
  ******************************************************************************/
@@ -112,7 +114,7 @@
 
 	// Initialization
 	if(!InitMemory(n1, n2, n3)) {	// Initialize memory (reallocate if necessary)
-		printf("Memory allocation failed!\n");
+		Rprintf("Memory allocation failed!\n");
 		return -1;
 	}
 	Initialize(H1,H2,n1,n2,n3);		// Initialize histgrams


From noreply at r-forge.r-project.org  Wed Apr 18 23:21:01 2012
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Wed, 18 Apr 2012 23:21:01 +0200 (CEST)
Subject: [Earthmovdist-commits] r32 - pkg
Message-ID: <20120418212101.93A57180779@r-forge.r-project.org>

Author: edd
Date: 2012-04-18 23:21:01 +0200 (Wed, 18 Apr 2012)
New Revision: 32

Added:
   pkg/cleanup
Modified:
   pkg/DESCRIPTION
Log:
updates DESCRIPTION
adds a helper script 'cleanup'


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-04-18 14:39:51 UTC (rev 31)
+++ pkg/DESCRIPTION	2012-04-18 21:21:01 UTC (rev 32)
@@ -1,16 +1,15 @@
 Package: earthmovdist
-Version: 0.1.1
-Date: 2009-04-24
+Version: 0.1.2
+Date: 2012-04-18
 Author: Rainer M Krug <Rainer at krugs.de> and Dirk Eddelbuettel <edd at debian.org> 
-Maintainer: Rainer M Krug <Rainer at krugs.de>
+Maintainer: Dirk Eddelbuettel <edd at debian.org>
 Title: Wrapper to the Emd-L1 library by Haibin Ling and Kazunori Okada
 Description: This packages provides the Emd-L1 distance metric from the paper
- by H. Ling and K. Okada, An Efficient Earth Mover's Distance Algorithm for
- Robust Histogram Comparison,  IEEE Transaction on Pattern Analysis and
- Machine Intelligence (PAMI), 29(5):840-853, 2007. It is based on code from
- http://www.ist.temple.edu/~hbling/code/EmdL1_v3.zip
+  by H. Ling and K. Okada, An Efficient Earth Mover's Distance Algorithm for
+  Robust Histogram Comparison,  IEEE Transaction on Pattern Analysis and
+  Machine Intelligence (PAMI), 29(5):840-853, 2007. It is based on code from
+  http://www.ist.temple.edu/~hbling/code/EmdL1_v3.zip
 Depends: Rcpp (>= 0.8.0)
 LinkingTo: Rcpp
 License: GPL-2 for R package; research-only license for Emd-L1; see README.txt
 URL: http://earthmovdist.r-forge.r-project.org/
-Packaged: Mon Apr 20 09:40:16 2009; rkrug

Added: pkg/cleanup
===================================================================
--- pkg/cleanup	                        (rev 0)
+++ pkg/cleanup	2012-04-18 21:21:01 UTC (rev 32)
@@ -0,0 +1,2 @@
+
+rm -f  src/*.o src/*.so */*~ *~


Property changes on: pkg/cleanup
___________________________________________________________________
Added: svn:executable
   + *