[Stacomir-commits] r309 - pkg/stacomir/R

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

Author: legrand
Date: 2017-03-16 13:33:22 +0100 (Thu, 16 Mar 2017)
New Revision: 309

Modified:
   pkg/stacomir/R/BilanAnnuels.r
Log:


Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r	2017-03-16 12:24:41 UTC (rev 308)
+++ pkg/stacomir/R/BilanAnnuels.r	2017-03-16 12:33:22 UTC (rev 309)
@@ -146,6 +146,8 @@
 			diffan<-new("BilanAnnuels")
 			diffan at data=reqdiffan at query
 			
+			# we apply the overlaps function
+			
 			# we select all the other operations (without difference of years)
 			reqssdiffan=new("RequeteODBC")
 			reqssdiffan at baseODBC<-get("baseODBC", envir=envir_stacomi)
@@ -170,6 +172,7 @@
 			ssdiffan at data=reqssdiffan at query
 			
 			# we merge the two dataset together
+			data<-merge(ssdiffan at data,diffan at data,all.x=TRUE,all.y=TRUE,by=c("ope_dic_identifiant","annee","lot_ope_identifiant"))
 		}
 		#If we have dc and years with no difference in the years of start and end for the same operation we calculate the "classical" sum by year
 		else {