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

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

Author: briand
Date: 2019-02-12 10:08:05 +0100 (Tue, 12 Feb 2019)
New Revision: 548

Modified:
   pkg/stacomir/DESCRIPTION
   pkg/stacomir/NEWS.md
   pkg/stacomir/R/report_mig_mult.R
Log:
version 0.5.4.2, maintenance release to avoid problem in vignette building on CRAN 

Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION	2019-01-25 10:25:46 UTC (rev 547)
+++ pkg/stacomir/DESCRIPTION	2019-02-12 09:08:05 UTC (rev 548)
@@ -1,6 +1,6 @@
 Package: stacomiR
-Version: 0.5.4.1
-Date: 2019-01-25
+Version: 0.5.4.2
+Date: 2019-02-12
 Title: Fish Migration Monitoring
 Authors at R: c(person("Cedric", "Briand", role = c("aut", "cre"), email = "cedric.briand00 at gmail.com"),
 	      person("Marion", "Legrand", role = "aut", email="tableau-salt-loire at logrami.fr"),

Modified: pkg/stacomir/NEWS.md
===================================================================
--- pkg/stacomir/NEWS.md	2019-01-25 10:25:46 UTC (rev 547)
+++ pkg/stacomir/NEWS.md	2019-02-12 09:08:05 UTC (rev 548)
@@ -1,3 +1,7 @@
+# stacomiR 0.5.4.2
+
+* fixed new issues with rounding error when building vignette
+
 # stacomiR 0.5.4.1
 
 * fixed issue with prototype generating check warning on CRAN

Modified: pkg/stacomir/R/report_mig_mult.R
===================================================================
--- pkg/stacomir/R/report_mig_mult.R	2019-01-25 10:25:46 UTC (rev 547)
+++ pkg/stacomir/R/report_mig_mult.R	2019-02-12 09:08:05 UTC (rev 548)
@@ -951,7 +951,7 @@
   # then the calculation will have hampered our numbers of a small amount
   # and the following test is not expected to be TRUE.
   if (!overlapping_samples_between_year)
-	stopifnot(all.equal(sum(datasub$value,na.rm=TRUE),sum(datasub2$value,na.rm=TRUE)))
+	stopifnot(all.equal(round(sum(datasub$value,na.rm=TRUE),2),round(sum(datasub2$value,na.rm=TRUE),2)))
   datasub3<-reshape2::dcast(datasub2, debut_pas+fin_pas+ope_dic_identifiant+lot_tax_code+lot_std_code+type_de_quantite~lot_methode_obtention,value.var="value")
   if (!"MESURE"%in%colnames(datasub3)) 	datasub3$MESURE=0
   if (!"CALCULE"%in%colnames(datasub3)) 	datasub3$CALCULE=0