[Stacomir-commits] r367 - in pkg/stacomir: R data inst/config inst/examples man

Tue May 16 21:11:14 CEST 2017

Author: briand
Date: 2017-05-16 21:11:13 +0200 (Tue, 16 May 2017)
New Revision: 367

Added:
   pkg/stacomir/data/bmmCE.rda
   pkg/stacomir/man/bmmCE.Rd
Modified:
   pkg/stacomir/R/data.r
   pkg/stacomir/inst/config/generate_Roxygen2.R
   pkg/stacomir/inst/config/generate_data.R
   pkg/stacomir/inst/examples/bilanMigrationMultConditionEnv_example.R
   pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd
Log:
creating and documenting bmmCE dataset

Modified: pkg/stacomir/R/data.r
===================================================================

--- pkg/stacomir/R/data.r	2017-05-16 14:51:03 UTC (rev 366)
+++ pkg/stacomir/R/data.r	2017-05-16 19:11:13 UTC (rev 367)
@@ -386,4 +386,18 @@
 #'  \item{horodatefin}{object of class \code{RefHorodate-class} : the end date selected}
 #' }
 #' @keywords data
-"bmC"
\ No newline at end of file
+"bmC"
+
+
+
+#' An object of class BilanMigrationMultConditionEnv with data loaded
+#' 
+#' The dataset correspond to data loaded for the Arzal dam (Vilaine) in 2008, two quantitative
+#' parameters (temperature and tide coefficient and a qualitative parameter moon phase are loaded. 
+#' @format An object of class \link{BilanConditionEnv-class} with data slot loaded:
+#' \describe{
+#'   \item{bilanMigrationMult}{An object of class \link{BilanMigrationMult-class}}
+#'   \item{bilanConditionEnv}{ An object of class \link{BilanConditionEnv-class}}#' 	
+#'   }
+#' @keywords data
+"bmmCE"

Added: pkg/stacomir/data/bmmCE.rda
===================================================================
(Binary files differ)


Property changes on: pkg/stacomir/data/bmmCE.rda
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pkg/stacomir/inst/config/generate_Roxygen2.R
===================================================================
--- pkg/stacomir/inst/config/generate_Roxygen2.R	2017-05-16 14:51:03 UTC (rev 366)
+++ pkg/stacomir/inst/config/generate_Roxygen2.R	2017-05-16 19:11:13 UTC (rev 367)
@@ -37,8 +37,8 @@
 require(roxygen2)
 
 #Pour Cédric
-#roxygen2::roxygenise("F:/workspace/stacomir/pkg/stacomir");warnings()[1:10]
+roxygen2::roxygenise("F:/workspace/stacomir/pkg/stacomir");warnings()[1:10]
 
 #Pour Marion 
-roxygen2::roxygenise("C:/Users/logrami/workspace/stacomir/pkg/stacomir");warnings()[1:10]
+#roxygen2::roxygenise("C:/Users/logrami/workspace/stacomir/pkg/stacomir");warnings()[1:10]
 

Modified: pkg/stacomir/inst/config/generate_data.R
===================================================================
--- pkg/stacomir/inst/config/generate_data.R	2017-05-16 14:51:03 UTC (rev 366)
+++ pkg/stacomir/inst/config/generate_data.R	2017-05-16 19:11:13 UTC (rev 367)
@@ -525,4 +525,33 @@
 bmC at dc@data[,"type_df"]<-iconv(bmC at dc@data[,"type_df"],from="latin1",to="UTF8")
 bmC at dc@data[,"type_dc"]<-iconv(bmC at dc@data[,"type_dc"],from="latin1",to="UTF8")
 bmC at dc@data[,"dif_localisation"]<-iconv(bmC at dc@data[,"dif_localisation"],from="latin1",to="UTF8")
