[Stacomir-commits] r351 - in pkg/stacomir: . R inst/config man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Apr 7 17:32:12 CEST 2017
Author: briand
Date: 2017-04-07 17:32:11 +0200 (Fri, 07 Apr 2017)
New Revision: 351
Added:
pkg/stacomir/man/BilanMigrationCar-class.Rd
pkg/stacomir/man/BilanMigrationMultConditionEnv-class.Rd
pkg/stacomir/man/bilan_adm.Rd
pkg/stacomir/man/bmC.Rd
pkg/stacomir/man/bmi_vichy.Rd
pkg/stacomir/man/calcule-BilanMigrationCar-method.Rd
pkg/stacomir/man/calcule-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/charge-BilanMigrationCar-method.Rd
pkg/stacomir/man/charge-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationCar-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/choice_c-RefChoix-method.Rd
pkg/stacomir/man/colortable.Rd
pkg/stacomir/man/connect-BilanMigrationMultConditionEnv-method.Rd
pkg/stacomir/man/fun_aggreg_for_plot.Rd
pkg/stacomir/man/hBilanMigrationMultConditionEnv.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/interface_BilanMigrationMultConditionEnv.Rd
pkg/stacomir/man/plot-BilanMigrationCar-missing-method.Rd
pkg/stacomir/man/plot-BilanMigrationMultConditionEnv-missing-method.Rd
pkg/stacomir/man/setasqualitative-BilanMigrationCar-method.Rd
pkg/stacomir/man/setasqualitative.Rd
pkg/stacomir/man/summary-BilanMigrationCar-method.Rd
pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd
Removed:
pkg/stacomir/man/BilanMigrationConditionEnv-class.Rd
pkg/stacomir/man/BilanMigrationPar-class.Rd
pkg/stacomir/man/calcule-BilanMigrationConditionEnv-method.Rd
pkg/stacomir/man/calcule-BilanMigrationPar-method.Rd
pkg/stacomir/man/fungraph_env.Rd
pkg/stacomir/man/hBilanMigrationConditionEnv.Rd
pkg/stacomir/man/hbilanMigrationConditionEnvcalc.Rd
pkg/stacomir/man/hbilanMigrationConditionEnvgraph.Rd
pkg/stacomir/man/hbilanMigrationParcalc.Rd
pkg/stacomir/man/hbilanMigrationPargraph.Rd
pkg/stacomir/man/hbilanMigrationPargraph2.Rd
pkg/stacomir/man/hbilanMigrationParstat.Rd
pkg/stacomir/man/interface_BilanMigrationConditionEnv.Rd
pkg/stacomir/man/plot-BilanMigrationPar-ANY-method.Rd
Modified:
pkg/stacomir/DESCRIPTION
pkg/stacomir/NAMESPACE
pkg/stacomir/R/BilanAgedemer.r
pkg/stacomir/R/BilanMigrationCar.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/BilanMigrationMult.r
pkg/stacomir/R/BilanMigrationMultConditionEnv.r
pkg/stacomir/R/create_generic.r
pkg/stacomir/R/data.r
pkg/stacomir/R/stacomi.r
pkg/stacomir/inst/config/generate_Roxygen2.R
pkg/stacomir/inst/config/generate_data.R
pkg/stacomir/inst/config/stacomi_manual_launch.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/BilanMigrationInterAnnuelle-class.Rd
pkg/stacomir/man/BilanMigrationMult-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/RefMsg-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/bmi.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-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/calcule-BilanMigrationMult-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-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/charge-BilanMigrationMult-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-RefMsg-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-RefMsg-method.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-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/choice_c-BilanMigrationMult-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-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/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-BilanOperation-method.Rd
pkg/stacomir/man/connect-Bilan_carlot-method.Rd
pkg/stacomir/man/connect-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/createmessage-RefMsg-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_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/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/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_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_chooselang.Rd
pkg/stacomir/man/interface_graphique.Rd
pkg/stacomir/man/messages.Rd
pkg/stacomir/man/model-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/model.Rd
pkg/stacomir/man/msg.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-BilanMigrationInterAnnuelle-missing-method.Rd
pkg/stacomir/man/plot-BilanMigrationMult-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/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-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
Log:
Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/DESCRIPTION 2017-04-07 15:32:11 UTC (rev 351)
@@ -110,5 +110,5 @@
Marion Legrand [aut],
Timothee Besse [aut]
Maintainer: Cedric Briand <cedric.briand00 at gmail.com>
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
NeedsCompilation: no
Modified: pkg/stacomir/NAMESPACE
===================================================================
--- pkg/stacomir/NAMESPACE 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/NAMESPACE 2017-04-07 15:32:11 UTC (rev 351)
@@ -1,8 +1,11 @@
# Generated by roxygen2: do not edit by hand
export(chargecsv)
+export(choice)
+export(colortable)
export(f_stade_Durif)
export(fn_EcritBilanMensuel)
+export(fun_aggreg_for_plot)
export(fun_bilanMigrationMult)
export(fun_bilanMigrationMult_Overlaps)
export(fun_char_spe)
@@ -20,7 +23,6 @@
export(hBilanEspecescalc)
export(hCamembert)
export(hTableBilanEspeces)
-export(hbilanMigrationConditionEnvcalc)
export(interface_BilanEspeces)
export(messages)
export(mygtkProgressBar)
@@ -35,9 +37,10 @@
exportClasses(BilanFonctionnementDC)
exportClasses(BilanFonctionnementDF)
exportClasses(BilanMigration)
-exportClasses(BilanMigrationConditionEnv)
+exportClasses(BilanMigrationCar)
exportClasses(BilanMigrationInterAnnuelle)
exportClasses(BilanMigrationMult)
+exportClasses(BilanMigrationMultConditionEnv)
exportClasses(BilanOperation)
exportClasses(Bilan_carlot)
exportClasses(Bilan_poids_moyen)
@@ -75,6 +78,7 @@
importFrom(grDevices,adjustcolor)
importFrom(grDevices,dev.new)
importFrom(grDevices,gray)
+importFrom(grDevices,gray.colors)
importFrom(grDevices,rainbow)
importFrom(graphics,abline)
importFrom(graphics,arrows)
Modified: pkg/stacomir/R/BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/BilanAgedemer.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/BilanAgedemer.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -352,13 +352,6 @@
#' @param silent : Default FALSE, if TRUE the program should no display messages.
#' @param dbname : the name of the database, defaults to "bd_contmig_nat"
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-#' @examples
-#' \dontrun{
-#' stacomi(gr_interface=FALSE,login_window=FALSE,database_expected=FALSE)
-#' data("bilan_adm")
-#' bilan_adm<-calcule(bilan_adm)
-#' write_database(bilanAgedemer=bilan_adm,silent=FALSE)
-#' }
#' @export
setMethod("write_database",signature=signature("BilanAgedemer"),definition=function(object,silent=TRUE,dbname="bd_contmig_nat"){
# dbname="bd_contmig_nat"
@@ -474,13 +467,14 @@
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
setMethod("supprime",signature=signature("BilanAgedemer"),
- definition=function(object)
+ definition=function(object,silent=FALSE)
{
bilan_adm<-object
data_in_base<-bilan_adm at data
data_in_base<-data_in_base[data_in_base$car_par_code=='A124',]
- if (nrow(data_in_base)==0) funout(gettext("No data to remove"),arret=TRUE)
-
+ if (nrow(data_in_base)==0) {
+ if (!silent) funout(gettext("No data to remove"),arret=TRUE)
+ }
requete=new("RequeteODBCwhere")
requete at baseODBC<-get("baseODBC",envir=envir_stacomi)
requete at select=stringr::str_c("DELETE from ",get("sch",envir=envir_stacomi),"tj_caracteristiquelot_car ")
Modified: pkg/stacomir/R/BilanMigrationCar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationCar.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/BilanMigrationCar.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -27,13 +27,13 @@
#' @slot pasDeTemps An object of class \link{PasDeTempsJournalier-class} inherited from \link{BilanMigration-class}
#' @slot data A \code{data.frame} inherited from \link{BilanMigration-class}, stores the results
#' @slot time.sequence An object of class "POSIXct" inherited from \link{BilanMigration-class}
-#' #' @family Bilan Objects
+#' @family Bilan Objects
#' @aliases BilanMigrationMult bilanMigrationMult
#' @note program : default two parameter choice, checking box "aucun" will allow the program to ignore the parameter
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-
#' @concept Bilan Object
#' @keywords classes
+#' @export
setClass(Class="BilanMigrationCar",
representation=representation(
echantillon="RefChoix",
@@ -271,6 +271,7 @@
#' @param par The code of a quantitative parameter
#' @param ... Additional parms to the cut method \link[base]{cut}
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+#' @export
setMethod("setasqualitative",signature=signature("BilanMigrationCar"),definition=function(object,par,silent=FALSE,...) {
bmC<-object
# par <-'A124'
@@ -365,12 +366,12 @@
#'
#' @param x An object of class BilanMigrationCar
#' @param y not used there
-#' @param plot.type One of "qual", "quant" "crossed"
+#' @param plot.type One of "qual", "quant" "crossed" default to qual
#' @param color A named vector for the colors of either parameters (if plot.type=quant) or levels for
#' parameters (if plot.type=qual).
#' @param ... Additional parameters
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-setMethod("plot",signature=signature(x="BilanMigrationCar",y="missing"),definition=function(x,color_parm=NULL,plot.type="barplot",...){
+setMethod("plot",signature=signature(x="BilanMigrationCar",y="missing"),definition=function(x,color_parm=NULL,plot.type="qual",...){
bmC<-x
# transformation du tableau de donnees
# color_parm<-c("age 1"="red","age 2"="blue","age 3"="green")
Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -379,8 +379,8 @@
#' calcule method for BilanMigrationInterannuelle
#'
#' @param object An object of class \code{\link{BilanMigrationInterannuelle-class}}
-#' @param
#' @param silent Boolean, if TRUE, information messages are not displayed, only warnings and errors
+#' @param timesplit One of "day","week","month","2 weeks", "jour","semaine","quinzaine","mois"
#' @note The class BilanMigration does not handle escapement rates nor
#' 'devenir' i.e. the destination of the fishes.
#' @return BilanMigration with calcdata slot filled.
@@ -389,7 +389,7 @@
bilanMigrationInterAnnuelle<-object
#bilanMigrationInterAnnuelle<-bmi_vichy;silent=FALSE;timesplit="mois"
#require(dplyr)
- if (!timesplit%in%c("jour","day","month","mois","week","semaine","month","mois","quinzaine","2 weeks")) stop (
+ if (!timesplit%in%c("jour","day","month","mois","week","semaine","quinzaine","2 weeks")) stop (
stringr::str_c("timesplit should be one of :","jour ","day ","month ","mois ","week ","semaine ","month ","mois ","quinzaine ","2 weeks "))
# back to french labels for consistency with fundat code
timesplit<-switch(timesplit,"day"="jour_365","jour"="jour_365","week"="semaine","month"="mois","2 weeks"="quinzaine",timesplit)
Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/BilanMigrationMult.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -1063,7 +1063,7 @@
#' returns a table where all components within the list calcdata are aggregated
#' and formatted for plot
-#' @param object An object of class \ref{BilanMigrationMult-class}
+#' @param object An object of class \link{BilanMigrationMult-class}
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
fun_aggreg_for_plot<-function(object){
Modified: pkg/stacomir/R/BilanMigrationMultConditionEnv.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMultConditionEnv.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/BilanMigrationMultConditionEnv.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -88,7 +88,7 @@
})
#' charge method for BilanMigrationMultConditionEnv class
#' @param object An object of class \link{BilanMigrationMultConditionEnv-class}
-#' @inheritDotParams charge,BilanConditionEnv-method -object
+#' @param silent Should the function remain silent (boolean)
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
setMethod("charge",signature=signature("BilanMigrationMultConditionEnv"),definition=function(object,silent) {
Modified: pkg/stacomir/R/create_generic.r
===================================================================
--- pkg/stacomir/R/create_generic.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/create_generic.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -3,6 +3,7 @@
#' @param object Object
#' @param ... Additional parms
#' @author cedric.briand
+#' @export
setGeneric("choice",def=function(object,...) standardGeneric("choice"))
#' Generic method for multiple choice (using the gwidget graphical interface)
#' @param object Object
@@ -26,10 +27,10 @@
setGeneric("charge_avec_filtre",def=function(object,...) standardGeneric("charge_avec_filtre"))
#setGeneric("connect",def=function(object,...) standardGeneric("connect")) # package stacomirtools
#setGeneric("plot",def=function(x,y,...) standardGeneric("plot"))
-##' Generic for prediction
-##' @param object Object
-##' @param ... Additional parms
-##' @author cedric.briand
+#' Generic for prediction
+#' @param object Object
+#' @param ... Additional parms
+#' @author cedric.briand
setGeneric("model",def=function(object,...) standardGeneric("model"))
#' Generic method to load additional data
#' @param object Object
@@ -71,19 +72,12 @@
#' @param ... Additional parms
#' @author cedric.briand
setGeneric("setasqualitative",def=function(object,...) standardGeneric("setasqualitative"))
-# nouvel environnement
-
-
-
-
#' Environment where most objects from the package are stored and then loaded
#' by the charge method
#'
#' envir_stacomi \code{envir_stacomi <- new.env(parent = baseenv())} is the
#' environment where most object created by the interface are stored
-#'
-#'
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
"envir_stacomi"
Modified: pkg/stacomir/R/data.r
===================================================================
--- pkg/stacomir/R/data.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/data.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -39,14 +39,6 @@
#' @keywords data
"msg"
-#' Working environment for stacomiR created when launching stacomi()
-#'
-#' This is where the graphical interface stores its objects
-#' try \code{ls(envir=envir_stacomi)}
-#' @keywords environment
-"envir_stacomi"
-
-
#' Video counting of thin lipped mullet (Liza ramada) in 2015 on the Vilaine (France)
#'
#' This data corresponds to the data collected at the vertical slot fishway
@@ -110,7 +102,6 @@
#' if not found will switch to the default
"calcmig"
-
#' Overview of the fishway operation at Arzal in (Vilaine France).
#'
#' This data corresponds to the data collected at the vertical slot fishway
@@ -212,10 +203,11 @@
#'
#' 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
-#' operational at the same location and provides one of the longest series of eel migration. For this reason,
+#' operational at the same location and provides one of the longest series of eel migration.
+#' For this reason,
#' the dataset has been loaded as an example for the BilanMigrationInterAnnuelle-class. It has been
#' kindly given by the parc du Marais Poitevin.
-#' @format An object of class \ref{BilanMigrationInterAnnuelle-class} with data loaded.
+#' @format An object of class \link{BilanMigrationInterAnnuelle-class} with data loaded.
#' @keywords data
"bmi"
@@ -343,3 +335,6 @@
"bilan_adm"
+#' BLABLABLABLA
+#' @keywords data
+"bmC"
\ No newline at end of file
Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/R/stacomi.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -333,9 +333,9 @@
#' @export
stacomi=function(gr_interface=TRUE,login_window=TRUE,database_expected=TRUE){
# first loading of connection and odbc info using chargexml()
+ # trois variables passees a interface graphique via envir_stacomi :
envir_stacomi <- new.env(parent = emptyenv())
assign("envir_stacomi",envir_stacomi,.GlobalEnv)
- # trois variables passees a interface graphique via envir_stacomi :
assign("gr_interface",gr_interface,envir=envir_stacomi)
assign("database_expected",database_expected,envir=envir_stacomi)
assign("login_window",login_window,envir=envir_stacomi)
@@ -527,3 +527,26 @@
# reoxygenize fails if data are not loaded
#setwd("F:/workspace/stacomir/branch0.5/stacomir")
#data("bMM_Arzal")
+#' Working environment for stacomiR created when launching stacomi()
+#'
+#' This is where the graphical interface stores its objects
+#' try \code{ls(envir=envir_stacomi)}
+#' @keywords environment
+"envir_stacomi"
+
+## using dput
+#calcmig<-
+# structure(list(lienODBC = structure(1L, .Label = "bd_contmig_nat", class = "factor"),
+# uid = structure(1L, .Label = "iav", class = "factor"), pwd = structure(1L, .Label = "iav", class = "factor"),
+# sqldf.uid = structure(1L, .Label = "test", class = "factor"),
+# sqldf.pwd = structure(1L, .Label = "test", class = "factor"),
+# sqldf.dbname = structure(1L, .Label = "test", class = "factor"),
+# sqldf.host = structure(1L, .Label = "localhost", class = "factor"),
+# sqldf.port = 5432L, pgwd = structure(1L, .Label = "F:/workspace/stacomir/pkg/stacomir/R/", class = "factor"),
+# datawd = structure(1L, .Label = "~/CalcmigData", class = "factor"),
+# lang = structure(1L, .Label = "French", class = "factor")), .Names = c("lienODBC",
+# "uid", "pwd", "sqldf.uid", "sqldf.pwd", "sqldf.dbname", "sqldf.host",
+# "sqldf.port", "pgwd", "datawd", "lang"), class = "data.frame", row.names = c(NA,
+# -1L))
+#envir_stacomi <- new.env(parent = emptyenv())
+#calcmig<-data.frame()
\ No newline at end of file
Modified: pkg/stacomir/inst/config/generate_Roxygen2.R
===================================================================
--- pkg/stacomir/inst/config/generate_Roxygen2.R 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/inst/config/generate_Roxygen2.R 2017-04-07 15:32:11 UTC (rev 351)
@@ -22,8 +22,10 @@
#######################
# devtools::install_version(package = 'roxygen2',version = '5.0.1', repos = c(CRAN = "https://cran.rstudio.com"))
##use either :
-#require(devtools)
-#document("F:/workspace/stacomir/pkg/stacomir")
+require(devtools)
+ envir_stacomi <- new.env(parent = emptyenv())
+ data("calcmig")
+document("F:/workspace/stacomir/pkg/stacomir")
## or :
##vignette("roxygen2")
setwd("F:/workspace/stacomir/pkg/stacomir")
@@ -37,4 +39,4 @@
require(roxygen2)
roxygen2::roxygenise("F:/workspace/stacomir/pkg/stacomir");warnings()[1:10]
-roxygen2::roxygenise("F:/workspace/stacomir/pkg/stacomir",roclets=c("Bilan_carlot"))
+
Modified: pkg/stacomir/inst/config/generate_data.R
===================================================================
--- pkg/stacomir/inst/config/generate_data.R 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/inst/config/generate_data.R 2017-04-07 15:32:11 UTC (rev 351)
@@ -62,9 +62,9 @@
sch<-get("sch",envir=envir_stacomi) # "iav."
assign("sch","iav.",envir_stacomi)
bMM_Arzal=choice_c(bMM_Arzal,
-dc=c(5,6,12),
-taxons=c("Anguilla anguilla"),
-stades=c("AGG","AGJ","CIV"),datedebut="2011-01-01",datefin="2011-12-31")
+ dc=c(5,6,12),
+ taxons=c("Anguilla anguilla"),
+ stades=c("AGG","AGJ","CIV"),datedebut="2011-01-01",datefin="2011-12-31")
bMM_Arzal<-charge(bMM_Arzal)
bMM_Arzal<-connect(bMM_Arzal,silent=FALSE)
# to avoid warnings at package checks
@@ -507,4 +507,37 @@
silent=FALSE)
bil_CE<-connect(bil_CE)
bil_CE at stationMesure@data$stm_description<-iconv(bil_CE at stationMesure@data$stm_description,from="latin1",to="UTF8")
-devtools::use_data(bil_CE,internal=FALSE,overwrite=TRUE)
\ No newline at end of file
+devtools::use_data(bil_CE,internal=FALSE,overwrite=TRUE)
+
+#################################
+# generates dataset for bilanMigrationCar
+##################################
+setwd("F:/workspace/stacomir/pkg/stacomir")
+require(stacomiR)
+stacomi(gr_interface=FALSE,
+ login_window=FALSE,
+ database_expected=FALSE)
+bmC<-new("BilanMigrationCar")
+baseODBC<-get("baseODBC",envir=envir_stacomi)
+baseODBC[c(2,3)]<-rep("logrami",2)
+assign("baseODBC",baseODBC,envir_stacomi)
+sch<-get("sch",envir=envir_stacomi)
+assign("sch","logrami.",envir_stacomi)
+# here parqual is not in the list
+# so this is equivalent to parqual=NULL
+bmC<-choice_c(bmC,
+ dc=c(107,108,101),
+ taxons=c("Salmo salar"),
+ stades=c('5','11','BEC','BER','IND'),
+ parquan=c('A124','C001','1786','1785'),
+ horodatedebut="2012-01-01",
+ horodatefin="2012-12-31",
+ silent=FALSE)
+# bmC<-charge(bmC) not necessary there
+bmC<-connect(bmC)
+bmC at dc@data[,"ouv_libelle"]<-iconv(bmC at dc@data[,"ouv_libelle"],from="latin1",to="UTF8")
+bmC at dc@data[,"dis_commentaires"]<-iconv(bmC at dc@data[,"dis_commentaires"],from="latin1",to="UTF8")
+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
Modified: pkg/stacomir/inst/config/stacomi_manual_launch.r
===================================================================
--- pkg/stacomir/inst/config/stacomi_manual_launch.r 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/inst/config/stacomi_manual_launch.r 2017-04-07 15:32:11 UTC (rev 351)
@@ -1,7 +1,8 @@
rm(list=ls(all=TRUE))
+envir_stacomi <- new.env(parent = emptyenv())
+assign("envir_stacomi",envir_stacomi,.GlobalEnv)
-
## lancement du programme proprement dit
# if (exists("group")) {rm(group)}
# if (exists("graphes")) {rm(graphes) }
Modified: pkg/stacomir/man/BilanAgedemer-class.Rd
===================================================================
--- pkg/stacomir/man/BilanAgedemer-class.Rd 2017-04-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanAgedemer-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -2,16 +2,16 @@
% Please edit documentation in R/BilanAgedemer.r
\docType{class}
\name{BilanAgedemer-class}
-\alias{BilanAgeDeMer}
+\alias{BilanAgedemer-class}
\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
+the BilanAgedemer class is used to dispatch adult salmons to age class according to
their size and to basin dependent limits set by the user. Once checked with graphs and summary
statistics, the results are to be written to the database.
}
@@ -28,7 +28,7 @@
\item{\code{dc}}{Object of class \link{RefDC-class}: the control devices}
-\item{\code{taxons}}{Object of class \link{RefTaxon-class}: the speciess}
+\item{\code{taxons}}{Object of class \link{RefTaxon-class}: the species}
\item{\code{stades}}{Object of class \link{RefStades-class} : the stages of the fish}
@@ -40,8 +40,9 @@
\item{\code{limit1hm}}{The size limit, in mm between 1 sea winter fishes and 2 sea winter fishes}
-\item{\code{limit2hm}}{The size limit, in mm between 3 sea winter fishes and 3 sea winter fishes}
+\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
}
@@ -49,14 +50,12 @@
Objects can be created by calls of the form
\code{new("BilanAgedemer", ...)}
}
+
\examples{
require(stacomiR)
-# launching stacomi without selecting the scheme or interface
stacomi(gr_interface=FALSE,
login_window=FALSE,
database_expected=FALSE)
-# the following script will load data from the two Anguillere monitored in the Somme
-
\dontrun{
#create an instance of the class
bilan_adm<-new("BilanAgedemer")
@@ -77,6 +76,7 @@
}
# load the dataset generated by previous lines
+# Salmons from the loire on two dams
data("bilan_adm")
# the calculation will fill the slot calcdata
bilan_adm<-calcule(bilan_adm)
@@ -86,12 +86,14 @@
# plot data to confirm the split by limits is correct
plot(bilan_adm, plot.type=1)
+# if there are several dc, data it split by dc
+plot(bilan_adm, plot.type=2)
+
# print a summary statistic, and save the output in a list for later use
stats<-summary(bilan_adm)
+
+write_database(bilan_adm)
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\seealso{
Other Bilan Objects: \code{\link{BilanAnnuels-class}},
\code{\link{BilanArgentee-class}},
@@ -100,11 +102,14 @@
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanAnnuels-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -23,6 +23,7 @@
\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
@@ -91,9 +92,6 @@
}
plot(bilAM)
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\seealso{
Other Bilan Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanArgentee-class}},
@@ -102,11 +100,14 @@
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanArgentee-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -34,6 +34,7 @@
\item{\code{horodatefin}}{An object of class \code{RefHorodate-class}}
}}
+
\note{
This class is displayed by interface_bilanArgentee
}
@@ -41,6 +42,7 @@
Objects can be created by calls of the form
\code{new("BilanArgentee", ...)}
}
+
\examples{
require(stacomiR)
# launching stacomi without selecting the scheme or interface
@@ -91,9 +93,6 @@
# 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}},
\code{\link{BilanAnnuels-class}},
@@ -102,11 +101,14 @@
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanConditionEnv-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -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...}
@@ -14,22 +14,15 @@
\section{Slots}{
\describe{
-\item{\code{horodate}}{\link{RefHorodate-class}}
+\item{\code{horodatedebut}}{\link{RefHorodate-class}}
+\item{\code{horodatefin}}{\link{RefHorodate-class}}
+
\item{\code{stationMesure}}{\link{RefStationMesure-class}}
\item{\code{data}}{\code{data.frame}}
-
-\item{\code{datedebut}}{A \link[base]{-.POSIXt} value}
-
-\item{\code{datefin}}{A \link[base]{-.POSIXt} value}
}}
-\section{Objects from the Class}{
- Objects can be created by calls of the form
-\code{new("BilanConditionEnv", horodate=new("Horodate"),
-stationMesure=new("RefStationMesure"), data=data.frame(),
-requete=new("RequeteODBCwheredate"))}.
-}
+
\examples{
require(stacomiR)
stacomi(gr_interface=FALSE,
@@ -49,9 +42,6 @@
data("bil_CE")
plot(bil_CE,silent=TRUE)
}
-\author{
-cedric.briand"at"eptb-vilaine.fr
-}
\seealso{
Other Bilan Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
@@ -60,11 +50,14 @@
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanEspeces-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -26,13 +26,12 @@
\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}},
@@ -53,11 +52,14 @@
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanFonctionnementDC-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -21,10 +21,12 @@
\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,
@@ -61,9 +63,6 @@
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\seealso{
Other Bilan Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
@@ -72,11 +71,14 @@
\code{\link{BilanEspeces-class}},
\code{\link{BilanFonctionnementDF-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanFonctionnementDF-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -24,10 +24,12 @@
\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,
@@ -63,9 +65,6 @@
}
-\author{
-Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
-}
\seealso{
Other Bilan Objects: \code{\link{BilanAgedemer-class}},
\code{\link{BilanAnnuels-class}},
@@ -74,11 +73,14 @@
\code{\link{BilanEspeces-class}},
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanMigration-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\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-07 13:51:39 UTC (rev 350)
+++ pkg/stacomir/man/BilanMigration-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -2,8 +2,8 @@
% Please edit documentation in R/BilanMigration.r
\docType{class}
\name{BilanMigration-class}
+\alias{BilanMigration-class}
\alias{BilanMigration}
-\alias{BilanMigration-class}
\alias{bilanMigration}
\title{Migration report for one DC, one species and one stage}
\description{
@@ -30,6 +30,7 @@
\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.
@@ -93,9 +94,6 @@
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}},
\code{\link{BilanAnnuels-class}},
@@ -104,11 +102,14 @@
\code{\link{BilanEspeces-class}},
\code{\link{BilanFonctionnementDC-class}},
\code{\link{BilanFonctionnementDF-class}},
- \code{\link{BilanMigrationConditionEnv-class}},
+ \code{\link{BilanMigrationCar-class}},
\code{\link{BilanMigrationInterAnnuelle-class}},
\code{\link{BilanMigrationMult-class}},
+ \code{\link{BilanMigrationMultConditionEnv-class}},
\code{\link{Bilan_carlot-class}},
\code{\link{Bilan_poids_moyen-class}}
}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
\keyword{classes}
-
Added: pkg/stacomir/man/BilanMigrationCar-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationCar-class.Rd (rev 0)
+++ pkg/stacomir/man/BilanMigrationCar-class.Rd 2017-04-07 15:32:11 UTC (rev 351)
@@ -0,0 +1,75 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/BilanMigrationCar.r
+\docType{class}
+\name{BilanMigrationCar-class}
+\alias{BilanMigrationCar-class}
+\alias{BilanMigrationMult}
+\alias{bilanMigrationMult}
+\title{Migration report along with quantitative and
+qualitative characteristics}
+\description{
+Migration along with qualitative or quantitative characteristics or both
+(e.g.) weight of eels according to the size class per period of time, weight
+of fish according to gender, number of fish per age class. This class does not split migration evenly over
+time period. So, unlike calculations made in class BilanMigration and BilanMigrationMult
+the whole time span of the migration operation is not considered, only the date of beginning of
+the operation is used to perform calculation.
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 351
More information about the Stacomir-commits
mailing list