[Stacomir-commits] r407 - in pkg/stacomir: R inst/examples man

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

Author: briand
Date: 2017-06-20 21:18:43 +0200 (Tue, 20 Jun 2017)
New Revision: 407

Modified:
   pkg/stacomir/R/report_mig_env.R
   pkg/stacomir/inst/examples/report_mig-example.R
   pkg/stacomir/inst/examples/report_mig_mult-example.R
   pkg/stacomir/man/report_mig-class.Rd
   pkg/stacomir/man/report_mig_mult-class.Rd
Log:


Modified: pkg/stacomir/R/report_mig_env.R
===================================================================
--- pkg/stacomir/R/report_mig_env.R	2017-06-20 18:59:30 UTC (rev 406)
+++ pkg/stacomir/R/report_mig_env.R	2017-06-20 19:18:43 UTC (rev 407)
@@ -203,7 +203,7 @@
 			stations[stations$stm_identifiant==unique(tableauCE$env_stm_identifiant)[i],"stm_libelle"]
 	  }
 	  # the data can be in the POSIXct format, we need to round them
-	  tableauCE$date<-as.POSIXct(Hmisc::round.POSIXt(tableauCE$env_date_debut,units="days"))
+	  tableauCE$date<-as.POSIXct(Hmisc::round.POSIXt(tableauCE$env_date_debut,digits="days"))
 	  qualitative<-!is.na(tableauCE$env_val_identifiant)
 	  tableauCEquan<-tableauCE[!qualitative,]
 	  tableauCEqual<-tableauCE[qualitative,]

Modified: pkg/stacomir/inst/examples/report_mig-example.R
===================================================================
--- pkg/stacomir/inst/examples/report_mig-example.R	2017-06-20 18:59:30 UTC (rev 406)
+++ pkg/stacomir/inst/examples/report_mig-example.R	2017-06-20 19:18:43 UTC (rev 407)
@@ -41,7 +41,7 @@
 ########################
 # calculations
 ########################
-
+r_mig<-calcule(r_mig,silent=TRUE)
 #Individual plot for all DC (standard), taxa and stage where data present
 #silent argument to stop all messages
 plot(r_mig,plot.type="standard",silent=TRUE)

Modified: pkg/stacomir/inst/examples/report_mig_mult-example.R
===================================================================
--- pkg/stacomir/inst/examples/report_mig_mult-example.R	2017-06-20 18:59:30 UTC (rev 406)
+++ pkg/stacomir/inst/examples/report_mig_mult-example.R	2017-06-20 19:18:43 UTC (rev 407)
@@ -19,8 +19,8 @@
   # launching charge will also load classes associated with the report
   # e.g. report_ope, report_df, report_dc
   r_mig_mult<-connect(r_mig_mult)
-  # calculations (fails in linux, failing to load tcltk on R-forge)
-  r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
+ 
+
 }
 
 # Use this as example if you don't have a connexion to the database
@@ -36,8 +36,8 @@
 assign("report_dc",r_mig_mult_dc,envir=envir_stacomi)
 # use the following to get the raw data loaded by the connect method
 # not shown there as the database and program might not be installed
-
-
+# calculations 
+r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
 #Individual plot for all DC, taxa and stage where data present
 #Silent=TRUE to turn off messages
 # not run because of multiple graphical devices

Modified: pkg/stacomir/man/report_mig-class.Rd
===================================================================
--- pkg/stacomir/man/report_mig-class.Rd	2017-06-20 18:59:30 UTC (rev 406)
+++ pkg/stacomir/man/report_mig-class.Rd	2017-06-20 19:18:43 UTC (rev 407)
@@ -79,7 +79,7 @@
 ########################
 # calculations
 ########################
-
+r_mig<-calcule(r_mig,silent=TRUE)
 #Individual plot for all DC (standard), taxa and stage where data present
 #silent argument to stop all messages
 plot(r_mig,plot.type="standard",silent=TRUE)

Modified: pkg/stacomir/man/report_mig_mult-class.Rd
===================================================================
--- pkg/stacomir/man/report_mig_mult-class.Rd	2017-06-20 18:59:30 UTC (rev 406)
+++ pkg/stacomir/man/report_mig_mult-class.Rd	2017-06-20 19:18:43 UTC (rev 407)
@@ -65,8 +65,8 @@
   # launching charge will also load classes associated with the report
   # e.g. report_ope, report_df, report_dc
   r_mig_mult<-connect(r_mig_mult)
-  # calculations (fails in linux, failing to load tcltk on R-forge)
-  r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
+ 
+
 }
 
 # Use this as example if you don't have a connexion to the database
@@ -82,8 +82,8 @@
 assign("report_dc",r_mig_mult_dc,envir=envir_stacomi)
 # use the following to get the raw data loaded by the connect method
 # not shown there as the database and program might not be installed
-
-
+# calculations 
+r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
 #Individual plot for all DC, taxa and stage where data present
 #Silent=TRUE to turn off messages
 # not run because of multiple graphical devices