-devtools::use_data(bmC,internal=FALSE,overwrite=TRUE)
\ No newline at end of file
+devtools::use_data(bmC,internal=FALSE,overwrite=TRUE)
+
+
+#################################
+# generates dataset for BilanMigrationMultConditionEnv
+##################################
+setwd("F:/workspace/stacomir/pkg/stacomir")
+require(stacomiR)
+stacomi(gr_interface=FALSE,
+		login_window=FALSE,
+		database_expected=FALSE)
+
+bmmCE<-new("BilanMigrationMultConditionEnv")
+bmmCE<-choice_c(bmmCE,
+		dc=c(5,6,12),
+		taxon=c("Anguilla anguilla"),
+		stade=c("AGJ","AGG","CIV"),
+		stationMesure=c("temp_gabion","coef_maree","phases_lune"),
+		datedebut="2008-01-01",
+		datefin="2008-12-31",
+		silent=FALSE)	
+bmmCE<-charge(bmmCE)
+bmmCE<-connect(bmmCE)
+
+bmmCE at bilanMigrationMult@dc at data[,"ouv_libelle"]<-iconv(bmmCE at bilanMigrationMult@dc at data[,"ouv_libelle"],from="latin1",to="UTF8")
+bmmCE at bilanMigrationMult@dc at data[,"dis_commentaires"]<-iconv(bmmCE at bilanMigrationMult@dc at data[,"dis_commentaires"],from="latin1",to="UTF8")
+bmmCE at bilanMigrationMult@dc at data[,"type_df"]<-iconv(bmmCE at bilanMigrationMult@dc at data[,"type_df"],from="latin1",to="UTF8")
+bmmCE at bilanMigrationMult@dc at data[,"type_dc"]<-iconv(bmmCE at bilanMigrationMult@dc at data[,"type_dc"],from="latin1",to="UTF8")
+bmmCE at bilanMigrationMult@dc at data[,"dif_localisation"]<-iconv(bmmCE at bilanMigrationMult@dc at data[,"dif_localisation"],from="latin1",to="UTF8")
+devtools::use_data(bmmCE,internal=FALSE,overwrite=TRUE)
\ No newline at end of file

Modified: pkg/stacomir/inst/examples/bilanMigrationMultConditionEnv_example.R
===================================================================
--- pkg/stacomir/inst/examples/bilanMigrationMultConditionEnv_example.R	2017-05-16 14:51:03 UTC (rev 366)
+++ pkg/stacomir/inst/examples/bilanMigrationMultConditionEnv_example.R	2017-05-16 19:11:13 UTC (rev 367)
@@ -14,12 +14,11 @@
 			silent=FALSE)	
 	bmmCE<-charge(bmmCE)
 	bmmCE<-connect(bmmCE)
-	bmmCE<-calcule(bmmCE,silent=TRUE)
 	
 }	
 
 data("bmmCE")
-
+bmmCE<-calcule(bmmCE,silent=TRUE)
 plot(bmmCE,
 		color_station=c("temp_gabion"="red","coef_maree"="blue","phases_lune"="pink"),
  		color_dc=c("5"="yellow","6"="orange","12"="purple")

Modified: pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd	2017-05-16 14:51:03 UTC (rev 366)
+++ pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd	2017-05-16 19:11:13 UTC (rev 367)
@@ -35,12 +35,11 @@
 			silent=FALSE)	
 	bmmCE<-charge(bmmCE)
 	bmmCE<-connect(bmmCE)
-	bmmCE<-calcule(bmmCE,silent=TRUE)
 	
 }	
 
 data("bmmCE")
-
+bmmCE<-calcule(bmmCE,silent=TRUE)
 plot(bmmCE,
 		color_station=c("temp_gabion"="red","coef_maree"="blue","phases_lune"="pink"),
  		color_dc=c("5"="yellow","6"="orange","12"="purple")

Added: pkg/stacomir/man/bmmCE.Rd
===================================================================
--- pkg/stacomir/man/bmmCE.Rd	                        (rev 0)
+++ pkg/stacomir/man/bmmCE.Rd	2017-05-16 19:11:13 UTC (rev 367)
@@ -0,0 +1,20 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/data.r
+\docType{data}
+\name{bmmCE}
+\alias{bmmCE}
+\title{An object of class BilanMigrationMultConditionEnv with data loaded}
+\format{An object of class \link{BilanConditionEnv-class} with data slot loaded:
+\describe{
+  \item{bilanMigrationMult}{An object of class \link{BilanMigrationMult-class}}
+  \item{bilanConditionEnv}{ An object of class \link{BilanConditionEnv-class}}#' 	
+  }}
+\usage{
+bmmCE
+}
+\description{
+The dataset correspond to data loaded for the Arzal dam (Vilaine) in 2008, two quantitative
+parameters (temperature and tide coefficient and a qualitative parameter moon phase are loaded.
+}
+\keyword{data}
+

