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

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

Author: briand
Date: 2017-02-12 20:01:16 +0100 (Sun, 12 Feb 2017)
New Revision: 290

Modified:
   pkg/stacomir/R/BilanMigrationInterAnnuelle.r
   pkg/stacomir/data/bmi.rda
Log:
problem for bmi, and connect method for BilanMigrationInterannuelle class

Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-02-12 17:00:26 UTC (rev 289)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-02-12 19:01:16 UTC (rev 290)
@@ -117,11 +117,11 @@
 						# data from bilanMigrationInterannuel
 						data2<-object at data[object at data$bjo_dis_identifiant==dic[i],]
 						data21<-dplyr::select(data2,bjo_annee,bjo_valeur,bjo_labelquantite)
-						data22<-group_by(data21,bjo_annee,bjo_labelquantite)
-						data23<-summarize(data22,total=sum(bjo_valeur))
-						data24<-filter(ungroup(data23),bjo_labelquantite=="Effectif_total")
-						data24<-select(data24,bjo_annee,total)
-						data24<-rename(data24,annee=bjo_annee,effectif_bjo=total)
+						data22<-dplyr::group_by(data21,bjo_annee,bjo_labelquantite)
+						data23<-dplyr::summarize(data22,total=sum(bjo_valeur))
+						data24<-dplyr::filter(ungroup(data23),bjo_labelquantite=="Effectif_total")
+						data24<-dplyr::select(data24,bjo_annee,total)
+						data24<-dplyr::rename(data24,annee=bjo_annee,effectif_bjo=total)
 						data124<-merge(data1,data24,all.x=TRUE,all.y=TRUE,by="annee")
 						return(data124)
 					}

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