[Stacomir-commits] r356 - in pkg: stacomir stacomir/R stacomir/inst/examples stacomir/man stacomirtools stacomirtools/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon May 8 08:58:20 CEST 2017
Author: briand
Date: 2017-05-08 08:58:19 +0200 (Mon, 08 May 2017)
New Revision: 356
Modified:
pkg/stacomir/DESCRIPTION
pkg/stacomir/R/BilanArgentee.r
pkg/stacomir/R/data.r
pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R
pkg/stacomir/man/BilanAgedemer-class.Rd
pkg/stacomir/man/BilanAnnuels-class.Rd
pkg/stacomir/man/BilanArgentee-class.Rd
pkg/stacomir/man/BilanConditionEnv-class.Rd
pkg/stacomir/man/BilanEspeces-class.Rd
pkg/stacomir/man/BilanFonctionnementDC-class.Rd
pkg/stacomir/man/BilanFonctionnementDF-class.Rd
pkg/stacomir/man/BilanMigration-class.Rd
pkg/stacomir/man/BilanMigrationCar-class.Rd
pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd
pkg/stacomir/man/BilanMigrationMult-class.Rd
pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd
pkg/stacomir/man/BilanOperation-class.Rd
pkg/stacomir/man/Bilan_carlot-class.Rd
pkg/stacomir/man/Bilan_poids_moyen-class.Rd
pkg/stacomir/man/DateFin-PasDeTemps-method.Rd
pkg/stacomir/man/DateFin.Rd
pkg/stacomir/man/PasDeTemps-class.Rd
pkg/stacomir/man/PasDeTempsChar-class.Rd
pkg/stacomir/man/PasDeTempsJournalier-class.Rd
pkg/stacomir/man/RefAnnee-class.Rd
pkg/stacomir/man/RefCheckBox-class.Rd
pkg/stacomir/man/RefChoix-class.Rd
pkg/stacomir/man/RefCoe-class.Rd
pkg/stacomir/man/RefDC-class.Rd
pkg/stacomir/man/RefDF-class.Rd
pkg/stacomir/man/RefHorodate-class.Rd
pkg/stacomir/man/RefListe-class.Rd
pkg/stacomir/man/RefStades-class.Rd
pkg/stacomir/man/RefStationMesure-class.Rd
pkg/stacomir/man/RefTaxon-class.Rd
pkg/stacomir/man/RefTextBox-class.Rd
pkg/stacomir/man/Refpar-class.Rd
pkg/stacomir/man/Refparqual-class.Rd
pkg/stacomir/man/Refparquan-class.Rd
pkg/stacomir/man/Refperiode-class.Rd
pkg/stacomir/man/bMM_Arzal.Rd
pkg/stacomir/man/bM_Arzal.Rd
pkg/stacomir/man/b_carlot.Rd
pkg/stacomir/man/barplot-BilanAnnuels-method.Rd
pkg/stacomir/man/bfDC.Rd
pkg/stacomir/man/bfDF.Rd
pkg/stacomir/man/bilA.Rd
pkg/stacomir/man/bilAM.Rd
pkg/stacomir/man/bilPM.Rd
pkg/stacomir/man/bilanArg.Rd
pkg/stacomir/man/bilanFonctionnementDC.Rd
pkg/stacomir/man/bilanFonctionnementDC_bM.Rd
pkg/stacomir/man/bilanFonctionnementDF.Rd
pkg/stacomir/man/bilanFonctionnementDF_bM.Rd
pkg/stacomir/man/bilanOperation.Rd
pkg/stacomir/man/bilanOperation_bM.Rd
pkg/stacomir/man/bilan_adm.Rd
pkg/stacomir/man/bmC.Rd
pkg/stacomir/man/bmi.Rd
pkg/stacomir/man/bmi_vichy.Rd
pkg/stacomir/man/calcmig.Rd
pkg/stacomir/man/calcule-BilanAgedemer-method.Rd
pkg/stacomir/man/calcule-BilanArgentee-method.Rd
pkg/stacomir/man/calcule-BilanMigration-method.Rd
pkg/stacomir/man/calcule-BilanMigrationCar-method.Rd
pkg/stacomir/man/calcule-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/calcule-BilanMigrationMult-method.Rd
pkg/stacomir/man/calcule-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/calcule-Bilan_carlot-method.Rd
pkg/stacomir/man/calcule-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/calcule.Rd
pkg/stacomir/man/charge-BilanAgedemer-method.Rd
pkg/stacomir/man/charge-BilanAnnuels-method.Rd
pkg/stacomir/man/charge-BilanArgentee-method.Rd
pkg/stacomir/man/charge-BilanConditionEnv-method.Rd
pkg/stacomir/man/charge-BilanEspeces-method.Rd
pkg/stacomir/man/charge-BilanFonctionnementDC-method.Rd
pkg/stacomir/man/charge-BilanFonctionnementDF-method.Rd
pkg/stacomir/man/charge-BilanMigration-method.Rd
pkg/stacomir/man/charge-BilanMigrationCar-method.Rd
pkg/stacomir/man/charge-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/charge-BilanMigrationMult-method.Rd
pkg/stacomir/man/charge-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/charge-BilanOperation-method.Rd
pkg/stacomir/man/charge-Bilan_carlot-method.Rd
pkg/stacomir/man/charge-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/charge-RefAnnee-method.Rd
pkg/stacomir/man/charge-RefCheckBox-method.Rd
pkg/stacomir/man/charge-RefChoix-method.Rd
pkg/stacomir/man/charge-RefCoe-method.Rd
pkg/stacomir/man/charge-RefDC-method.Rd
pkg/stacomir/man/charge-RefDF-method.Rd
pkg/stacomir/man/charge-RefListe-method.Rd
pkg/stacomir/man/charge-RefStades-method.Rd
pkg/stacomir/man/charge-RefStationMesure-method.Rd
pkg/stacomir/man/charge-RefTaxon-method.Rd
pkg/stacomir/man/charge-RefTextBox-method.Rd
pkg/stacomir/man/charge-Refpar-method.Rd
pkg/stacomir/man/charge-Refparqual-method.Rd
pkg/stacomir/man/charge-Refparquan-method.Rd
pkg/stacomir/man/charge.Rd
pkg/stacomir/man/charge_avec_filtre-RefStades-method.Rd
pkg/stacomir/man/charge_avec_filtre-RefTaxon-method.Rd
pkg/stacomir/man/charge_avec_filtre-Refpar-method.Rd
pkg/stacomir/man/charge_avec_filtre-Refparqual-method.Rd
pkg/stacomir/man/charge_avec_filtre-Refparquan-method.Rd
pkg/stacomir/man/charge_avec_filtre.Rd
pkg/stacomir/man/charge_complement-Refparqual-method.Rd
pkg/stacomir/man/charge_complement.Rd
pkg/stacomir/man/chargecsv.Rd
pkg/stacomir/man/choice-PasDeTemps-method.Rd
pkg/stacomir/man/choice-RefAnnee-method.Rd
pkg/stacomir/man/choice-RefCheckBox-method.Rd
pkg/stacomir/man/choice-RefChoix-method.Rd
pkg/stacomir/man/choice-RefDC-method.Rd
pkg/stacomir/man/choice-RefDF-method.Rd
pkg/stacomir/man/choice-RefHorodate-method.Rd
pkg/stacomir/man/choice-RefListe-method.Rd
pkg/stacomir/man/choice-RefStades-method.Rd
pkg/stacomir/man/choice-RefStationMesure-method.Rd
pkg/stacomir/man/choice-RefTaxon-method.Rd
pkg/stacomir/man/choice-RefTextBox-method.Rd
pkg/stacomir/man/choice-Refpar-method.Rd
pkg/stacomir/man/choice-Refparqual-method.Rd
pkg/stacomir/man/choice.Rd
pkg/stacomir/man/choice_c-BilanAgedemer-method.Rd
pkg/stacomir/man/choice_c-BilanAnnuels-method.Rd
pkg/stacomir/man/choice_c-BilanArgentee-method.Rd
pkg/stacomir/man/choice_c-BilanConditionEnv-method.Rd
pkg/stacomir/man/choice_c-BilanFonctionnementDC-method.Rd
pkg/stacomir/man/choice_c-BilanFonctionnementDF-method.Rd
pkg/stacomir/man/choice_c-BilanMigration-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationCar-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationMult-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/choice_c-Bilan_carlot-method.Rd
pkg/stacomir/man/choice_c-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/choice_c-PasDeTempsJournalier-method.Rd
pkg/stacomir/man/choice_c-RefAnnee-method.Rd
pkg/stacomir/man/choice_c-RefChoix-method.Rd
pkg/stacomir/man/choice_c-RefDC-method.Rd
pkg/stacomir/man/choice_c-RefDF-method.Rd
pkg/stacomir/man/choice_c-RefHorodate-method.Rd
pkg/stacomir/man/choice_c-RefListe-method.Rd
pkg/stacomir/man/choice_c-RefStades-method.Rd
pkg/stacomir/man/choice_c-RefStationMesure-method.Rd
pkg/stacomir/man/choice_c-RefTaxon-method.Rd
pkg/stacomir/man/choice_c-RefTextBox-method.Rd
pkg/stacomir/man/choice_c-Refpar-method.Rd
pkg/stacomir/man/choice_c.Rd
pkg/stacomir/man/choicemult-PasDeTemps-method.Rd
pkg/stacomir/man/choicemult-RefDC-method.Rd
pkg/stacomir/man/choicemult-RefStades-method.Rd
pkg/stacomir/man/choicemult-RefTaxon-method.Rd
pkg/stacomir/man/choicemult.Rd
pkg/stacomir/man/coef_Durif.Rd
pkg/stacomir/man/colortable.Rd
pkg/stacomir/man/connect-BilanAgedemer-method.Rd
pkg/stacomir/man/connect-BilanAnnuels-method.Rd
pkg/stacomir/man/connect-BilanArgentee-method.Rd
pkg/stacomir/man/connect-BilanConditionEnv-method.Rd
pkg/stacomir/man/connect-BilanEspeces-method.Rd
pkg/stacomir/man/connect-BilanFonctionnementDC-method.Rd
pkg/stacomir/man/connect-BilanFonctionnementDF-method.Rd
pkg/stacomir/man/connect-BilanMigration-method.Rd
pkg/stacomir/man/connect-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/connect-BilanMigrationMult-method.Rd
pkg/stacomir/man/connect-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/connect-BilanOperation-method.Rd
pkg/stacomir/man/connect-Bilan_carlot-method.Rd
pkg/stacomir/man/connect-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/createmessage.Rd
pkg/stacomir/man/currentDateDebut-PasDeTemps-method.Rd
pkg/stacomir/man/currentDateDebut.Rd
pkg/stacomir/man/currentDateFin-PasDeTemps-method.Rd
pkg/stacomir/man/currentDateFin.Rd
pkg/stacomir/man/envir_stacomi.Rd
pkg/stacomir/man/f_stade_Durif.Rd
pkg/stacomir/man/fn_EcritBilanMensuel.Rd
pkg/stacomir/man/fn_table_per_dis.Rd
pkg/stacomir/man/funSousListeBilanMigrationPar.Rd
pkg/stacomir/man/fun_aggreg_for_plot.Rd
pkg/stacomir/man/fun_bilanMigrationMult.Rd
pkg/stacomir/man/fun_bilanMigrationMult_Overlaps.Rd
pkg/stacomir/man/fun_char_spe.Rd
pkg/stacomir/man/fun_weight_conversion.Rd
pkg/stacomir/man/funbarchart1DC.Rd
pkg/stacomir/man/funbarchart1DF.Rd
pkg/stacomir/man/funbarchartDC.Rd
pkg/stacomir/man/funbarchartDF.Rd
pkg/stacomir/man/funboxDC.Rd
pkg/stacomir/man/funboxDF.Rd
pkg/stacomir/man/funboxplotBilan_carlot.Rd
pkg/stacomir/man/funchartDC.Rd
pkg/stacomir/man/funchartDF.Rd
pkg/stacomir/man/fundat.Rd
pkg/stacomir/man/fundensityBilan_carlot.Rd
pkg/stacomir/man/fungraph.Rd
pkg/stacomir/man/fungraph_civelle.Rd
pkg/stacomir/man/funout.Rd
pkg/stacomir/man/funplotBilanAgedemer.Rd
pkg/stacomir/man/funplotBilanArgentee.Rd
pkg/stacomir/man/funpointBilan_carlot.Rd
pkg/stacomir/man/funstat.Rd
pkg/stacomir/man/funstatJournalier.Rd
pkg/stacomir/man/funtable.Rd
pkg/stacomir/man/funtableBilanAgedemer.Rd
pkg/stacomir/man/funtableBilanArgentee.Rd
pkg/stacomir/man/funtableBilan_carlot.Rd
pkg/stacomir/man/funtableDC.Rd
pkg/stacomir/man/funtableDF.Rd
pkg/stacomir/man/funtraitement_poids.Rd
pkg/stacomir/man/funtraitementdate.Rd
pkg/stacomir/man/getAnnees-PasDeTemps-method.Rd
pkg/stacomir/man/getAnnees.Rd
pkg/stacomir/man/getLibellesPas-PasDeTemps-method.Rd
pkg/stacomir/man/getLibellesPas.Rd
pkg/stacomir/man/getdateDebut-PasDeTemps-method.Rd
pkg/stacomir/man/getdateDebut.Rd
pkg/stacomir/man/getnoPasCourant-PasDeTemps-method.Rd
pkg/stacomir/man/getnoPasCourant.Rd
pkg/stacomir/man/getvalue-Refperiode-method.Rd
pkg/stacomir/man/getvalue.Rd
pkg/stacomir/man/graphdate.Rd
pkg/stacomir/man/hBilanConditionEnv.Rd
pkg/stacomir/man/hBilanEspeces.Rd
pkg/stacomir/man/hBilanEspecescalc.Rd
pkg/stacomir/man/hBilanMigration.Rd
pkg/stacomir/man/hBilanMigrationInterAnnuelle.Rd
pkg/stacomir/man/hBilanMigrationMult.Rd
pkg/stacomir/man/hBilanMigrationMultConditionEnv.Rd
pkg/stacomir/man/hBilanMigrationPar.Rd
pkg/stacomir/man/hBilan_carlot.Rd
pkg/stacomir/man/hCamembert.Rd
pkg/stacomir/man/hDC.Rd
pkg/stacomir/man/hDF.Rd
pkg/stacomir/man/hDFDC.Rd
pkg/stacomir/man/hOPE.Rd
pkg/stacomir/man/hSt.Rd
pkg/stacomir/man/hTableBilanEspeces.Rd
pkg/stacomir/man/hTableBilanMigration.Rd
pkg/stacomir/man/hTableBilanMigrationMult.Rd
pkg/stacomir/man/hTail.Rd
pkg/stacomir/man/hbarplotBilanAnnuels.Rd
pkg/stacomir/man/hbilA.Rd
pkg/stacomir/man/hbilanConditionEnvgraph.Rd
pkg/stacomir/man/hbilanMigrationMult_graph.Rd
pkg/stacomir/man/hbilanMigrationMultcalc.Rd
pkg/stacomir/man/hbilanMigrationMultgraph2.Rd
pkg/stacomir/man/hbilanMigrationMultgraph3.Rd
pkg/stacomir/man/hbilanMigrationcalc.Rd
pkg/stacomir/man/hbilanMigrationgraph.Rd
pkg/stacomir/man/hbilanMigrationgraph2.Rd
pkg/stacomir/man/hbilanMigrationwrite.Rd
pkg/stacomir/man/hbilanagedemer.Rd
pkg/stacomir/man/hbmCcalc.Rd
pkg/stacomir/man/hbmCgraph.Rd
pkg/stacomir/man/hbmCgraph2.Rd
pkg/stacomir/man/hbmCstat.Rd
pkg/stacomir/man/hbmmCEcalc.Rd
pkg/stacomir/man/hbmmCEgraph.Rd
pkg/stacomir/man/hcalc.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle2.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle3.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle4.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle5.Rd
pkg/stacomir/man/hgraphBilanMigrationInterAnnuelle7.Rd
pkg/stacomir/man/houtBilanMigration.Rd
pkg/stacomir/man/houtBilanMigrationMult.Rd
pkg/stacomir/man/houtDC.Rd
pkg/stacomir/man/houtDF.Rd
pkg/stacomir/man/hpds.Rd
pkg/stacomir/man/hplotBilanAnnuels.Rd
pkg/stacomir/man/hreg.Rd
pkg/stacomir/man/hsilver.Rd
pkg/stacomir/man/hsummaryBilanMigrationInterannuelle.Rd
pkg/stacomir/man/husr.Rd
pkg/stacomir/man/hxtableBilanAnnuels.Rd
pkg/stacomir/man/interface_BilanAgedemer.Rd
pkg/stacomir/man/interface_BilanAnnuels.Rd
pkg/stacomir/man/interface_BilanArgentee.Rd
pkg/stacomir/man/interface_BilanEspeces.Rd
pkg/stacomir/man/interface_BilanFonctionnementDC.Rd
pkg/stacomir/man/interface_BilanFonctionnementDF.Rd
pkg/stacomir/man/interface_BilanMigration.Rd
pkg/stacomir/man/interface_BilanMigrationInterAnnuelle.Rd
pkg/stacomir/man/interface_BilanMigrationMult.Rd
pkg/stacomir/man/interface_BilanMigrationMultConditionEnv.Rd
pkg/stacomir/man/interface_BilanMigrationPar.Rd
pkg/stacomir/man/interface_BilanPoidsMoyen.Rd
pkg/stacomir/man/interface_Bilan_carlot.Rd
pkg/stacomir/man/interface_ConditionEnv.Rd
pkg/stacomir/man/interface_graphique.Rd
pkg/stacomir/man/model-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/model.Rd
pkg/stacomir/man/mygtkProgressBar.Rd
pkg/stacomir/man/out.Rd
pkg/stacomir/man/plot-BilanAgedemer-missing-method.Rd
pkg/stacomir/man/plot-BilanAnnuels-missing-method.Rd
pkg/stacomir/man/plot-BilanArgentee-missing-method.Rd
pkg/stacomir/man/plot-BilanConditionEnv-missing-method.Rd
pkg/stacomir/man/plot-BilanFonctionnementDC-ANY-method.Rd
pkg/stacomir/man/plot-BilanFonctionnementDF-ANY-method.Rd
pkg/stacomir/man/plot-BilanMigration-ANY-method.Rd
pkg/stacomir/man/plot-BilanMigrationCar-missing-method.Rd
pkg/stacomir/man/plot-BilanMigrationInterAnnuelle-missing-method.Rd
pkg/stacomir/man/plot-BilanMigrationMult-missing-method.Rd
pkg/stacomir/man/plot-BilanMigrationMultConditionEnv-missing-method.Rd
pkg/stacomir/man/plot-Bilan_carlot-missing-method.Rd
pkg/stacomir/man/plot-Bilan_poids_moyen-missing-method.Rd
pkg/stacomir/man/print-BilanAgedemer-method.Rd
pkg/stacomir/man/print-BilanArgentee-method.Rd
pkg/stacomir/man/print-BilanFonctionnementDC-method.Rd
pkg/stacomir/man/print-BilanFonctionnementDF-method.Rd
pkg/stacomir/man/print-BilanMigration-method.Rd
pkg/stacomir/man/print-BilanMigrationMult-method.Rd
pkg/stacomir/man/print-Bilan_carlot-method.Rd
pkg/stacomir/man/quitte.Rd
pkg/stacomir/man/setRefHorodate-RefHorodate-method.Rd
pkg/stacomir/man/setasqualitative-BilanMigrationCar-method.Rd
pkg/stacomir/man/setasqualitative.Rd
pkg/stacomir/man/setdateDebut-PasDeTemps-method.Rd
pkg/stacomir/man/setdateDebut.Rd
pkg/stacomir/man/split_per_day.Rd
pkg/stacomir/man/stacomi.Rd
pkg/stacomir/man/suivant-PasDeTemps-method.Rd
pkg/stacomir/man/suivant.Rd
pkg/stacomir/man/summary-BilanAgedemer-method.Rd
pkg/stacomir/man/summary-BilanArgentee-method.Rd
pkg/stacomir/man/summary-BilanFonctionnementDC-method.Rd
pkg/stacomir/man/summary-BilanFonctionnementDF-method.Rd
pkg/stacomir/man/summary-BilanMigration-method.Rd
pkg/stacomir/man/summary-BilanMigrationCar-method.Rd
pkg/stacomir/man/summary-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/summary-BilanMigrationMult-method.Rd
pkg/stacomir/man/summary-Bilan_carlot-method.Rd
pkg/stacomir/man/supprime-BilanAgedemer-method.Rd
pkg/stacomir/man/supprime-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/supprime-RefCoe-method.Rd
pkg/stacomir/man/supprime.Rd
pkg/stacomir/man/validite_Annee.Rd
pkg/stacomir/man/validite_RefHorodate.Rd
pkg/stacomir/man/vector_to_listsql.Rd
pkg/stacomir/man/write_database-BilanAgedemer-method.Rd
pkg/stacomir/man/write_database-BilanMigration-method.Rd
pkg/stacomir/man/write_database-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/write_database.Rd
pkg/stacomir/man/xtable-BilanAnnuels-method.Rd
pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd
pkg/stacomirtools/DESCRIPTION
pkg/stacomirtools/R/RequeteODBCwheredate.r
Log:
Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/DESCRIPTION 2017-05-08 06:58:19 UTC (rev 356)
@@ -10,7 +10,7 @@
by the ONEMA institute to centralize data obtained by fishway monitoring.
Version 0.5.1 is available in French English.
License: GPL (>= 2)
-Collate:
+Collate:
'create_generic.r'
'Refpar.r'
'RefHorodate.r'
@@ -107,5 +107,5 @@
Marion Legrand [aut],
Timothee Besse [aut]
Maintainer: Cedric Briand <cedric.briand00 at gmail.com>
-RoxygenNote: 6.0.1
+RoxygenNote: 5.0.1
NeedsCompilation: no
Modified: pkg/stacomir/R/BilanArgentee.r
===================================================================
--- pkg/stacomir/R/BilanArgentee.r 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/R/BilanArgentee.r 2017-05-08 06:58:19 UTC (rev 356)
@@ -513,7 +513,7 @@
par(mar=c(1,4.1,1,1))
for (i in 1:length(lesdc)){
indexdc<-datdc$dc==lesdc[i]
- histxn<-graphics::hist(datdc$BL[indexdc],breaks=seq(250,1000,by=50),plot=FALSE)$density
+ histxn<-graphics::hist(datdc$BL[indexdc],breaks=seq(250,1100,by=50),plot=FALSE)$density
if (i==1) histx<-histxn else histx<-cbind(histx,histxn)
}
@@ -569,7 +569,7 @@
par(mar=c(5.1,1,1,1))
for (i in 1:length(lesdc)){
indexdc<-datdc$dc==lesdc[i]
- histyn<-hist(datdc$W[indexdc],plot=FALSE,breaks=seq(0,2000,by=100))$density
+ histyn<-hist(datdc$W[indexdc],plot=FALSE,breaks=seq(0,2500,by=100))$density
if (i==1) histy<-histyn else histy<-cbind(histy,histyn)
}
Modified: pkg/stacomir/R/data.r
===================================================================
--- pkg/stacomir/R/data.r 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/R/data.r 2017-05-08 06:58:19 UTC (rev 356)
@@ -201,7 +201,7 @@
#' @keywords data
"b_carlot"
-#' Daily glass eel and elver migration from 1984 to 2016 in the S \u0168 vre Niortaise
+#' Daily glass eel and elver migration from 1984 to 2016 in the Sevre Niortaise
#'
#' The first eel trapping ladder in France was built by Antoine Legault and the team from Rennes
#' in the Sevre Niortaise, Marais Poitevin. Also refurbished several times since 1984 it has been
Modified: pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R
===================================================================
--- pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R 2017-05-08 06:58:19 UTC (rev 356)
@@ -50,27 +50,16 @@
color_ope=c("#5589B5","#FFDB6E","#FF996E","#1C4D76"),
silent=TRUE)
-# Other arguments can be passed to plot including xlim but the rendering might not
-# be that good
-plot(bMM_Arzal,plot.type="standard",
- color=color,
- color_ope=color_ope,
- main="Effectif civelles piège Gabion (rive gauche) en 2016",
- cex.main=1.1,
- lty=2,
- type="b",
- xlim=
- silent=TRUE)
#cumulated migration at the station (all stages and DC grouped)
-plot(bMM_Arzal,plot.type="step")
+plot(bMM_Arzal,plot.type="step",silent=TRUE)
#some plots are a mixture of french and english
#changing the reference table names to english should shift all to english.
#same for spanish.
# combined plot for ggplot2
-plot(bMM_Arzal,plot.type="multiple")
+plot(bMM_Arzal,plot.type="multiple"=silent=TRUE)
# data will be written in the data directory specified in
# the stacomi/calcmig.csv file
\dontrun{
Modified: pkg/stacomir/man/BilanAgedemer-class.Rd
===================================================================
--- pkg/stacomir/man/BilanAgedemer-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanAgedemer-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,13 +2,13 @@
% Please edit documentation in R/BilanAgedemer.r
\docType{class}
\name{BilanAgedemer-class}
-\alias{BilanAgedemer-class}
+\alias{BilanAgeDeMer}
\alias{BilanAgedemer}
+\alias{BilanAgedemer-class}
\alias{bilA}
-\alias{bilanagedemer}
\alias{bilanAgedeMer}
-\alias{BilanAgeDeMer}
\alias{bilan_adm}
+\alias{bilanagedemer}
\title{Class "BilanAgedemer"}
\description{
the BilanAgedemer class is used to dispatch adult salmons to age class according to
@@ -42,7 +42,6 @@
\item{\code{limit2hm}}{The size limit, in mm between 2 sea winter fishes and 3 sea winter fishes}
}}
-
\note{
This class is displayed by interface_bilan_agedemer
}
@@ -50,7 +49,6 @@
Objects can be created by calls of the form
\code{new("BilanAgedemer", ...)}
}
-
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -96,8 +94,11 @@
write_database(bilan_adm)
}
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAnnuels-class}},
+Other Bilan.Objects: \code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
\code{\link{BilanEspeces-class}},
@@ -111,7 +112,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanAnnuels-class.Rd
===================================================================
--- pkg/stacomir/man/BilanAnnuels-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanAnnuels-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -23,7 +23,6 @@
\item{\code{anneefin}}{Object of class \code{\link{RefAnnee-class}}
RefAnnee allows to choose last year of the Bilan}
}}
-
\examples{
require(stacomiR)
# launching stacomi without selecting the scheme or interface
@@ -92,8 +91,11 @@
}
plot(bilAM)
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
\code{\link{BilanEspeces-class}},
@@ -107,7 +109,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanArgentee-class.Rd
===================================================================
--- pkg/stacomir/man/BilanArgentee-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanArgentee-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -34,7 +34,6 @@
\item{\code{horodatefin}}{An object of class \code{RefHorodate-class}}
}}
-
\note{
This class is displayed by interface_bilanArgentee
}
@@ -42,7 +41,6 @@
Objects can be created by calls of the form
\code{new("BilanArgentee", ...)}
}
-
\examples{
require(stacomiR)
# launching stacomi without selecting the scheme or interface
@@ -93,8 +91,11 @@
# print a summary statistic, and save the output in a list for later use
stats<-summary(bilanArg)
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanConditionEnv-class}},
\code{\link{BilanEspeces-class}},
@@ -108,7 +109,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanConditionEnv-class.Rd
===================================================================
--- pkg/stacomir/man/BilanConditionEnv-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanConditionEnv-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,8 +2,8 @@
% Please edit documentation in R/BilanConditionEnv.r
\docType{class}
\name{BilanConditionEnv-class}
+\alias{BilanConditionEnv}
\alias{BilanConditionEnv-class}
-\alias{BilanConditionEnv}
\alias{bilanConditionEnv}
\title{class BilanConditionEnv simple output of one or several environmental
conditions...}
@@ -22,7 +22,6 @@
\item{\code{data}}{\code{data.frame}}
}}
-
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -42,8 +41,11 @@
data("bil_CE")
plot(bil_CE,silent=TRUE)
}
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanEspeces-class}},
@@ -57,7 +59,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanEspeces-class.Rd
===================================================================
--- pkg/stacomir/man/BilanEspeces-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanEspeces-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -26,12 +26,13 @@
\item{\code{liste}}{Object of class \code{\link{RefListe-class}} RefListe referential
class choose within a list}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("BilanEspeces", ...)}.
}
-
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
Other Bilan Classes
\code{\linkS4class{Bilan_carlot}},
@@ -45,7 +46,7 @@
\code{\linkS4class{BilanMigrationInterAnnuelle}},
\code{\linkS4class{BilanMigrationPar}}
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -59,7 +60,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanFonctionnementDC-class.Rd
===================================================================
--- pkg/stacomir/man/BilanFonctionnementDC-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanFonctionnementDC-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -21,12 +21,10 @@
\item{\code{horodatefin}}{An object of class \code{RefHorodate-class}}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("BilanFonctionnementDC", ...)}.
}
-
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -63,8 +61,11 @@
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -78,7 +79,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanFonctionnementDF-class.Rd
===================================================================
--- pkg/stacomir/man/BilanFonctionnementDF-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanFonctionnementDF-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -24,12 +24,10 @@
\item{\code{horodatefin}}{An object of class \code{RefHorodate-class}}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("BilanFonctionnementDF")}.
}
-
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -65,8 +63,11 @@
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -80,7 +81,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanMigration-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigration-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanMigration-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,8 +2,8 @@
% Please edit documentation in R/BilanMigration.r
\docType{class}
\name{BilanMigration-class}
+\alias{BilanMigration}
\alias{BilanMigration-class}
-\alias{BilanMigration}
\alias{bilanMigration}
\title{Migration report for one DC, one species and one stage}
\description{
@@ -30,7 +30,6 @@
\item{\code{time.sequence}}{Object of class \code{POSIXct} : a time sequence of days generated by the calcule method}
}}
-
\note{
Method \code{plot(...,type="standard")} also calls a function that will write to the database if
a connection to the database is expected.
@@ -94,8 +93,11 @@
write_database(bM_Arzal,silent=TRUE,dbname="bd_contmig_nat",host="localhost",port=5432)
}
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -109,7 +111,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanMigrationCar-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationCar-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanMigrationCar-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -38,7 +38,6 @@
\item{\code{time.sequence}}{An object of class "POSIXct" inherited from \link{BilanMigration-class}}
}}
-
\note{
The main difference between this class and \link{Bilan_carlot} is that this class allows to
select (or not) the samples, and that it handles quantitative and qualitative parameters separately.
@@ -50,9 +49,11 @@
\code{new("BilanMigrationCar", ...)}. they are loaded by the interface
using interface_BilanMigrationCar function.
}
-
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -66,10 +67,8 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\concept{
Bilan Object
}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -27,7 +27,6 @@
\item{\code{anneeFin}}{Object of class \code{\link{RefAnnee-class}}
refAnnee allows to choose last year of the Bilan}
}}
-
\examples{
require(stacomiR)
# launching stacomi without selecting the scheme or interface
@@ -169,8 +168,11 @@
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -184,7 +186,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanMigrationMult-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationMult-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanMigrationMult-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,8 +2,8 @@
% Please edit documentation in R/BilanMigrationMult.r
\docType{class}
\name{BilanMigrationMult-class}
+\alias{BilanMigrationMult}
\alias{BilanMigrationMult-class}
-\alias{BilanMigrationMult}
\alias{bilanMigrationMult}
\title{Migration reports for multiple DC / species / stages}
\description{
@@ -31,7 +31,6 @@
\item{\code{time.sequence}}{A POSIXt time sequence}
}}
-
\note{
A Migration Bilan comes from a migration monitoring : the fishes are monitored in a section of river, this section is
called a control station (station). Most often, there is a dam, one or several fishways (DF) which comprise one or several counting devices (DC).
@@ -89,24 +88,36 @@
# not run because of multiple graphical devices
plot(bMM_Arzal,plot.type="standard",silent=TRUE)
+# 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
+# stopped, 1...5 types of operation, ponctuel, expert, calcule,mesure,working,
+plot(bMM_Arzal,plot.type="standard",
+ color=c("#DEF76B","#B950B5","#9ABDDA","#781A74","#BF9D6E","#FFC26E","#A66F24","#012746","#6C3E00","#DC7ED8","#8AA123"),
+ color_ope=c("#5589B5","#FFDB6E","#FF996E","#1C4D76"),
+ silent=TRUE)
+
#cumulated migration at the station (all stages and DC grouped)
-plot(bMM_Arzal,plot.type="step")
+plot(bMM_Arzal,plot.type="step",silent=TRUE)
#some plots are a mixture of french and english
#changing the reference table names to english should shift all to english.
#same for spanish.
# combined plot for ggplot2
-plot(bMM_Arzal,plot.type="multiple")
+plot(bMM_Arzal,plot.type="multiple"=silent=TRUE)
# data will be written in the data directory specified in
# the stacomi/calcmig.csv file
\dontrun{
summary(bMM_Arzal,silent=TRUE)
}
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -120,7 +131,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,8 +2,8 @@
% Please edit documentation in R/BilanMigrationMultConditionEnv.r
\docType{class}
\name{BilanMigrationMultConditionEnv-class}
+\alias{BilanMigrationMultConditionEnv}
\alias{BilanMigrationMultConditionEnv-class}
-\alias{BilanMigrationMultConditionEnv}
\alias{bilanmigrationmultconditionenv}
\alias{bmmCE}
\title{Class "BilanMigrationMultConditionEnv"}
@@ -18,7 +18,6 @@
\item{\code{bilanConditionEnv}}{\link{BilanConditionEnv-class}}
}}
-
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -47,8 +46,13 @@
color_dc=c("5"="yellow","6"="orange","12"="purple")
)
}
+\author{
+cedric.briand"at"eptb-vilaine.fr marion.legrand"at"logrami.fr
+
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -62,7 +66,7 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -76,9 +80,5 @@
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr marion.legrand"at"logrami.fr
+\keyword{classes}
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
-\keyword{classes}
Modified: pkg/stacomir/man/BilanOperation-class.Rd
===================================================================
--- pkg/stacomir/man/BilanOperation-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/BilanOperation-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -2,10 +2,10 @@
% Please edit documentation in R/BilanOperation.r
\docType{class}
\name{BilanOperation-class}
+\alias{BilanOperation}
\alias{BilanOperation-class}
-\alias{BilanOperation}
+\alias{bilanOperation}
\alias{bilanoperation}
-\alias{bilanOperation}
\title{Report on operations}
\description{
Operations are monitoring operations generated between two dates. In the case of video monitoring
@@ -15,7 +15,9 @@
Objects can be created by calls of the form
\code{new("BilanOperation")}.
}
-
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
Other Bilan Class \code{\linkS4class{Bilan_carlot}}
\code{\linkS4class{Bilan_poids_moyen}}
@@ -30,10 +32,8 @@
\code{\linkS4class{BilanMigrationInterAnnuelle}}
\code{\linkS4class{BilanMigrationPar}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\concept{
Bilan Object
}
\keyword{classes}
+
Modified: pkg/stacomir/man/Bilan_carlot-class.Rd
===================================================================
--- pkg/stacomir/man/Bilan_carlot-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/Bilan_carlot-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -26,7 +26,6 @@
\item{\code{horodatefin}}{An object of class \code{RefHorodate-class}}
}}
-
\note{
This class is displayed by interface_bilan_carlot
}
@@ -34,7 +33,6 @@
Objects can be created by calls of the form
\code{new("Bilan_carlot", ...)}
}
-
\examples{
require(stacomiR)
# launching stacomi without selecting the scheme or interface
@@ -111,8 +109,11 @@
print(b_carlot)
}
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -126,7 +127,5 @@
\code{\link{BilanMigrationMultConditionEnv-class}},
\code{\link{Bilan_poids_moyen-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/Bilan_poids_moyen-class.Rd
===================================================================
--- pkg/stacomir/man/Bilan_poids_moyen-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/Bilan_poids_moyen-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -31,7 +31,6 @@
in the stacomi database are samples with a non null value for parent sample. Migration
counts are never made on subsamples but those can be integrated to calculate mean weights.}
}}
-
\note{
We have also tools available to import glass eel measurement from
experimental fishing in the estuary For the charge method dates for the
@@ -80,8 +79,11 @@
model(bilPM,model.type="seasonal")
model(bilPM,model.type="seasonal1")
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Bilan Objects: \code{\link{BilanAgedemer-class}},
+Other Bilan.Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
\code{\link{BilanConditionEnv-class}},
@@ -95,7 +97,5 @@
\code{\link{BilanMigrationMultConditionEnv-class}},
\code{\link{Bilan_carlot-class}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/DateFin-PasDeTemps-method.Rd
===================================================================
--- pkg/stacomir/man/DateFin-PasDeTemps-method.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/DateFin-PasDeTemps-method.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -16,3 +16,4 @@
\description{
Gets the final horodate for an object of class \link{PasDeTemps-class}
}
+
Modified: pkg/stacomir/man/DateFin.Rd
===================================================================
--- pkg/stacomir/man/DateFin.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/DateFin.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -14,3 +14,4 @@
\description{
Generic method for getting the final date
}
+
Modified: pkg/stacomir/man/PasDeTemps-class.Rd
===================================================================
--- pkg/stacomir/man/PasDeTemps-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/PasDeTemps-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -23,13 +23,13 @@
current step }\item{:}{Object of class \code{"integer"} Number of the
current step } }
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
\code{\linkS4class{PasDeTempsJournalier}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\concept{
Bilan Object
}
+
Modified: pkg/stacomir/man/PasDeTempsChar-class.Rd
===================================================================
--- pkg/stacomir/man/PasDeTempsChar-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/PasDeTempsChar-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -11,16 +11,16 @@
Objects can be created by calls of the form
\code{new("PasDeTempsChar", \dots{})}
}
-
\examples{
showClass("PasDeTempsChar")
}
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
\code{\linkS4class{PasDeTemps}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/PasDeTempsJournalier-class.Rd
===================================================================
--- pkg/stacomir/man/PasDeTempsJournalier-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/PasDeTempsJournalier-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -25,11 +25,11 @@
current step }\item{:}{Object of class \code{"integer"} Number of the
current step } }
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
\code{\linkS4class{PasDeTemps}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/RefAnnee-class.Rd
===================================================================
--- pkg/stacomir/man/RefAnnee-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefAnnee-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -14,14 +14,15 @@
\item{\code{annee_selectionnee}}{A numeric vector}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("RefAnnee", data=data.frame(), annee_selectionnee=numeric())}.
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Referential objects: \code{\link{RefCheckBox-class}},
+Other Referential.objects: \code{\link{RefCheckBox-class}},
\code{\link{RefChoix-class}}, \code{\link{RefCoe-class}},
\code{\link{RefDC-class}}, \code{\link{RefDF-class}},
\code{\link{RefHorodate-class}},
@@ -33,7 +34,5 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/RefCheckBox-class.Rd
===================================================================
--- pkg/stacomir/man/RefCheckBox-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefCheckBox-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -16,14 +16,17 @@
\item{\code{checked}}{A boolean vector}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("RefCheckBox", ...)}.
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefChoix-class}}, \code{\link{RefCoe-class}},
\code{\link{RefDC-class}}, \code{\link{RefDF-class}},
\code{\link{RefHorodate-class}},
@@ -35,8 +38,4 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
Modified: pkg/stacomir/man/RefChoix-class.Rd
===================================================================
--- pkg/stacomir/man/RefChoix-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefChoix-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -17,15 +17,16 @@
\item{\code{selected}}{An \code{Integer} the initial selected value (as an index), first=1 used in gradio}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("RefChoix", listechoice=character() ,label=character()
,selected=integer())}.
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefCheckBox-class}},
\code{\link{RefCoe-class}}, \code{\link{RefDC-class}},
\code{\link{RefDF-class}},
@@ -38,6 +39,4 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
+
Modified: pkg/stacomir/man/RefCoe-class.Rd
===================================================================
--- pkg/stacomir/man/RefCoe-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefCoe-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -18,7 +18,6 @@
\item{\code{datefin}}{A "POSIXlt"}
}}
-
\note{
Class loading coefficient of conversion between quantity (weights or
volumes of glass eel) and numbers between a starting and finishing date
@@ -27,9 +26,11 @@
Objects can be created by calls of the form
\code{new("RefCoe")}.
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefCheckBox-class}},
\code{\link{RefChoix-class}}, \code{\link{RefDC-class}},
\code{\link{RefDF-class}},
@@ -42,7 +43,5 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/RefDC-class.Rd
===================================================================
--- pkg/stacomir/man/RefDC-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefDC-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -19,15 +19,16 @@
\item{\code{data}}{Object of class \code{"data.frame"} data pertaining to the control device}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("RefDC", dc_selectionne=integer(), ouvrage=integer(),
data=data.frame())}.
}
-
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefCheckBox-class}},
\code{\link{RefChoix-class}}, \code{\link{RefCoe-class}},
\code{\link{RefDF-class}},
@@ -40,7 +41,5 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\keyword{classes}
+
Modified: pkg/stacomir/man/RefDF-class.Rd
===================================================================
--- pkg/stacomir/man/RefDF-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefDF-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -18,8 +18,11 @@
\code{new("RefDF", df_selectionne=integer(), ouvrage=integer(),
data=data.frame())}.
}
+\author{
+cedric.briand"at"eptb-vilaine.fr
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefCheckBox-class}},
\code{\link{RefChoix-class}}, \code{\link{RefCoe-class}},
\code{\link{RefDC-class}},
@@ -32,6 +35,4 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
+
Modified: pkg/stacomir/man/RefHorodate-class.Rd
===================================================================
--- pkg/stacomir/man/RefHorodate-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefHorodate-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -12,14 +12,15 @@
\describe{
\item{\code{horodate}}{a "POSIXt"}
}}
-
\section{Objects from the Class}{
Objects can be created by calls of the form
\code{new("RefHorodate", \dots{})}.
}
-
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\seealso{
-Other Referential objects: \code{\link{RefAnnee-class}},
+Other Referential.objects: \code{\link{RefAnnee-class}},
\code{\link{RefCheckBox-class}},
\code{\link{RefChoix-class}}, \code{\link{RefCoe-class}},
\code{\link{RefDC-class}}, \code{\link{RefDF-class}},
@@ -31,6 +32,4 @@
\code{\link{Refperiode-class}},
\code{\link{charge,RefChoix-method}}
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
+
Modified: pkg/stacomir/man/RefListe-class.Rd
===================================================================
--- pkg/stacomir/man/RefListe-class.Rd 2017-04-13 11:32:30 UTC (rev 355)
+++ pkg/stacomir/man/RefListe-class.Rd 2017-05-08 06:58:19 UTC (rev 356)
@@ -19,9 +19,11 @@
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 356
More information about the Stacomir-commits
mailing list