[Stacomir-commits] r164 - in pkg/stacomir: . R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Aug 19 21:56:14 CEST 2016
Author: briand
Date: 2016-08-19 21:56:13 +0200 (Fri, 19 Aug 2016)
New Revision: 164
Added:
pkg/stacomir/R/BilanMigrationMult.r
pkg/stacomir/R/Bilan_carlot.r
pkg/stacomir/R/data.r
pkg/stacomir/R/interface_BilanMigrationMult.r
pkg/stacomir/R/stacomi.r
pkg/stacomir/data/
pkg/stacomir/examples/
pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd
pkg/stacomir/man/BilanMigrationMult-class.Rd
pkg/stacomir/man/Bilan_carlot-class.Rd
pkg/stacomir/man/RefPoidsMoyenPeche-class.Rd
pkg/stacomir/man/bMM_Arzal.Rd
pkg/stacomir/man/calcule-BilanMigration-method.Rd
pkg/stacomir/man/calcule-BilanMigrationMult-method.Rd
pkg/stacomir/man/calcule-BilanMigrationPar-method.Rd
pkg/stacomir/man/calcule-Bilan_carlot-method.Rd
pkg/stacomir/man/calcule-Bilan_taille-method.Rd
pkg/stacomir/man/ceil.POSIXt.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-BilanMigrationMult-method.Rd
pkg/stacomir/man/charge-Bilan_carlot-method.Rd
pkg/stacomir/man/charge-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/charge-Bilan_stades_pigm-method.Rd
pkg/stacomir/man/charge-Bilan_taille-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_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_complement-Refparqual-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_c-BilanMigrationMult-method.Rd
pkg/stacomir/man/choice_c-PasDeTempsJournalier-method.Rd
pkg/stacomir/man/choice_c-RefDC-method.Rd
pkg/stacomir/man/choice_c-RefStades-method.Rd
pkg/stacomir/man/choice_c-RefTaxon-method.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/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-BilanMigrationInterAnnuelle-method.Rd
pkg/stacomir/man/connect-BilanMigrationMult-method.Rd
pkg/stacomir/man/connect-Bilan_carlot-method.Rd
pkg/stacomir/man/connect-Bilan_poids_moyen-method.Rd
pkg/stacomir/man/connect-Bilan_stades_pigm-method.Rd
pkg/stacomir/man/connect-Bilan_taille-method.Rd
pkg/stacomir/man/createmessage-RefMsg-method.Rd
pkg/stacomir/man/cumplot-BilanMigrationMult-method.Rd
pkg/stacomir/man/fn_EcritBilanJournalier.Rd
pkg/stacomir/man/fntablestade.Rd
pkg/stacomir/man/fun50.Rd
pkg/stacomir/man/funSousListeBilanMigration.Rd
pkg/stacomir/man/funSousListeBilanMigrationPar.Rd
pkg/stacomir/man/fun_bilanMigrationMult.Rd
pkg/stacomir/man/fun_bilanMigrationMult_Overlaps.Rd
pkg/stacomir/man/fun_weight_conversion.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/fundensityBilan_carlot.Rd
pkg/stacomir/man/fundist.Rd
pkg/stacomir/man/fungraphInteract_tail.Rd
pkg/stacomir/man/fungraphgg.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/funtableBilan_carlot.Rd
pkg/stacomir/man/funtableBilan_tail.Rd
pkg/stacomir/man/funtableDC.Rd
pkg/stacomir/man/funtableDF.Rd
pkg/stacomir/man/funtraitement_poids.Rd
pkg/stacomir/man/getvalue-Refperiode-method.Rd
pkg/stacomir/man/hBilanConditionEnv.Rd
pkg/stacomir/man/hBilanEspeces.Rd
pkg/stacomir/man/hBilanEspecescalc.Rd
pkg/stacomir/man/hBilanLots.Rd
pkg/stacomir/man/hBilanMigration.Rd
pkg/stacomir/man/hBilanMigrationConditionEnv.Rd
pkg/stacomir/man/hBilanMigrationInterAnnuelle.Rd
pkg/stacomir/man/hBilanMigrationMult.Rd
pkg/stacomir/man/hBilanMigrationPar.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/hbilanConditionEnvgraph.Rd
pkg/stacomir/man/hbilanMigrationConditionEnvcalc.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/hbilanMigrationParcalc.Rd
pkg/stacomir/man/hbilanMigrationPargraph.Rd
pkg/stacomir/man/hbilanMigrationPargraph2.Rd
pkg/stacomir/man/hbilanMigrationParstat.Rd
pkg/stacomir/man/hbilanMigrationcalc.Rd
pkg/stacomir/man/hbilanMigrationgraph.Rd
pkg/stacomir/man/hbilanMigrationgraph2.Rd
pkg/stacomir/man/hfungraphstades.Rd
pkg/stacomir/man/houtBilanMigrationMult.Rd
pkg/stacomir/man/hpds.Rd
pkg/stacomir/man/htodo.Rd
pkg/stacomir/man/husr.Rd
pkg/stacomir/man/initialize-BilanMigrationMult-method.Rd
pkg/stacomir/man/interface_BilanEspeces.Rd
pkg/stacomir/man/interface_BilanFonctionnementDC.Rd
pkg/stacomir/man/interface_BilanFonctionnementDF.Rd
pkg/stacomir/man/interface_BilanLot.Rd
pkg/stacomir/man/interface_BilanMigration.Rd
pkg/stacomir/man/interface_BilanMigrationConditionEnv.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_stades_pigm.Rd
pkg/stacomir/man/interface_ConditionEnv.Rd
pkg/stacomir/man/interface_chooselang.Rd
pkg/stacomir/man/plot-BilanMigrationMult-ANY-method.Rd
pkg/stacomir/man/plot-BilanMigrationPar-ANY-method.Rd
pkg/stacomir/man/plot1-BilanMigrationMult-method.Rd
pkg/stacomir/man/print-BilanMigrationMult-method.Rd
pkg/stacomir/man/round.POSIXt.Rd
pkg/stacomir/man/setRefHorodate-RefHorodate-method.Rd
pkg/stacomir/man/stacomi.Rd
pkg/stacomir/man/summary-BilanMigrationMult-method.Rd
pkg/stacomir/man/surface.Rd
pkg/stacomir/man/validite_RefHorodate.Rd
Removed:
pkg/stacomir/R/Bilan_lot.r
pkg/stacomir/R/interface_graphique.r
pkg/stacomir/R/libraries.r
pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd
pkg/stacomir/man/Bilan_lot-class.Rd
pkg/stacomir/man/RefPoidsMoyenPeche-class.Rd
pkg/stacomir/man/calcule-methods.Rd
pkg/stacomir/man/charge-methods.Rd
pkg/stacomir/man/charge_avec_filtre-methods.Rd
pkg/stacomir/man/connect-methods.Rd
pkg/stacomir/man/fn_EcritBilanJournalier.Rd
pkg/stacomir/man/fun50.Rd
pkg/stacomir/man/funSousListeBilanMigration.Rd
pkg/stacomir/man/funSousListeBilanMigrationPar.Rd
pkg/stacomir/man/fundist.Rd
pkg/stacomir/man/handler_graph_functions.Rd
pkg/stacomir/man/handler_interfacegraphique.Rd
pkg/stacomir/man/handler_mainlaunch_functions.Rd
pkg/stacomir/man/handler_tabledisplay_functions.Rd
pkg/stacomir/man/interface_functions.Rd
pkg/stacomir/man/libraries.Rd
pkg/stacomir/man/stacomi.Rd
pkg/stacomir/man/supprime-methods.Rd
pkg/stacomir/man/surface.Rd
Modified:
pkg/stacomir/DESCRIPTION
pkg/stacomir/NAMESPACE
pkg/stacomir/R/BilanConditionEnv.r
pkg/stacomir/R/BilanEspeces.r
pkg/stacomir/R/BilanFonctionnementDC.r
pkg/stacomir/R/BilanFonctionnementDF.r
pkg/stacomir/R/BilanMigration.r
pkg/stacomir/R/BilanMigrationConditionEnv.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/BilanMigrationPar.r
pkg/stacomir/R/Bilan_poids_moyen.r
pkg/stacomir/R/Bilan_stades_pigm.r
pkg/stacomir/R/Bilan_taille.r
pkg/stacomir/R/PasDeTempsJournalier.r
pkg/stacomir/R/PasdeTemps.r
pkg/stacomir/R/RefAnnee.r
pkg/stacomir/R/RefCheckBox.r
pkg/stacomir/R/RefChoix.r
pkg/stacomir/R/RefCoe.r
pkg/stacomir/R/RefDC.r
pkg/stacomir/R/RefDF.r
pkg/stacomir/R/RefHorodate.r
pkg/stacomir/R/RefListe.r
pkg/stacomir/R/RefMsg.r
pkg/stacomir/R/RefPoidsMoyenPeche.r
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefStationMesure.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/Refpar.r
pkg/stacomir/R/Refparqual.r
pkg/stacomir/R/Refparquan.r
pkg/stacomir/R/Refperiode.r
pkg/stacomir/R/ReftextBox.r
pkg/stacomir/R/create_generic.r
pkg/stacomir/R/fn_EcritBilanJournalier.r
pkg/stacomir/R/fn_EcritBilanMensuel.r
pkg/stacomir/R/fn_sql_dis.r
pkg/stacomir/R/fn_table_per_dis.r
pkg/stacomir/R/funBilanMigrationAnnuel.r
pkg/stacomir/R/funSousListeBilanMigration.r
pkg/stacomir/R/funSousListeBilanMigrationPar.r
pkg/stacomir/R/fungraph.r
pkg/stacomir/R/fungraph_civelle.r
pkg/stacomir/R/fungraph_env.r
pkg/stacomir/R/funstat.r
pkg/stacomir/R/funstatJournalier.r
pkg/stacomir/R/funtable.r
pkg/stacomir/R/funtraitement_poids.r
pkg/stacomir/R/funtraitementdate.r
pkg/stacomir/R/interface_BilanConditionEnv.r
pkg/stacomir/R/interface_BilanFonctionnementDC.r
pkg/stacomir/R/interface_BilanFonctionnementDF.r
pkg/stacomir/R/interface_BilanMigration.r
pkg/stacomir/R/interface_BilanMigrationConditionEnv.r
pkg/stacomir/R/interface_BilanMigrationInterannuelle.r
pkg/stacomir/R/interface_BilanMigrationPar.r
pkg/stacomir/R/interface_Bilan_lot.r
pkg/stacomir/R/interface_Bilan_taille.r
pkg/stacomir/R/interface_bilan_poids_moyen.r
pkg/stacomir/R/interface_chooselang.r
pkg/stacomir/R/messages.r
pkg/stacomir/R/utilitaires.r
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/BilanMigrationConditionEnv-class.Rd
pkg/stacomir/man/BilanMigrationPar-class.Rd
pkg/stacomir/man/Bilan_poids_moyen-class.Rd
pkg/stacomir/man/Bilan_stades_pigm-class.Rd
pkg/stacomir/man/Bilan_taille-class.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/chargecomplement-methods.Rd
pkg/stacomir/man/chargecsv.Rd
pkg/stacomir/man/choix-methods.Rd
pkg/stacomir/man/envir_stacomi.Rd
pkg/stacomir/man/fn_EcritBilanMensuel.Rd
pkg/stacomir/man/fn_sql_dis.Rd
pkg/stacomir/man/fn_table_per_dis.Rd
pkg/stacomir/man/fnstade.Rd
pkg/stacomir/man/funBilanMigrationAnnuel.Rd
pkg/stacomir/man/fun_char_spe.Rd
pkg/stacomir/man/funcalcbilan_stades_pigm.Rd
pkg/stacomir/man/fundat.Rd
pkg/stacomir/man/fungraph.Rd
pkg/stacomir/man/fungraphBilan_poids_moyen.Rd
pkg/stacomir/man/fungraph_civelle.Rd
pkg/stacomir/man/fungraph_env.Rd
pkg/stacomir/man/fungraphstades.Rd
pkg/stacomir/man/funout.Rd
pkg/stacomir/man/funphi.Rd
pkg/stacomir/man/funtitle_bilan_stades_pigm.Rd
pkg/stacomir/man/funtraitementdate.Rd
pkg/stacomir/man/getvalue-methods.Rd
pkg/stacomir/man/graphdate.Rd
pkg/stacomir/man/graphe-methods.Rd
pkg/stacomir/man/interface_graphique.Rd
pkg/stacomir/man/messages.Rd
pkg/stacomir/man/monthDays.Rd
pkg/stacomir/man/quitte.Rd
pkg/stacomir/man/trunc.POSIXt.Rd
pkg/stacomir/man/validite_Annee.Rd
pkg/stacomir/man/vector_to_listsql.Rd
Log:
Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION 2016-08-19 19:54:53 UTC (rev 163)
+++ pkg/stacomir/DESCRIPTION 2016-08-19 19:56:13 UTC (rev 164)
@@ -1,95 +1,105 @@
Package: stacomiR
-Type: Package
+Version: 0.5.0
+Date: 2016-09-01
Title: STACOMI migration control
-Version: 0.4.1
-Date: 2013-01-18
-Author: Cedric Briand <cedric.briand00 at gmail.com>
-Maintainer: Cedric Briand <cedric.briand00 at gmail.com>
-Description: Graphical outputs and treatment for a database of fishway monitoring.
- It is a part of the STACOMI project developed in France by the ONEMA institute to centralize data obtained by fishway monitoring.
- Version 0.4.1 is available in French English and Spanish. \url{http://w3.eptb-vilaine.fr:8080/tracstacomi}
-License: GPL
+Authors at R: c(person("Cedric", "Briand", role = c("aut", "cre"), email = "cedric.briand at eptb-vilaine.fr"),
+ person("Marion", "Legrand", role = "aut", email="tableau-salt-loire at logrami.fr"))
+Description: Graphical outputs and treatment for a database of fishway
+ monitoring. It is a part of the STACOMI project developed in France by the ONEMA
+ institute to centralize data obtained by fishway monitoring. Version 0.4.1 is
+ available in French English and Spanish.
+License: GPL (>= 2)
Collate:
'utilitaires.r'
- 'libraries.r'
'create_generic.r'
- 'messages.r'
+ 'RefStationMesure.r'
+ 'RefHorodate.r'
+ 'BilanConditionEnv.r'
+ 'RefListe.r'
'RefDC.r'
+ 'BilanEspeces.r'
+ 'BilanFonctionnementDC.r'
'RefDF.r'
- 'RefTaxon.r'
- 'RefStades.r'
+ 'BilanFonctionnementDF.r'
'PasdeTemps.r'
'PasDeTempsJournalier.r'
- 'RefHorodate.r'
+ 'RefStades.r'
+ 'RefTaxon.r'
+ 'BilanMigration.r'
+ 'BilanMigrationConditionEnv.r'
+ 'RefAnnee.r'
+ 'BilanMigrationInterAnnuelle.r'
+ 'BilanMigrationMult.r'
+ 'RefChoix.r'
'Refpar.r'
+ 'Refparqual.r'
'Refparquan.r'
- 'Refparqual.r'
- 'RefAnnee.r'
- 'Refperiode.r'
+ 'BilanMigrationPar.r'
+ 'Bilan_carlot.r'
'RefCoe.r'
- 'RefListe.r'
- 'RefChoix.r'
+ 'Bilan_poids_moyen.r'
'ReftextBox.r'
'RefCheckBox.r'
- 'RefPoidsMoyenPeche.r'
- 'RefStationMesure.r'
- 'RefMsg.r'
- 'BilanFonctionnementDC.r'
- 'BilanFonctionnementDF.r'
- 'BilanMigration.r'
- 'BilanMigrationInterAnnuelle.r'
- 'BilanConditionEnv.r'
- 'BilanMigrationConditionEnv.r'
- 'BilanMigrationPar.r'
'Bilan_stades_pigm.r'
- 'Bilan_lot.r'
'Bilan_taille.r'
- 'Bilan_poids_moyen.r'
- 'BilanEspeces.r'
+ 'RefMsg.r'
+ 'RefPoidsMoyenPeche.r'
+ 'Refperiode.r'
+ 'data.r'
+ 'fn_EcritBilanJournalier.r'
'fn_EcritBilanMensuel.r'
- 'fn_EcritBilanJournalier.r'
+ 'fn_sql_dis.r'
'fn_table_per_dis.r'
- 'fn_sql_dis.r'
+ 'funBilanMigrationAnnuel.r'
'funSousListeBilanMigration.r'
'funSousListeBilanMigrationPar.r'
- 'funBilanMigrationAnnuel.r'
- 'funtraitement_poids.r'
+ 'fungraph.r'
'fungraph_civelle.r'
- 'fungraph.r'
'fungraph_env.r'
'funstat.r'
+ 'funstatJournalier.r'
'funtable.r'
- 'funstatJournalier.r'
+ 'funtraitement_poids.r'
'funtraitementdate.r'
- 'interface_Bilan_lot.r'
- 'interface_bilan_poids_moyen.r'
- 'interface_Bilan_taille.r'
'interface_BilanConditionEnv.r'
'interface_BilanFonctionnementDC.r'
'interface_BilanFonctionnementDF.r'
'interface_BilanMigration.r'
'interface_BilanMigrationConditionEnv.r'
'interface_BilanMigrationInterannuelle.r'
+ 'interface_BilanMigrationMult.r'
'interface_BilanMigrationPar.r'
- 'interface_graphique.r'
+ 'interface_Bilan_lot.r'
+ 'interface_Bilan_taille.r'
+ 'interface_bilan_poids_moyen.r'
'interface_chooselang.r'
+ 'messages.r'
'setAs.r'
+ 'stacomi.r'
LazyLoad: yes
+LazyData: true
Depends:
+ R (>= 3.0.0),
methods,
- Hmisc,
- RODBC,
- ggplot2,
+ stacomirtools,
+ RODBC
+Imports:
+ intervals,
+ RColorBrewer,
+ stringr,
gWidgets,
gWidgetsRGtk2,
- R2HTML,
+ RPostgreSQL,
+ ggplot2,
+ reshape2,
+ sqldf,
+ graphics,
+ utils,
+ stats,
lattice,
- RColorBrewer,
- xtable,
- stacomirtools,
- stringr,
- reshape2,
- cluster,
- scales,
- grid,
- lubridate
\ No newline at end of file
+ grDevices
+Author: Cedric Briand [aut, cre],
+ Marion Legrand [aut]
+Maintainer: Cedric Briand <cedric.briand00 at gmail.com>
+RoxygenNote: 5.0.1
+NeedsCompilation: no
Modified: pkg/stacomir/NAMESPACE
===================================================================
--- pkg/stacomir/NAMESPACE 2016-08-19 19:54:53 UTC (rev 163)
+++ pkg/stacomir/NAMESPACE 2016-08-19 19:56:13 UTC (rev 164)
@@ -1,61 +1,104 @@
-exportPattern("^[[:alpha:]]+")
-exportMethods(
- "calcule",
- "charge",
- "charge_avec_filtre",
- "chargecomplement",
- "choix",
- "coerce",
- "connect",
- "currentDateDebut",
- "currentDateFin",
- "DateFin",
- "getanneeprec",
- "getAnnees",
- "getdateDebut",
- "getLibellesPas",
- "getnoPasCourant",
- "getRefHorodate",
- "getvalue",
- "graphe",
- "setdateDebut",
- "setRefHorodate",
- "suivant",
- "supprime"
-)
-exportClasses(
- "Bilan_lot",
- "Bilan_poids_moyen",
- "Bilan_stades_pigm",
- "Bilan_taille",
- "BilanConditionEnv",
- "BilanEspeces",
- "BilanFonctionnementDC",
- "BilanFonctionnementDF",
- "BilanMigration",
- "BilanMigrationConditionEnv",
- "BilanMigrationInterAnnuelle",
- "BilanMigrationPar",
- "PasDeTemps",
- "PasDeTempsChar",
- "PasDeTempsJournalier",
- "RefAnnee",
- "RefCheckBox",
- "RefChoix",
- "RefCoe",
- "RefDC",
- "RefDF",
- "RefHorodate",
- "RefListe",
- "Refpar",
- "Refparqual",
- "Refparquan",
- "Refperiode",
- "RefPoidsMoyenPeche",
- "RefStades",
- "RefStationMesure",
- "RefTaxon",
- "RefTextBox"
-)
-S3method(trunc, POSIXt)
-S3method(round, POSIXt)
\ No newline at end of file
+# Generated by roxygen2: do not edit by hand
+
+export(fun_bilanMigrationMult)
+export(fun_bilanMigrationMult_Overlaps)
+export(fun_weight_conversion)
+export(funbarchartDC)
+export(funbarchartDF)
+export(funboxDC)
+export(funboxDF)
+export(funboxplotBilan_carlot)
+export(fundensityBilan_carlot)
+export(funpointBilan_carlot)
+export(funstat)
+export(funstatJournalier)
+export(funtable)
+export(funtableBilan_carlot)
+export(funtableDC)
+export(funtableDF)
+export(funtraitement_poids)
+export(hBilanEspecescalc)
+export(hCamembert)
+export(hTableBilanEspeces)
+export(hbilanConditionEnvgraph)
+export(hbilanMigrationConditionEnvcalc)
+export(interface_BilanEspeces)
+export(stacomi)
+exportClasses(BilanConditionEnv)
+exportClasses(BilanEspeces)
+exportClasses(BilanFonctionnementDC)
+exportClasses(BilanFonctionnementDF)
+exportClasses(BilanMigration)
+exportClasses(BilanMigrationConditionEnv)
+exportClasses(BilanMigrationInterAnnuelle)
+exportClasses(BilanMigrationMult)
+exportClasses(Bilan_carlot)
+exportClasses(Bilan_poids_moyen)
+exportClasses(Bilan_stades_pigm)
+exportClasses(Bilan_taille)
+exportMethods(calcule)
+exportMethods(charge)
+exportMethods(charge_avec_filtre)
+exportMethods(choice_c)
+exportMethods(connect)
+exportMethods(createmessage)
+exportMethods(cumplot)
+exportMethods(plot1)
+exportMethods(print)
+exportMethods(setRefHorodate)
+exportMethods(summary)
+import(RColorBrewer)
+import(RPostgreSQL)
+import(gWidgets)
+import(gWidgetsRGtk2)
+import(ggplot2)
+import(methods)
+import(sqldf)
+import(stacomirtools)
+import(stringr)
+importFrom(RODBC,odbcClose)
+importFrom(grDevices,X11)
+importFrom(grDevices,gray)
+importFrom(grDevices,rainbow)
+importFrom(graphics,axis)
+importFrom(graphics,axis.Date)
+importFrom(graphics,layout)
+importFrom(graphics,legend)
+importFrom(graphics,matplot)
+importFrom(graphics,mtext)
+importFrom(graphics,par)
+importFrom(graphics,points)
+importFrom(graphics,polygon)
+importFrom(graphics,rect)
+importFrom(graphics,segments)
+importFrom(graphics,text)
+importFrom(grid,gpar)
+importFrom(grid,grid.layout)
+importFrom(grid,grid.newpage)
+importFrom(grid,pushViewport)
+importFrom(grid,viewport)
+importFrom(intervals,"closed<-")
+importFrom(intervals,Intervals)
+importFrom(intervals,interval_overlap)
+importFrom(lattice,barchart)
+importFrom(lattice,simpleKey)
+importFrom(lattice,trellis.par.get)
+importFrom(lattice,trellis.par.set)
+importFrom(reshape2,dcast)
+importFrom(reshape2,melt)
+importFrom(stats,as.formula)
+importFrom(stats,coef)
+importFrom(stats,ftable)
+importFrom(stats,na.fail)
+importFrom(stats,nls)
+importFrom(stats,pbeta)
+importFrom(stats,predict)
+importFrom(stats,sd)
+importFrom(stats,xtabs)
+importFrom(utils,globalVariables)
+importFrom(utils,read.csv)
+importFrom(utils,select.list)
+importFrom(utils,setWinProgressBar)
+importFrom(utils,stack)
+importFrom(utils,winProgressBar)
+importFrom(utils,write.table)
Modified: pkg/stacomir/R/BilanConditionEnv.r
===================================================================
--- pkg/stacomir/R/BilanConditionEnv.r 2016-08-19 19:54:53 UTC (rev 163)
+++ pkg/stacomir/R/BilanConditionEnv.r 2016-08-19 19:56:13 UTC (rev 164)
@@ -1,14 +1,37 @@
# Nom fichier : BilanConditionEnv (classe)
# Date de creation : 24/06/2009 13:49:20
# constructeur d'un bilan des conditions environnementales
-#' class BilanConditionEnv simple output of one or several environemental conditons
-#' @slot horodate="RefHorodate"
-#' @slot stationMesure=="RefStationMesure"
-#' @slot data=data.frame
-#' @method connect
-#' @method charge
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
-#' @export
+#' class BilanConditionEnv simple output of one or several environmental
+#' conditions...
+#'
+#' Annual overview of environmental conditions. Enables to draw charts and
+#' write files.
+#'
+#' @include RefHorodate.r
+#' @include RefStationMesure.r
+#' @include create_generic.r
+#' @include utilitaires.r
+#' @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"))}.
+#' @author cedric.briand"at"eptb-vilaine.fr
+#' @seealso Other Bilan Classes \code{\linkS4class{Bilan_lot}}
+#' \code{\linkS4class{Bilan_poids_moyen}}
+#' \code{\linkS4class{Bilan_stades_pigm}} \code{\linkS4class{Bilan_taille}}
+#' \code{\linkS4class{BilanConditionEnv}} \code{\linkS4class{BilanEspeces}}
+#' \code{\linkS4class{BilanFonctionnementDC}}
+#' \code{\linkS4class{BilanFonctionnementDF}}
+#' \code{\linkS4class{BilanMigration}}
+#' \code{\linkS4class{BilanMigrationConditionEnv}}
+#' \code{\linkS4class{BilanMigrationInterAnnuelle}}
+#' \code{\linkS4class{BilanMigrationPar}}
+#' @concept Bilan Object
+#' @examples
+#'
+#' showClass("BilanConditionEnv")
+#'
+#' @export
setClass(Class="BilanConditionEnv",
representation=representation(
horodate="RefHorodate",
@@ -25,15 +48,15 @@
#' connect method for BilanConditionEnv class
#' @return an object of BilanConditionEnv class
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
setMethod("connect",signature=signature("BilanConditionEnv"),
- definition=function(objet,h) {
+ definition=function(object,h,..) {
# construit une requete ODBCwheredate
requete=new("RequeteODBCwheredate")
requete at baseODBC<-get("baseODBC",envir=envir_stacomi)
- requete at datedebut=strptime(objet at datedebut,format="%Y-%m-%d")
- requete at datefin=strptime(objet at datefin,format="%Y-%m-%d")
+ requete at datedebut=strptime(object at datedebut,format="%Y-%m-%d")
+ requete at datefin=strptime(object at datefin,format="%Y-%m-%d")
requete at colonnedebut="env_date_debut"
requete at colonnefin="env_date_fin"
requete at select=paste("SELECT",
@@ -46,46 +69,46 @@
" FROM ",get("sch",envir=envir_stacomi),"tj_conditionenvironnementale_env",
" LEFT JOIN ref.tr_valeurparametrequalitatif_val on env_val_identifiant=val_identifiant",sep="")
requete at order_by<-"ORDER BY env_stm_identifiant, env_date_debut"
- tmp<-vector_to_listsql(objet at stationMesure@data$stm_identifiant)
+ tmp<-vector_to_listsql(object at stationMesure@data$stm_identifiant)
requete at and=paste(" AND env_stm_identifiant IN ",tmp )
requete<-stacomirtools::connect(requete)
- objet at data<-stacomirtools::killfactor(requete at query)
+ object at data<-stacomirtools::killfactor(requete at query)
funout(get("msg",envir=envir_stacomi)$BilanCondtionEnv.1)
- return(objet)
+ return(object)
}
)
#' charge method for BilanCondtionEnv class
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
-setMethod("charge",signature=signature("BilanConditionEnv"),definition=function(objet,h) {
+setMethod("charge",signature=signature("BilanConditionEnv"),definition=function(object,h) {
if (exists("refStationMesure",envir_stacomi)) {
- objet at stationMesure<-get("refStationMesure",envir_stacomi)
+ object at stationMesure<-get("refStationMesure",envir_stacomi)
} else {
funout(get("msg",envir=envir_stacomi)$BilanCondtionEnv.2,arret=TRUE)
}
if (exists("bilanConditionEnv_date_debut",envir_stacomi)) {
- objet at datedebut<-get("bilanConditionEnv_date_debut",envir_stacomi)@horodate
+ object at datedebut<-get("bilanConditionEnv_date_debut",envir_stacomi)@horodate
} else {
funout(get("msg",envir=envir_stacomi)$ref.5,arret=TRUE)
}
if (exists("bilanConditionEnv_date_fin",envir_stacomi)) {
- objet at datefin<-get("bilanConditionEnv_date_fin",envir_stacomi)@horodate
+ object at datefin<-get("bilanConditionEnv_date_fin",envir_stacomi)@horodate
}else {
funout(get("msg",envir=envir_stacomi)$ref.6,arret=TRUE)
}
- objet<-connect(objet)
- return(objet)
+ object<-connect(object)
+ return(object)
})
# affiche un graphe si des CE sont dans la base pendant la periode selectionnee
#' hbilanConditionEnvgraph function called by handler which displays a graphe if environmental conditons are in the database during the selected period
#' @param h
#' @param ...
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
hbilanConditionEnvgraph = function(h,...)
{
@@ -98,9 +121,9 @@
if(length(unique(dat$env_stm_identifiant))!=0)
{
# le layout pour l'affichage des graphiques
- vplayout <- function(x, y) { viewport(layout.pos.row = x, layout.pos.col = y) }
- grid.newpage()
- pushViewport(viewport(layout = grid.layout(length(unique(dat$env_stm_identifiant)),1,just="center")))
+ vplayout <- function(x, y) { grid::viewport(layout.pos.row = x, layout.pos.col = y) }
+ grid::grid.newpage()
+ grid::pushViewport(grid::viewport(layout = grid::grid.layout(length(unique(dat$env_stm_identifiant)),1,just="center")))
# la liste des graphes calcules
lesGraphes=list()
if(length(unique(dat$env_stm_identifiant))!= nrow(bilanConditionEnv at stationMesure@data))
@@ -119,7 +142,7 @@
# toutes les mesures pour la station de mesure selectionnee
nameColonne <- as.character(stm$stm_libelle)
- datstm <- chnames(dat,"env_valeur_quantitatif", nameColonne)
+ datstm <- stacomirtools::chnames(dat,"env_valeur_quantitatif", nameColonne)
datstm <- datstm[datstm$env_stm_identifiant==stmidentifiant,]
#AES<-structure(as.list(c("x"=as.name(datstm$env_date_debut),"y"=as.name(eval(nameColonne)))),class="uneval")
@@ -150,7 +173,7 @@
# le dataframe contenant le res de la requete
dat<-bilanConditionEnv at data
- dat<-chnames(dat,"env_stm_identifiant","stm_identifiant")
+ dat<-stacomirtools::chnames(dat,"env_stm_identifiant","stm_identifiant")
dat<-merge(dat,bilanConditionEnv at stationMesure@data,by="stm_identifiant")
funout(get("msg",envir=envir_stacomi)$BilanCondtionEnv.5)
liste = tapply(dat$env_valeur_quantitatif,dat$stm_libelle,summary)
Modified: pkg/stacomir/R/BilanEspeces.r
===================================================================
--- pkg/stacomir/R/BilanEspeces.r 2016-08-19 19:54:53 UTC (rev 163)
+++ pkg/stacomir/R/BilanEspeces.r 2016-08-19 19:56:13 UTC (rev 164)
@@ -2,19 +2,36 @@
# Projet : controle migrateur calmig/prog/classe
# Date de creation : 31/03/2008 17:21:18
-#' @title #' Class Bilan espece Report of the species present at a counting device for a given period
-#' this class is used to make the assessment of all species, and their number, per month
-#' #' it writes an histogram of number per month
-#' class BilanEspeces
-#' @slot dc="RefDC"
-#' @slot horodate="RefHorodate"
-#' @slot stades="RefStades"
-#' @slot datedebut="POSIXlt"
-#' @slot datefin="POSIXlt"
-#' @slot data="data.frame"
-#' @slot duree="POSIXct"
-#' @slot liste="RefListe" lists the possible value of time period
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' Class "BilanEspeces" Report of the species present at a counting device for
+#' a given period
+#'
+#' this class is used to make the assessment of all species, and their number,
+#' per month it writes either an histogram or a pie chart of number per
+#' year/week/month
+#'
+#'
+#' @include RefDC.r
+#' @include RefListe.r
+#' @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_lot}}
+#' \code{\linkS4class{Bilan_poids_moyen}}
+#' \code{\linkS4class{Bilan_stades_pigm}} \code{\linkS4class{Bilan_taille}}
+#' \code{\linkS4class{BilanConditionEnv}} \code{\linkS4class{BilanEspeces}}
+#' \code{\linkS4class{BilanFonctionnementDC}}
+#' \code{\linkS4class{BilanFonctionnementDF}}
+#' \code{\linkS4class{BilanMigration}}
+#' \code{\linkS4class{BilanMigrationConditionEnv}}
+#' \code{\linkS4class{BilanMigrationInterAnnuelle}}
+#' \code{\linkS4class{BilanMigrationPar}}
+#' @references \url{http://w3.eptb-vilaine.fr:8080/tracstacomi}
+#' @concept Bilan Object
+#' @examples
+#'
+#' showClass("BilanEspeces")
+#'
+#' @export
setClass(Class="BilanEspeces",
representation=
representation(dc="RefDC",
@@ -39,10 +56,10 @@
#' connect method for BilanEspeces
#' @return bilanEspeces instance with request corresponding to the user choices
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
-setMethod("connect",signature=signature("BilanEspeces"),definition=function(objet) {
- bilanEspeces<-objet # pour faciliter la debug, l'argument formel de la classe doit etre forcement objet !
+setMethod("connect",signature=signature("BilanEspeces"),definition=function(object) {
+ bilanEspeces<-object # pour faciliter la debug, l'argument formel de la classe doit etre forcement object !
requete=new("RequeteODBCwheredate")
requete at baseODBC<-get("baseODBC",envir=envir_stacomi)
requete at datedebut=bilanEspeces at datedebut
@@ -75,7 +92,7 @@
#' traite eventuellement les quantites de lots (si c'est des civelles)
#' @param h
#' @param ...
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
hBilanEspecescalc=function(h,...){
charge(h$action)
@@ -85,12 +102,12 @@
#' charge method for BilanEspeces
#' verifies the content of objects and calls the connect method
#' @return BilanEspeces with slots filled by user choice
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
-#' @expamples bilanEspeces=new("BilanEspeces")
-setMethod("charge",signature=signature("BilanEspeces"),definition=function(objet,...){
+#' @examples bilanEspeces=new("BilanEspeces")
+setMethod("charge",signature=signature("BilanEspeces"),definition=function(object,...){
funout(get("msg",envir_stacomi)$BilanEspeces.7)
- bilanEspeces<-objet
+ bilanEspeces<-object
if (exists("refDC",envir_stacomi)) {
bilanEspeces at dc<-get("refDC",envir_stacomi)
} else {
@@ -120,12 +137,12 @@
})
-#' handler du calcul hCamembert
-#' trace un camembert des especes ou un camembert par periode...
-#' @note pas besoin de refaire tourner calcul si une autre liste � �t� charg�e, les effectifs <0 sont transform�s en positifs
-#' @param h
-#' @param ...
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' handler for pie chart
+#' draws a pie chart of species or a pie chart per period
+#' @note no need to re-run calcul if another list has been loaded, negative numbers are converted to positive
+#' @param h handler
+#' @param ... other parameters passed to the function
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
hCamembert = function(h,...) {
@@ -176,7 +193,7 @@
} else if (nb<=12){
p<-g+scale_fill_brewer(palette="Set3",name="Taxa")
}else{
- g<-g+scale_fill_manual(values=rainbow(nb))
+ g<-g+scale_fill_manual(values=grDevices::rainbow(nb))
}
if(h$action=="pie"){
g<-g+ coord_polar(theta="y", start=pi)+xlab('') +ylab('')
@@ -191,7 +208,7 @@
#' dans des fichiers csv
#' @param h
#' @param ...
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
hTableBilanEspeces=function(h,...) {
if (exists("bilanEspeces",envir_stacomi)) {
@@ -230,15 +247,15 @@
}
#' Interface for BilanEspece class
-#' @author Cedric Briand \email{cedric.briand@@eptb-vilaine.fr}
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
-#' @expamples interface_BilanEspeces()
+#' @examples interface_BilanEspeces()
interface_BilanEspeces=function(){
bilanEspeces=new("BilanEspeces")
assign("bilanEspeces",bilanEspeces,envir = .GlobalEnv)
funout(get("msg",envir=envir_stacomi)$interface_BilanEspeces.1)
bilanEspeces at dc=charge(bilanEspeces at dc)
- bilanEspeces at liste=charge(objet=bilanEspeces at liste,
+ bilanEspeces at liste=charge(object=bilanEspeces at liste,
vecteur=c("aucun","semaine","mois","annee"),
label=get("msg",envir=envir_stacomi)$interface_BilanEspeces.7)
quitte()
@@ -258,7 +275,7 @@
funoutlabel=get("msg",envir=envir_stacomi)$interface_Bilan_lot.6,
decal=-1,
affichecal=FALSE)
- choice(bilanEspeces at dc,objetBilan=bilanEspeces,is.enabled=TRUE)
+ choice(bilanEspeces at dc,objectBilan=bilanEspeces,is.enabled=TRUE)
choice(bilanEspeces at liste)
ggroupboutonsbas = gWidgets::ggroup(horizontal=FALSE)
assign("ggroupboutonsbas",ggroupboutonsbas, envir=.GlobalEnv)
Modified: pkg/stacomir/R/BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDC.r 2016-08-19 19:54:53 UTC (rev 163)
+++ pkg/stacomir/R/BilanFonctionnementDC.r 2016-08-19 19:56:13 UTC (rev 164)
@@ -1,22 +1,31 @@
-# Nom fichier : BilanFonctionnementDC.R (classe)
-# Projet : controle migrateur / suivi passe
-# Organisme : IAV/CSP
-# Auteur : Cedric Briand
-# Contact : cedric.briand"at"eptb-vilaine.fr
-# Date de creation : 12/01/2009 14:38:09
-# Compatibilite :
-# Etat : developpement en cours, fonctionne
-# programmer l'affichage du choice de la date (classe horodate devt en cours) => PB � regler dans la relation calendar horodate
-# 05/02/2009 21:21:40 OK fonctionne
-# programmer les graphiques, et notamment les coupures entre les mois, a partir de la table des dates de debut et de fin
-# il faut inserer des lignes correspondant aux debuts et fin de mois afin qu'aucun intervalle ne se trouve a cheval sur deux mois
-# 05/02/2009 21:21:54 OK done => il faudra penser � inserer ce type de modif pour le fonctionnement du DF
-# Description Calcul du fonctionnement du DC � partir des parametres
-# extraits de la base migrateur
-# Interface graphique : attribue au bouton DC
-# Creer un graphique ("en boites") des resultats de fonctionnement du DC avec deux choice de graphiques OK fonctionne
-
-
+#' Class "BilanFonctionnementDC" Bilan du fonctionnement du dispositif de
+#' comptage
+#'
+#' The counting device is not always working. It may me stopped either
+#' following a monitoring protocol, or due to misfunction of the device, this
+#' class allows to draw graphics allowing an overview of the device operation
+#'
+#'
+#' @section Objects from the Class: Objects can be created by calls of the form
+#' \code{new("BilanFonctionnementDC", ...)}.
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+#' @seealso Other Bilan Class \code{\linkS4class{Bilan_lot}}
+#' \code{\linkS4class{Bilan_poids_moyen}}
+#' \code{\linkS4class{Bilan_stades_pigm}} \code{\linkS4class{Bilan_taille}}
+#' \code{\linkS4class{BilanConditionEnv}} \code{\linkS4class{BilanEspeces}}
+#' \code{\linkS4class{BilanFonctionnementDC}}
+#' \code{\linkS4class{BilanFonctionnementDF}}
+#' \code{\linkS4class{BilanMigration}}
+#' \code{\linkS4class{BilanMigrationConditionEnv}}
+#' \code{\linkS4class{BilanMigrationInterAnnuelle}}
+#' \code{\linkS4class{BilanMigrationPar}}
+#' @references \url{http://w3.eptb-vilaine.fr:8080/tracstacomi}
+#' @concept Bilan Object
+#' @examples
+#'
+#' showClass("BilanFonctionnementDC")
+#'
+#' @export
setClass(Class="BilanFonctionnementDC",
representation= representation(data="data.frame",
dc="RefDC",
@@ -28,11 +37,19 @@
requete=new("RequeteODBCwheredate"))
)
-# Methode pour donner les attributs de la classe RequeteODBCwheredate correspondant � l'objet fonctionnement DC
-setMethod("connect",signature=signature("BilanFonctionnementDC"),definition=function(objet,h) {
+
+
+
+#' connect method for BilanFonctionnementDC
+#'
+#' loads the working periods and type of arrest or disfunction of the DC
+#' @return An object of class \code{BilanFonctionnementDC}
+#'
+#' @author cedric.briand
+setMethod("connect",signature=signature("BilanFonctionnementDC"),definition=function(object,h) {
# construit une requete ODBCwheredate
- objet at requete@baseODBC<-get("baseODBC",envir=envir_stacomi)
- objet at requete@select= sql<-paste("SELECT",
+ object at requete@baseODBC<-get("baseODBC",envir=envir_stacomi)
+ object at requete@select= sql<-paste("SELECT",
" per_dis_identifiant,",
" per_date_debut,",
" per_date_fin,",
@@ -42,41 +59,55 @@
" tar_libelle AS libelle",
" FROM ",get("sch",envir=envir_stacomi),"t_periodefonctdispositif_per per",
" INNER JOIN ref.tr_typearretdisp_tar tar ON tar.tar_code=per.per_tar_code",sep="")
- objet at requete@colonnedebut<-"per_date_debut"
- objet at requete@colonnefin<-"per_date_fin"
- objet at requete@order_by<-"ORDER BY per_date_debut"
- objet at requete@and<-paste("AND per_dis_identifiant=",objet at dc@dc_selectionne )
-#objet at requete@where=#defini dans la methode ODBCwheredate
- objet at requete<-connect(objet at requete) # appel de la methode connect de l'objet ODBCWHEREDATE
+ object at requete@colonnedebut<-"per_date_debut"
+ object at requete@colonnefin<-"per_date_fin"
+ object at requete@order_by<-"ORDER BY per_date_debut"
+ object at requete@and<-paste("AND per_dis_identifiant=",object at dc@dc_selectionne )
+#object at requete@where=#defini dans la methode ODBCwheredate
+ object at requete<-stacomirtools::connect(object at requete) # appel de la methode connect de l'object ODBCWHEREDATE
funout(get("msg",envir_stacomi)$BilanFonctionnementDC.1)
- return(objet)
+ return(object)
})
-setMethod("charge",signature=signature("BilanFonctionnementDC"),definition=function(objet,h) {
+#' charge method for BilanFonctionnementDC
+#'
+#' used by the graphical interface to retreive the objects of Referential classes
+#' assigned to envir_stacomi
+#' @return An object of class \code{BilanFonctionnementDC}
+#'
+#' @author cedric.briand
+setMethod("charge",signature=signature("BilanFonctionnementDC"),definition=function(object,h) {
# construit une requete ODBCwheredate
# chargement des donnees dans l'environnement de la fonction
if (exists("refDC",envir_stacomi)) {
- objet at dc<-get("refDC",envir_stacomi)
+ object at dc<-get("refDC",envir_stacomi)
} else {
funout(get("msg",envir_stacomi)$ref.1,arret=TRUE) }
if (exists("fonctionnementDC_date_debut",envir_stacomi)) {
- objet at requete@datedebut<-get("fonctionnementDC_date_debut",envir_stacomi)@horodate
+ object at requete@datedebut<-get("fonctionnementDC_date_debut",envir_stacomi)@horodate
} else {
funout(get("msg",envir_stacomi)$ref.5,arret=TRUE)
}
if (exists("fonctionnementDC_date_fin",envir_stacomi)) {
- objet at requete@datefin<-get("fonctionnementDC_date_fin",envir_stacomi)@horodate
+ object at requete@datefin<-get("fonctionnementDC_date_fin",envir_stacomi)@horodate
} else {
funout(get("msg",envir_stacomi)$ref.6,arret=TRUE)
}
- objet<-connect(objet)
- return(objet)
+ object<-connect(object)
+ return(object)
})
# Methode permettant l'affichage d'un graphique en lattice (barchart) du fonctionnement mensuel du dispositif
# Compte tenu de la structure des donnees ce n'est pas si simple...
+#' Function to create a barchart (lattice) corresponding to the periods
+#' @param h A handler
+#' @param ...
+#' @return assigns the data frame \code{periodeDC} allowing to build the lattice graph in the environment envir_stacomi
+#'
+#' @author cedric.briand
+#' @export
funbarchartDC = function(h,...) {
fonctionnementDC=charge(fonctionnementDC)
@@ -120,17 +151,17 @@
t_periodefonctdispositif_per_mois$mois1<-strftime(as.POSIXlt(t_periodefonctdispositif_per_mois$tempsdebut),"%b")
t_periodefonctdispositif_per_mois$mois<-strftime(as.POSIXlt(t_periodefonctdispositif_per_mois$tempsdebut),"%m")
t_periodefonctdispositif_per_mois$annee<-strftime(as.POSIXlt(t_periodefonctdispositif_per_mois$tempsdebut),"%Y")
- superpose.polygon<-trellis.par.get("superpose.polygon")
+ superpose.polygon<-lattice::trellis.par.get("superpose.polygon")
superpose.polygon$col<-c("#4C00FF","orange")
superpose.polygon$border<-FALSE
- trellis.par.set("superpose.polygon",superpose.polygon)
- bar<-barchart(
+ lattice::trellis.par.set("superpose.polygon",superpose.polygon)
+ bar<-lattice::barchart(
as.numeric(t_periodefonctdispositif_per_mois$sumduree)~as.factor(t_periodefonctdispositif_per_mois$mois)|as.factor(t_periodefonctdispositif_per_mois$annee),
groups=t_periodefonctdispositif_per_mois$per_tar_code,
stack=TRUE,
xlab=get("msg",envir_stacomi)$BilanFonctionnementDC.3,
ylab=get("msg",envir_stacomi)$BilanFonctionnementDC.4,
- main=list(label=paste(get("msg",envir_stacomi)$BilanFonctionnementDC.5,fonctionnementDC at dc@dc_selectionne), gp=gpar(col="grey", fontsize=8)),
+ main=list(label=paste(get("msg",envir_stacomi)$BilanFonctionnementDC.5,fonctionnementDC at dc@dc_selectionne), gp=grid::gpar(col="grey", fontsize=8)),
auto.key=list(rectangles=TRUE,space="bottom",
text=c(get("msg",envir_stacomi)$BilanFonctionnementDC.6,get("msg",envir_stacomi)$FonctionnementDC.7)),
scales= list(x=list(t_periodefonctdispositif_per_mois$mois),
@@ -140,6 +171,13 @@
funout(get("msg",envir_stacomi)$BilanFonctionnementDC.8)
}
+
+#' function used for some lattice graph
+#'
+#' @param h A handler
+#' @param ...
+#' @export
+#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
funboxDC = function(h,...) {
fonctionnementDC=charge(fonctionnementDC)
@@ -150,9 +188,10 @@
duree<-seq.POSIXt(from=fonctionnementDC at requete@datedebut,to=fonctionnementDC at requete@datefin,by="day")
debut<-unclass(as.Date(duree[1]))[[1]]
fin<-unclass(as.Date(duree[length(duree)]))[[1]]
- mypalette<-brewer.pal(12,"Paired")
+ mypalette<-RColorBrewer::brewer.pal(12,"Paired")
#display.brewer.all()
- mypalette1<-c("#1B9E77","#AE017E","orange", brewer.pal(12,"Paired"))
+ mypalette1<-c("#1B9E77","#AE017E","orange", RColorBrewer::brewer.pal(12,"Paired"))
+
graphdate<-function(vectordate){
attributes(vectordate)<-NULL
unclass(vectordate)
@@ -171,23 +210,23 @@
#bty="n",
cex=0.8)
r <- as.Date(round(range(duree), "day"))
- axis.Date(1, at=seq(r[1], r[2], by="weeks"),format="%d-%b")
+ graphics::axis.Date(1, at=seq(r[1], r[2], by="weeks"),format="%d-%b")
if (dim(t_periodefonctdispositif_per)[1]==0 ) { # s'il n'y a pas de periode de fontionnement dans la base
- rect( xleft=debut,
+ graphics::rect( xleft=debut,
ybottom=0.6,
xright=fin,
ytop=0.9,
col = mypalette[4],
border = NA,
lwd = 1)
- rect( xleft=debut,
+ graphics::rect( xleft=debut,
ybottom=0.1,
xright=fin,
ytop=0.4,
col = mypalette[1],
border = NA,
lwd = 1)
- legend( x= "bottom",
+ graphics::legend( x= "bottom",
legend=get("msg",envir_stacomi)$BilanFonctionnementDC.10 ,# three terms in the legend
pch=c(16,16),
col=c(mypalette[4],mypalette[6],mypalette[1]),
@@ -197,7 +236,7 @@
} else {
if (sum(t_periodefonctdispositif_per$per_etat_fonctionnement==1)>0){
- rect( xleft =graphdate(as.Date(t_periodefonctdispositif_per$per_date_debut[t_periodefonctdispositif_per$per_etat_fonctionnement==1])),
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 164
More information about the Stacomir-commits
mailing list