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

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

Author: briand
Date: 2021-11-15 11:13:49 +0100 (Mon, 15 Nov 2021)
New Revision: 605

Removed:
   pkg/stacomir/R/po/
   pkg/stacomir/inst/config/
Modified:
   pkg/stacomir/NAMESPACE
   pkg/stacomir/R/stacomiR-package.R
   pkg/stacomir/inst/examples/report_mig_mult-example.R
   pkg/stacomir/man/report_mig_mult-class.Rd
Log:
removed example failing in linux (gitlab)

Modified: pkg/stacomir/NAMESPACE
===================================================================
--- pkg/stacomir/NAMESPACE	2021-11-14 19:52:02 UTC (rev 604)
+++ pkg/stacomir/NAMESPACE	2021-11-15 10:13:49 UTC (rev 605)
@@ -48,7 +48,7 @@
 exportMethods(write_database)
 exportMethods(xtable)
 import(RColorBrewer)
-import(RPostgreSQL)
+import(RPostgres)
 import(ggplot2)
 import(methods)
 import(stacomirtools)

Modified: pkg/stacomir/R/stacomiR-package.R
===================================================================
--- pkg/stacomir/R/stacomiR-package.R	2021-11-14 19:52:02 UTC (rev 604)
+++ pkg/stacomir/R/stacomiR-package.R	2021-11-15 10:13:49 UTC (rev 605)
@@ -1,7 +1,7 @@
 
 
 #' @import ggplot2
-#' @import RPostgreSQL
+#' @import RPostgres
 #' @import methods
 #' @import RColorBrewer
 #' @import stacomirtools

Modified: pkg/stacomir/inst/examples/report_mig_mult-example.R
===================================================================
--- pkg/stacomir/inst/examples/report_mig_mult-example.R	2021-11-14 19:52:02 UTC (rev 604)
+++ pkg/stacomir/inst/examples/report_mig_mult-example.R	2021-11-15 10:13:49 UTC (rev 605)
@@ -23,19 +23,17 @@
 		stacomiR.user = user,
 		stacomiR.user = password						
 )	
-  r_mig_mult=new("report_mig_mult")
-  r_mig_mult=choice_c(r_mig_mult,
+  r_mig_mult <- new("report_mig_mult")
+  r_mig_mult <- choice_c(r_mig_mult,
 	  dc=c(5,6,12),
 	  taxa=c("Anguilla anguilla"),
 	  stage=c("AGG","AGJ","CIV"),datedebut="2011-01-01",datefin="2011-12-31")
-  r_mig_mult<-charge(r_mig_mult)
+  r_mig_mult <- charge(r_mig_mult)
   # 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)
+  r_mig_mult <- connect(r_mig_mult)
   # calculations 
-  r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
- 
-
+  r_mig_mult <- calcule(r_mig_mult,silent=TRUE)
 }
 
 # Use this as example if you don't have a connexion to the database
@@ -53,11 +51,11 @@
 # not shown there as the database and program might not be installed
 
 #Individual plot for all DC, taxa and stage where data present
-#Silent=TRUE to turn off messages
-# not run because of multiple graphical devices
 
+
+
+\dontrun{	
 plot(r_mig_mult,plot.type="standard",silent=TRUE)
-\dontrun{
 # colors in the following order (glass eel)
 # working, stopped, 1...5 types of operation,numbers, weight, 2 unused colors
 # for yellow eel and other taxa

Modified: pkg/stacomir/man/report_mig_mult-class.Rd
===================================================================
--- pkg/stacomir/man/report_mig_mult-class.Rd	2021-11-14 19:52:02 UTC (rev 604)
+++ pkg/stacomir/man/report_mig_mult-class.Rd	2021-11-15 10:13:49 UTC (rev 605)
@@ -70,19 +70,17 @@
 		stacomiR.user = user,
 		stacomiR.user = password						
 )	
-  r_mig_mult=new("report_mig_mult")
-  r_mig_mult=choice_c(r_mig_mult,
+  r_mig_mult <- new("report_mig_mult")
+  r_mig_mult <- choice_c(r_mig_mult,
 	  dc=c(5,6,12),
 	  taxa=c("Anguilla anguilla"),
 	  stage=c("AGG","AGJ","CIV"),datedebut="2011-01-01",datefin="2011-12-31")
-  r_mig_mult<-charge(r_mig_mult)
+  r_mig_mult <- charge(r_mig_mult)
   # 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)
+  r_mig_mult <- connect(r_mig_mult)
   # calculations 
-  r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
- 
-
+  r_mig_mult <- calcule(r_mig_mult,silent=TRUE)
 }
 
 # Use this as example if you don't have a connexion to the database
@@ -100,11 +98,11 @@
 # not shown there as the database and program might not be installed
 
 #Individual plot for all DC, taxa and stage where data present
-#Silent=TRUE to turn off messages
-# not run because of multiple graphical devices
 
+
+
+\dontrun{	
 plot(r_mig_mult,plot.type="standard",silent=TRUE)
-\dontrun{
 # colors in the following order (glass eel)
 # working, stopped, 1...5 types of operation,numbers, weight, 2 unused colors
 # for yellow eel and other taxa