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

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

Author: briand
Date: 2016-12-04 16:18:10 +0100 (Sun, 04 Dec 2016)
New Revision: 239

Modified:
   pkg/stacomir/R/BilanMigrationMult.r
   pkg/stacomir/data/msg.rda
Log:


Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r	2016-11-26 20:56:47 UTC (rev 238)
+++ pkg/stacomir/R/BilanMigrationMult.r	2016-12-04 15:18:10 UTC (rev 239)
@@ -235,6 +235,8 @@
 						mydata2<-merge(mydata,coe,by="coe_date_debut")
 						mydata2<-mydata2[,-match("coe_date_debut",colnames(mydata2))] # removing coe_date_debut
 						data <-fun_weight_conversion(tableau=mydata2,time.sequence=bilanMigrationMult at time.sequence,silent)
+					} else {
+						data<-mydata
 					}
 					lestableaux[[stringr::str_c("dc_",dic)]][["data"]]<-data
 					lestableaux[[stringr::str_c("dc_",dic)]][["method"]]<-"sum"

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