[Stacomir-commits] r507 - in pkg/stacomir: . R data

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

Author: legrand
Date: 2018-09-21 18:27:38 +0200 (Fri, 21 Sep 2018)
New Revision: 507

Modified:
   pkg/stacomir/NEWS.md
   pkg/stacomir/R/stacomi.R
   pkg/stacomir/data/calcmig.csv
   pkg/stacomir/data/calcmig.rda
Log:
* put calcmig.csv in concordance with new change on column names
* updated new.md files with new change for version 0.5.4.0
* modify stacomi.R for global variable in dplyr

Modified: pkg/stacomir/NEWS.md
===================================================================
--- pkg/stacomir/NEWS.md	2018-09-21 15:57:16 UTC (rev 506)
+++ pkg/stacomir/NEWS.md	2018-09-21 16:27:38 UTC (rev 507)
@@ -1,7 +1,14 @@
-# stacomiR 0.5.3.9000
+# stacomiR 0.5.4.0
 
+* removed reference to test database, and use of dplyr for internal calculations. 
+Trying to launch as test database with postgres failed on distant computers for tests.... (@marion #484-502)
+
+* Updated testhat tests (@marion  @cedric #502-506)
+
 * developped vignette for package (@marion #480-484)
 
+# stacomiR 0.5.3.2
+
 * changed stacomiR-package.md according to Kurt Hornik (CRAN) demand to use macro in share (@cedric #481)
 
 * bug in interface report_dc corrected (@cedric #489)

Modified: pkg/stacomir/R/stacomi.R
===================================================================
--- pkg/stacomir/R/stacomi.R	2018-09-21 15:57:16 UTC (rev 506)
+++ pkg/stacomir/R/stacomi.R	2018-09-21 16:27:38 UTC (rev 507)
@@ -530,7 +530,8 @@
 		"env_valeur_quantitatif","env_val_identifiant","DC","color"))
 
 # variable used by dplyr
-utils::globalVariables(c("n0","newid","xmin","xmax"))
+utils::globalVariables(c("n0","newid","xmin","xmax","fin_pas","value","type_de_quantite","lot_tax_code","lot_std_code",
+						"lot_methode_obtention","no.pas"))
 
 # dataset used in the package
 utils::globalVariables(c("coef_durif"))

Modified: pkg/stacomir/data/calcmig.csv
===================================================================
--- pkg/stacomir/data/calcmig.csv	2018-09-21 15:57:16 UTC (rev 506)
+++ pkg/stacomir/data/calcmig.csv	2018-09-21 16:27:38 UTC (rev 507)
@@ -1,2 +1,2 @@
-lienODBC;uid;pwd;sqldf.uid;sqldf.pwd;sqldf.dbname;sqldf.host;sqldf.port;pgwd;datawd;lang
-bd_contmig_nat;iav;iav;test;test;test;localhost;5432;F:/workspace/stacomir/pkg/stacomir/R/;~/CalcmigData;French
+lienODBC;uid;pwd;dbname;host;port;pgwd;datawd;lang
+bd_contmig_nat;iav;iav;bd_contmig_nat;localhost;5432;F:/workspace/stacomir/pkg/stacomir/R/;~/CalcmigData;French

Modified: pkg/stacomir/data/calcmig.rda
===================================================================
(Binary files differ)