[Stacomir-commits] r475 - in pkg/stacomir: . man/figures vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Feb 15 17:14:22 CET 2018
Author: briand
Date: 2018-02-15 17:14:22 +0100 (Thu, 15 Feb 2018)
New Revision: 475
Added:
pkg/stacomir/man/figures/README-rmmmult-1.pdf
pkg/stacomir/man/figures/README-silver-1.pdf
pkg/stacomir/vignettes/
pkg/stacomir/vignettes/stacomir.Rmd
Modified:
pkg/stacomir/DESCRIPTION
pkg/stacomir/README.Rmd
pkg/stacomir/README.md
pkg/stacomir/man/figures/README-rmmmult-1.png
pkg/stacomir/man/figures/README-silver-1.png
Log:
Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION 2018-02-15 13:37:38 UTC (rev 474)
+++ pkg/stacomir/DESCRIPTION 2018-02-15 16:14:22 UTC (rev 475)
@@ -104,10 +104,13 @@
mgcv
Suggests:
testthat,
- viridis
+ viridis,
+ knitr,
+ rmarkdown
Author: Cedric Briand [aut, cre],
Marion Legrand [aut],
Timothee Besse [aut]
Maintainer: Cedric Briand <cedric.briand00 at gmail.com>
RoxygenNote: 5.0.1
NeedsCompilation: no
+VignetteBuilder: knitr
Modified: pkg/stacomir/README.Rmd
===================================================================
--- pkg/stacomir/README.Rmd 2018-02-15 13:37:38 UTC (rev 474)
+++ pkg/stacomir/README.Rmd 2018-02-15 16:14:22 UTC (rev 475)
@@ -1,13 +1,17 @@
---
title: StacomiR
-author: Marion Legrand, C�dric Briand
+author: Marion Legrand, Cédric Briand
output: github_document
-
---
[![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/stacomiR)](https://cran.r-project.org/package=stacomiR)
+```{r knitropt, include=FALSE}
+ require(knitr)
+opts_knit$set(message=FALSE, warnings=FALSE,error=FALSE,include=FALSE)
+```
+
```{r echo = FALSE}
knitr::opts_chunk$set(
collapse = TRUE,
@@ -162,7 +166,6 @@
to access the database *connect methods*, generate calculations *calcule
method*, or plot results.
For instance, the migration report class comprises slots for :
-***
* DC The counting device (camera, trap, acoustic device...)
@@ -174,7 +177,6 @@
* ending date The last date of the report
-***
Read the help files e.g. `? report_mig` to get documentation on the following
classes.
@@ -209,7 +211,7 @@
`database_expected=FALSE`
- ```{r , eval=TRUE, echo=TRUE}
+```{r , eval=TRUE, echo=TRUE}
## launches the application in the command line without connection to the database
stacomi(gr_interface=FALSE,login_window=FALSE,database_expected=FALSE)
```
@@ -232,7 +234,8 @@
daily
migration from monitoring operations which do not necessarily span a day, and convert the glass eel
weight in numbers.
-```{r ,eval=FALSE,echo=TRUE}
+
+```{r ,eval=TRUE,echo=TRUE}
stacomi(gr_interface=FALSE,
login_window=FALSE,
database_expected=TRUE)
Modified: pkg/stacomir/README.md
===================================================================
--- pkg/stacomir/README.md 2018-02-15 13:37:38 UTC (rev 474)
+++ pkg/stacomir/README.md 2018-02-15 16:14:22 UTC (rev 475)
@@ -1,294 +1,267 @@
----
-title: StacomiR
-author: Marion Legrand, C�dric Briand
-output: github_document
+StacomiR
+================
+Marion Legrand, Cédric Briand
----
-
-
[![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/stacomiR)](https://cran.r-project.org/package=stacomiR)
-
-
# stacomiR <img src="man/figures/logo.png" align="right" />
+## Introduction
-```
-#> Loading required package: stacomirtools
-#> Loading required package: RODBC
-```
-Introduction
---------------------------
+Migratory fishes population are vulnerable as they are often more prone
+to human impact when migrating in rivers and to the ocean ([McDowall,
+1992](http://onlinelibrary.wiley.com.inee.bib.cnrs.fr/doi/10.1002/aqc.3270020405/pdf)).
+They are often counted at stations when they perform the migrations at
+some of their lifestages, and these counts provide valuable indices to
+the population size and trend. The objective of the stacomi project is
+to provide a common database for people monitoring fish migration, so
+that data from watershed are shared, and stocks exchanging between
+different basins are better managed. The stacomi database, is an
+open-source database, it managed with a JAVA interface, and results from
+that database are treated directly with the stacomiR project.
-Migratory fishes population are vulnerable as they are often more prone to human
-impact when migrating in rivers and to the ocean ([McDowall,
-1992](http://onlinelibrary.wiley.com.inee.bib.cnrs.fr/doi/10.1002/aqc.3270020405/pdf)). They are often counted at
-stations when they perform the migrations at some of their lifestages, and these
-counts provide valuable indices to the population size and trend. The objective
-of the stacomi project is to provide a common database for people monitoring
-fish migration, so that data from watershed are shared, and stocks exchanging
-between different basins are better managed. The stacomi database, is an
-open-source database, it managed with a JAVA interface, and results from that
-database are treated directly with the stacomiR project.
+## Installation
+The package is available from CRAN, a development version is available
+from R-Forge.
-Installation
--------------------------
-
-The package is available from CRAN, a development version is available from
-R-Forge.
-
-
-```r
+``` r
install.packages("stacomiR") # get the package from CRAN
install.packages("stacomiR", repos="http://R-Forge.R-project.org") # get the development version
```
-Usage
--------------------------
+## Usage
Launch the graphical interface
-
-```r
+``` r
stacomi()
```
-The program can be launched to use from the command line
+The program can be launched to use from the command
+line
-
-```r
+``` r
stacomi(gr_interface = FALSE, login_window = TRUE, database_expected = TRUE)
```
+## Data structure
-Data structure
--------------------
-The open source postgresql database comprises a common schema with dictionaries,
-and different schema for different users. Each user can save its own schema and
-send it to others. The
-database comprises tables related to infrastructure, operations and fish
-samples.
-*Contact the authors to get a copy of the database*.
+The open source postgresql database comprises a common schema with
+dictionaries, and different schema for different users. Each user can
+save its own schema and send it to others. The database comprises tables
+related to infrastructure, operations and fish samples. *Contact the
+authors to get a copy of the database*.
### Infrastructure
-
#### Station
-A migration report is always built on a section of a river, this is called the
-station. A station of fish migration monitoring is a section of a watercourse
-where fish upstream or downstream migration is monitored. The station covers the
-whole section of a single river, but can extend to several natural or artificial
-channels. A station consists physically of as many dams as hydrographic sections
-monitored (river, channels, etc.). According to the local settings, it
-corresponds to one river location with a counting device, or to one or several
-dams. For example, in the figure below we can see a station with three crossing device (DF 1 to 3)
-and two counting device (DC 1 to 2), the first one beeing a trap counting device (DC1) and the other a video-counting device (DC2).
+A migration report is always built on a section of a river, this is
+called the station. A station of fish migration monitoring is a section
+of a watercourse where fish upstream or downstream migration is
+monitored. The station covers the whole section of a single river, but
+can extend to several natural or artificial channels. A station consists
+physically of as many dams as hydrographic sections monitored (river,
+channels, etc.). According to the local settings, it corresponds to one
+river location with a counting device, or to one or several dams. For
+example, in the figure below we can see a station with three crossing
+device (DF 1 to 3) and two counting device (DC 1 to 2), the first one
+beeing a trap counting device (DC1) and the other a video-counting
+device (DC2).
![plot](man/figures/StationComptage.png)
-
-
#### Dams
-The concept of dam used in the context of fish migration monitoring database
-refers to a system blocking or guiding the migratory flow like :
-* weir,
+The concept of dam used in the context of fish migration monitoring
+database refers to a system blocking or guiding the migratory flow like
+:
-* electric guide barrier,
+ - weir,
-* netting dam,
+ - electric guide barrier,
-* etc.
+ - netting dam,
+ - etc.
-#### Crossing device
+#### Crossing device
+
A crossing device (DF) is a passageway that allows and concentrates the
-migratory flow between upstream and downstream sections of a dam. They can be of
-various type :
+migratory flow between upstream and downstream sections of a dam. They
+can be of various type :
-* fishway,
+ - fishway,
-* spillway,
+ - spillway,
-* fish elevator,
+ - fish elevator,
-* eel trapping ladder,
+ - eel trapping ladder,
-* etc.
+ - etc.
It is possible to have more than one crossing device on a same dam.
#### Counting device
-A counting device (DC) is a set of equipment installed on a crossing device used
-to monitor fish migration. It can be :
-* a video counting device,
+A counting device (DC) is a set of equipment installed on a crossing
+device used to monitor fish migration. It can be :
-* a trap,
+ - a video counting device,
-* an accoustic counting device,
+ - a trap,
-* ...
+ - an accoustic counting device,
+ - â¦
#### Monitoring operation
-An operation corresponds to a monitoring of a counting device during a time
-span.
+An operation corresponds to a monitoring of a counting device during a
+time span.
+
#### Sample
-A sample corresponds to a batch of fishes passing during a monitoring operation.
-Sample characteristics (length, weight, sex, body measurements) are attached to
-the sample. For each sample the species and the stage (which corresponds to a
-maturation stage and is related to migratory behaviour) is recorded.
+A sample corresponds to a batch of fishes passing during a monitoring
+operation. Sample characteristics (length, weight, sex, body
+measurements) are attached to the sample. For each sample the species
+and the stage (which corresponds to a maturation stage and is related to
+migratory behaviour) is recorded.
+
#### Other features
-The database also handles, marking-recapture operations, pathologies, samples
-collection (scale, fin sample for genetic...), fate of fishes (released, death,
-farmed, etc.), etc...
-Some tables are also used to insert information
-about environmental condition such as turbidity, atmospheric pressure,
-temperature, flow ...
+The database also handles, marking-recapture operations, pathologies,
+samples collection (scale, fin sample for geneticâ¦), fate of fishes
+(released, death, farmed, etc.), etc⦠Some tables are also used to
+insert information about environmental condition such as turbidity,
+atmospheric pressure, temperature, flow â¦
- Package structure
---------------------
-The package relies on S4 classes. *Referential classes* are used to access data
-from the database (taxa, stages, counting devices...).
-*Report classes* are built from referential classes and have different methods
+## Package structure
+
+The package relies on S4 classes. *Referential classes* are used to
+access data from the database (taxa, stages, counting devicesâ¦). *Report
+classes* are built from referential classes and have different methods
to access the database *connect methods*, generate calculations *calcule
-method*, or plot results.
-For instance, the migration report class comprises slots for :
-***
+method*, or plot results. For instance, the migration report class
+comprises slots for :
-* DC The counting device (camera, trap, acoustic device...)
+ - DC The counting device (camera, trap, acoustic deviceâ¦)
-* taxa The species list from the database and the taxa selected
+ - taxa The species list from the database and the taxa selected
-* stage The stages list from the database and the stage selected
+ - stage The stages list from the database and the stage selected
-* starting date The date of beginning
+ - starting date The date of beginning
-* ending date The last date of the report
+ - ending date The last date of the report
-***
-Read the help files e.g. `? report_mig` to get documentation on the following
+Read the help files e.g. `? report_mig` to get documentation on the
+following
classes.
-| Class | Command | description|
-| ------------- |:----------|:--------------------------------------- |
-|report_mig | `new("report_mig")` | Migration report (single) |
-| report_mig_mult| `new("report_mig_mult")`| Migr. (several DC,taxa...) |
-| report_annual| `new("report_annual")`| Multi year migration counts |
-| report_dc | `new("report_dc")`| Counting device operation |
-| report_df | `new("report_df")`| Fishway operation |
-| report_mig_env | `new("report_env")`| Migration crossed with env. factors |
-| report_mig_char | `new("report_df")`| Migration with fish characteristics |
-|report_mig_interannual | `new("report_mig_interannual")`| Comp. between years|
-|report_sample_char | `new("report_sample_char")`| Sample characteristics |
-|report_ge_weight | `new("report_ge_weight")`| Trend in glass eel weight |
-|report_silver_eel | `new("report_siver_eel")`| Silver eel migration & stage|
-|report_sea_age | `new("report_sea_age")`| Set sea age for Salmon |
-|report_species | `new("report_species")`| Species composition |
+| Class | Command | description |
+| ------------------------ | :------------------------------ | :---------------------------------- |
+| report\_mig | `new("report_mig")` | Migration report (single) |
+| report\_mig\_mult | `new("report_mig_mult")` | Migr. (several DC,taxaâ¦) |
+| report\_annual | `new("report_annual")` | Multi year migration counts |
+| report\_dc | `new("report_dc")` | Counting device operation |
+| report\_df | `new("report_df")` | Fishway operation |
+| report\_mig\_env | `new("report_env")` | Migration crossed with env. factors |
+| report\_mig\_char | `new("report_df")` | Migration with fish characteristics |
+| report\_mig\_interannual | `new("report_mig_interannual")` | Comp. between years |
+| report\_sample\_char | `new("report_sample_char")` | Sample characteristics |
+| report\_ge\_weight | `new("report_ge_weight")` | Trend in glass eel weight |
+| report\_silver\_eel | `new("report_siver_eel")` | Silver eel migration & stage |
+| report\_sea\_age | `new("report_sea_age")` | Set sea age for Salmon |
+| report\_species | `new("report_species")` | Species composition |
+## Working examples
-Working examples
--------------------------
+### Command line
-### Command line
-
#### Migration report
-Examples are provided with each of the class, you can access them simply by
-typing `? report_mig_mult`
-The program is intented to be used in conjuntion with the database, to test it
-without access, use the arguments `login_windows=FALSE` and
+Examples are provided with each of the class, you can access them simply
+by typing `? report_mig_mult` The program is intented to be used in
+conjuntion with the database, to test it without access, use the
+arguments `login_windows=FALSE` and
`database_expected=FALSE`
+``` r
+## launches the application in the command line without connection to the database
+stacomi(gr_interface=FALSE,login_window=FALSE,database_expected=FALSE)
+```
-
- ```r
- ## launches the application in the command line without connection to the database
- stacomi(gr_interface=FALSE,login_window=FALSE,database_expected=FALSE)
- ```
-The
-following code is only run when there is a connection to the database. The
-program will create an object of the class report_mig_mult, and run it for several DC, here 5 is a
-vertical slot fishway, and 6 and 12 are two glass eel trapping ladder located
-at the Arzal dam in the
-Vilaine river (France).
-We are evaluating the migration
+The following code is only run when there is a connection to the
+database. The program will create an object of the class
+report\_mig\_mult, and run it for several DC, here 5 is a vertical slot
+fishway, and 6 and 12 are two glass eel trapping ladder located at the
+Arzal dam in the Vilaine river (France). We are evaluating the migration
of all stages of eel (glass eel CIV, yellow eel AGJ and silver eel AGG).
-Glass
-eel and yellow eel migrate to the watershed while silver eels
-are migrating back
-to the ocean.
-Data are loaded from the database with the `charge` method and the `calcule`
-method
-will
-interpolate
-daily
-migration from monitoring operations which do not necessarily span a day, and convert the glass eel
-weight in numbers.
+Glass eel and yellow eel migrate to the watershed while silver eels are
+migrating back to the ocean. Data are loaded from the database with the
+`charge` method and the `calcule` method will interpolate daily
+migration from monitoring operations which do not necessarily span a
+day, and convert the glass eel weight in numbers.
-```r
+``` r
stacomi(gr_interface=FALSE,
- login_window=FALSE,
- database_expected=TRUE)
+ login_window=FALSE,
+ database_expected=TRUE)
r_mig_mult=new("report_mig_mult")
r_mig_mult=choice_c(r_mig_mult,
- dc=c(5,6,12),
- taxa=c("Anguilla anguilla"),
- stage=c("AGG","AGJ","CIV"),
+ dc=c(5,6,12),
+ taxa=c("Anguilla anguilla"),
+ stage=c("AGG","AGJ","CIV"),
datedebut="2011-01-01",
datefin="2011-12-31")
+#> [1] Choice made, and object report_mig_mult assigned in envir_stacomi
r_mig_mult<-charge(r_mig_mult)
# launching charge will also load classes associated with the report
# e.g. report_ope, report_df, report_dc
r_mig_mult<-connect(r_mig_mult)
+#> data collected from the database nrow=400
+#> [1] Loading data for operations
+#> [1] Time steps loaded fot this counting device\n
+#> [1] Time steps of the fishway loaded\n
# calculations
r_mig_mult<-calcule(r_mig_mult,silent=TRUE)
```
-The previous line generates data not only about the report_mig_mult class,
-but also run dependent classes which describe how the fishway (DF) and counting devices (DC) have been operated.
-Sometimes there is no data but only because the camera was not working. There are also information
-about the operations (e.g. periods at wich a trap content has been evaluated). Here we load what
-would have been generated if we had run the previous lines.
+The previous line generates data not only about the report\_mig\_mult
+class, but also run dependent classes which describe how the fishway
+(DF) and counting devices (DC) have been operated. Sometimes there is no
+data but only because the camera was not working. There are also
+information about the operations (e.g. periods at wich a trap content
+has been evaluated). Here we load what would have been generated if we
+had run the previous lines.
+One graph per DC, taxa and stage. Below as an example, the glass eel
+migration in weight and number (top), the periods and type of operation
+for DF and DC, and the operation (trapping periods) (middle), a summary
+of migration per month (bottom).
-One graph per DC, taxa and stage.
-Below as an example, the glass eel migration in weight and number (top),
-the periods and type of operation for DF and DC, and the operation (trapping
-periods) (middle), a summary of migration per month (bottom).
-
-
-
-
![plot of chunk rmmmult](man/figures/README-rmmstandard-1.png)
Summary of migration for different stages and counting devices
+![](man/figures/README-rmmmult-1.png)<!-- -->
-```
-#> Error in object at calcdata[[i]]: subscript out of bounds
-```
-
#### Silver eels
-This section provides a short example for the function
-calculating Durif's stages. Those maturity stages for silver eels are
-calculated from body characteristics. The dataset `coef_durif`
-corresponds to classification scores are calculated by multiplying the metrics
-BL = body length, W = weight, MD = mean eye diameter (Dv+Dh)/2, and FL length of
-the pectoral fin, with each parameter p as S=Constant+BL*p(bl)+W*p(W)... The
-function `fun_stage_durif` choose the stage achieving the highest
-score ([Durif et al.,
+This section provides a short example for the function calculating
+Durifâs stages. Those maturity stages for silver eels are calculated
+from body characteristics. The dataset `coef_durif` corresponds to
+classification scores are calculated by multiplying the metrics BL =
+body length, W = weight, MD = mean eye diameter (Dv+Dh)/2, and FL length
+of the pectoral fin, with each parameter p as
+S=Constant+BL*p(bl)+W*p(W)⦠The function `fun_stage_durif` choose the
+stage achieving the highest score ([Durif et al.,
2009](http://fishlarvae.org/common/SiteMedia/durif%20et%20al%202009b.pdf))
-
-```r
+``` r
require(stacomiR)
data("coef_durif")
# load a dataset of class report_silver_eel with data slot already prepared
@@ -299,9 +272,9 @@
#> Warning in predict.lm(rlmmodb, newdata = newdata, se.fit = TRUE, type = "response", : Assuming constant prediction variance even though model fit is weighted
```
-![plot of chunk silver](man/figures/README-silver-1.png)
+![](man/figures/README-silver-1.png)<!-- -->
-```r
+``` r
#######################################
# To use the function fun_stage_durif manually
# create a matrix with columns BL","W","Dv","Dh","FL"
@@ -321,14 +294,15 @@
#> 25710 25711 25712 25713 25714 25715 25716 25717 25718 25719
#> "FIII" "FIII" "FIII" "FIV" "FIII" "FIII" "FV" "FV" "FIII" "FIII"
```
+
### R-GTK2 graphical interface
-The program is intended to be used by 'non experienced' R users. Launching
-`stacomi()` will create the interface. The interface looks like :
+The program is intended to be used by ânon experiencedâ R users.
+Launching `stacomi()` will create the interface. The interface looks
+like :
![plot](man/figures/interface_graph_taille_sat.png)
-License
--------
+## License
The STACOMI project is released under GPL-2.
Added: pkg/stacomir/man/figures/README-rmmmult-1.pdf
===================================================================
--- pkg/stacomir/man/figures/README-rmmmult-1.pdf (rev 0)
+++ pkg/stacomir/man/figures/README-rmmmult-1.pdf 2018-02-15 16:14:22 UTC (rev 475)
@@ -0,0 +1,144 @@
+%PDF-1.4
+%âãÏÓ\r
+1 0 obj
+<<
+/CreationDate (D:20180215163637)
+/ModDate (D:20180215163637)
+/Title (R Graphics Output)
+/Producer (R 3.4.3)
+/Creator (R)
+>>
+endobj
+2 0 obj
+<< /Type /Catalog /Pages 3 0 R >>
+endobj
+7 0 obj
+<< /Type /Page /Parent 3 0 R /Contents 8 0 R /Resources 4 0 R >>
+endobj
+8 0 obj
+<<
+/Length 7779 /Filter /FlateDecode
+>>
+stream
+xÅ[ïæ¶qÆïÿâ½´/¢ð|¸¬Ö¨Hm4A¸·áM¬Ó|ýr8C¢$&뤻¶zÞDQ<<âúõåK¿¾ýùíW×^jS
+ÿr!Á¬qð¿|÷úõëo?ÿð_|öúöÃ.ÿ¨^ãß¾mÉuüÕ翯¿½ýæ·/õúý~}Yþ|ÿ¦+îoôgýúÚ¬z¶¬_Ö-ûWÖ[Ч+T[6æ5þ
+W¸Ô¿ãn at mÞî7 ¦ ߶aöõþÍ&»ßxûªàÓÜp'¤BOÀãý«ê¿÷èNÈfS¦Ýß{:´:mÞÔtÍâ~gïàzût<aË%¿AÇ#åð é®\Üâ/x<ÜvÈ[oÊÝèá¶éxÈí6|Ác8Áë-
+ùã[³=äù¢-üï/x<=ÜÑ~9ãÓsx<QJjJ¥¼úRÐÊ=r¥V¸ÙòÔB¹\þ=©/§`Õ.lÚÝ%;õê6ÑÀ¿Þ%ºMkµåa&L´¥ êáé!ÖTSs¬§ær½¾<Òêòtm
{mÚ¿åkÍ·÷|ý±ëÄèêÓ¹IõáÞ$¦Íê»ÄTJ©½½¬j¹»'êöþc.éM«jO®-辰fÿµ´Ôª!··kN,¹Üm¢ÃLºNLÀÇ+r¥wÒR
+ûûÄrþ61ÖÌ¡C9s 3ÿZkæ_'zMÂÝÍ@±Î÷©JëÝçÍ»ÛjsÇTS_JÕ=ÞlÉgZj)uæö¢Ýô1uz©Ôm^ÆØ¥»ÄX[лD;¦ñbÞ̱À(jîá*ám!-íaJ·¿Ìo¯·4÷å0ò}|rÖÂO©~sáözÃ\JÇçZªp¿Ùa%|ù»9ÔJøF¡½V¥j5zIFé¹î¿káèær6&ú¹Ðòÿ6ÞïcO\[è¿·w£ÿIzxÐàÝ:Þû!:ÖÞOÀãáR}]@:º:¦\Hº:x¼÷ðèþÞ÷Þ{xýÞãëgP®Ñ{|ýêÑõ3zo§\ôðty[ÊK»ß·]«±HÇà åß]NÀã!_T¶uÏ<Þ{xý[o¿bìÑíùÒz|{¾`nÏÖãÛÏÀÝ~Fëñí9=º=çZ¯ÑúvÁÄòwÌ¡ÚÒaJ¹å½Êªöë>aS8(Z¤hÝFqbä%
º%#nAÈ
» bBÀÈPÙÕA61Jæ-¥µ·GïÕ÷5£)RWÔá¡7ññAïÆ3
Fÿ[1H!bΤQ«µA
+£TJB) -ªACg¸y!FéܪR")3b%¦0ê\Ä
£Qv$R:¶#CsRøüDk£òá ?µ±vÊoÒtïoÒ"1oÒJ_kNSÔ{/#;·û&¬î·)47§Vüê~ËËÌí¾[ö¢uÏSµdæ;Ȥ0dA
+#ÏÏeT
aÐ"bâ9#ÿ1BÀÐu8$aBÀ00°1H!`XøICdzÏmrS¸ÍÄóU]2|¨zÉ
¤1u ø*JÆ
ç1Z¶MáàuoÏ®*Ç"ñsºÙå×uVê~(¥Ç@c¢ÃënvZÙy,¢qÂ¥doV®)nðÉú5ÐÊÏãr!á)ùÔâ²£yLÂS.$%Σr!á(ið GÉðif¢,k.qøû]£µÇ&
+¼¾¥IF^¿/ZÏ£B Å-"£DB±ó
§DFÉs¥ÉSrR|QH"¡øy2J®)$qðñýYßBNÕ¸_SHâ`ÌÑÞÊe·AëxópH(é<zâ($PòyÆQH" uÑ1&P4XÙ2
+I$UðÑ
Ìë:¹I2L)xÔ5I>Ròpaw8J£,amluD(u"Åo^JAà%"J#£ DDI³ÏÉ5%Nõù6
+Êôg§ÃÄ5
$u´A¦^÷a¬½Ò$2Êäv<¡d/¤èÙïà)$PÌìxðH(vö<x
+I$:ah¤ìßûï((qz½wÖïõ³ïû¨ùã[¹îÃØ0;Ì%%@O)>3)nÝV¤P}JI³ûáÃÉW'¥=¦ä¹æ÷LC PçXÉ@GJ`ÊJ
+%ø§f%Ãÿ
$
ÍS½ßö;
+I2ô"ûuÍÓíF^±k
+IÀ¨IòëwÊcRH"¡¸Ùâ)$PülCñH(a¶¡x
+I$¸©cͯ·¼îÃ4IíP
+Éq¶¡ôæ×õXøÍÛN±kJm¨ -áx9mËd¿n_p¦èTó3@Íßëä°Î1r*¢DDѳsÅSP"¢Ôyå2
+JD;;W<%"+ÇÌ6êÔ§Òº$ãtúãûÖ-rø-¨&±Ì½øÙ¹zB© %ÌÎe)$R»KJ«26]×cMR
+_ª.ôºÄ`
$J~x.
+æÈ.1¨)Y¦¢WåÓË7\Ú%4¥ÚT½ÖOç©1¨aêw!5"Ý«8Ì˸¦ ¤tÍl`áÚK,gLϯIʽøöfuKÁ3
¹$ðûâg÷Ê/ó5
$µ÷Òº%ÌîæzäMâ{|\Sâì^ñH(iv¯|θ£$÷ ?1W? ÄZÒ3µýk¿b
+
+¯ÈuIR
+3Uë¢å
$n¯ZçXT³GÆ^I$Ö$Ó³Æ_JDFÉ
¨'r¿WòH4ÜÌõ¡$2ß}µ`Ñ¡ô»Í¬[?Ò¤Ô3 ö¸;ÛwqÅwÁ&øtoÛ[æ×,0yhc®1¨-æ×#ú¹ï¤pbÕ*fîÙÙÁ³j]cPjpÚ³&#F$Ä FI³§#ÔQP-Óiy6ñðù°
+bÃä¸Ä$5»x<4BÌdã=ÂTOѳW¿.)(q¦ 3tg®)föñ"7s$nk4tð;ûx<%"J
+W<æ32%3=HÅÂkIñ³¸k
+J
+%ÒÓw\oã'
¬.°Ä \þø
+SÈ"4,®©YbPSÚ$ßûÙÌwÒ,ÍNAg+ï5BLþ;0YÁPùC0Ìù¦qa>»yëÈ®&q¶¿5zè_SÌÙÍã(¦¹yÏ)vvó,L]RH·Ôk æ{(Ç@¹ø¾ ÑÐâg7Oʯ)$ñ$z²²¯)avóx
+I$-£DFÜ<;ôï(U{ïÜÀÐkII³ç¸îlÿèFaZá{ïñ^Öñ#]R«çv/ËbâÎÄzÖw>í[C«¶¤èÙÍ3ðl>ñ{ü\rM1³ÇSH"¡ØÙËã)$PÜÉÊxó%
$~K42ÓãLßk<ÎÌéÁÌ©sÒ0{y<$BL+ÿõ4¡.Po¶</ÛK£âìæ9&¡KvÏÐ8Æ@þ00r0z¢Ó,Áe=Ó%6hôËè?£Õlè
a>Ö%$NõY;&¢ÔaP"èeÈ0v¶Î2÷lHRúLmEÈ|k1å:&¬dÉzMÓálbc¹*Hò³nkHõãgSË3³_º$÷Ù/Ò%%Ìa¬Ã. Ý:d[gðb¤H(iv´jpïBú²ÿu©ólhf6rèÂSñ×ËQ3¬
+c
&PôlgñH(Õ»ú
$¾?}Çئ Í,f.zø¡ÉÔ10{epH(z¢2
+I$?{Y<
$J½,B %Î^O!Ρk¹K\¯5´8KJ,5å®)$©«bį;V]F®)M"¡èÙÈâ)$QòâsÔÙ(mÀ¸îÅXs\Ïé×gؾèÂÅÎ.O!â`Ü>Q#I]Rrl=ÇÀ¿eýV6ËiÏeýVÂdì9ΣDBð
+JF!Î.a~j.éÌÚ÷30§x®ù׳ĻÄ÷YâùÓ4
Ì5?Ci EÏ.O!bÎÑLO©IÜÐO^ù50ÿ´òƺ$7©¹ñëÚV0=ÁPH"¡øs4%Gñ-ò9%Ì.O!áCB %ÍO!É)ci¶°óÍ·KvJ¼¦d(õ2
+Iø)¤4¢gÿ§DB1³}ÅSH"¡ØÙ½â)$PÜl^±urxXà¥9$ë÷³we¹E]úÜ"vdáÃÉ»¬k
+I<F´w¹ ndx³Äݺóqv®x
+I$4;W<
$JηhdÑ$ûÈ6AÍÎb¢»Ä
+S>×qÁ&èÙ¹RLÌf¸³iu'L0ÃÁ)$Pìì\)ιj7LÆLëV,¸Ù¹ª³Ô
±#«;Lc²ãÏÞÕzFø}7ÛÃ0W¾|/1$©Ág
+³^Æ×8»W<$"L:ÛWÁ¤f_µ2¾§»¹ú×Lq&ï«Df±Õi*Gi EÏöO!b ðjêb¬?)4ɾwBq®)öl_1¸Þø+ÎX*}ÅSȾzNqPÝ)¡¤vÅNuù5Åí«õÔÅ.×ðÎ̽³}ÅQB³¯SâÙ¾â(±ÙWÏ)él_1iéz¼YȧÿºYnMëû¬;0 YHi EÏöO!O¹²s^£¶Øsí+B ¥SI^×0Mâ°]¦SüÙ¾2ënL+æõ'
ÎöG ;zNÐÏQH"¡¤³}ÅQR³¯SòÙ¾â(¹ÙW)Yí+Ò$2Êɾâ)d_=§è³}µÚì×·PSôIv¿I2tÈðcÚìÏñë)«Mâö2ÏÕ09ÌOAaÄiþÝÚi^®û9-ͱÔ,ÝÛýõB 9Y><
,ç5e<§X¥fËG1C¾.q}ȧH«ôÙòYoØÓ%ª³SGñbÎG1ÍòyN±gË£Øfù<§¸³åÃQ\³|SüÙòá(¾Y>Ï)álù¬MíqÙÔõT5dÙfJ]2,¸÷%ÎO!f¿§DB©kMm%ó\Hâú2
+ûÂÌV«Ù×ÙÛ^óFï
+Ôñwö<w§-<
+Ö<=gµ?[
+ëÐ:|»Þ%:Ø´q3«³qÀżtÉó<÷æé8;Ü4Á.ñ4p(Ë|ýy'ëÀ1~¤îè?Mצ>ÄúhÒ ¾UÌf4&}1«$ôJ¬ãõÝ=»ãZA×x¨1ÓÅ×1PHLý.q}:*×SµÆÝb{ ¡ÝõKÓ$®¿4ÜDØG=Æf?I\.¤Ýì¬ñg÷£øæ<§³{ÀQBsSâ
{ÀPbwSÒÙ=X{à]2îúJ>»k߸KFßx½×µêì0&PôÙ=X/zÑ%ã¢ø-ËZÿ:M¥{âix¿'Úó¨<0Ãï´;Áúq7ÉxñÌËd{ tÉaou¡¯c²=ºDBó<
$JíB %ÏvO!âÔl°&Qò©s»´>ºd|Ùýúewz¶ØÎ|ùõÌØ!údpÓìç{¶8mvÁswÌävµêcàVkO»ß0çâ]°¯O¿^wϺp¶8JhvÁsJ÷Íä)$PÒÙ.à(©ÙÊÙ.`~êvÁÞ¾´±¦Ëó>ûøÛzuÏ÷a3.4öö³Þ\©{¢=©uÿYwS·aõþ<¦nÓèç1uÏZ_κO<÷ÄtþXÎ}yºuÕÙ$u2
vö:Îuþò½tê}Ëà£çá+!c¶óæ¢$"=üæ0¶}ü`ÜyüÊa\¿
+0þ<å0¾
+`EÓÇÐV ç!ìú#XìÁvëW¯?ëõ°í94ëÙ¿r úë×ß~þá?¾øìõí`puö¿±¿#ñç_½Á^5¢¯ÿýÕç¿;µ¯¿½ýæ·/õúýz}ù¦_ß¿á*¿ .-Zy"ïßlª!âáo_Qr¨wöd<ÜS
+ìîÉx¸'Ã%{:'×äðNÈêL¼ó÷t»YLÖ¸crK§Ãácl?`¸P_;GdEÏ>zu]~½x¸ß6=÷äh¡íëÉx¸'çØñp̬úÍhȬz'æ0í
Gãغ
+MÏ,<3K[ð{fááxBöµ¶ðpÌÍ¡¡ï¹Ã ׯ]iy\ ll/ÝòKÚ.èýz¸ZZ;Ö]ÔõôuWÞÂ3
+úWB@`ÁKP "d+$@@¨ËFI(êê9
+ »!ÂpLB@à£!Ã$S Ï ±~;H hè5H(J%)#@@À6X@@`a¢ï±}Xz¾»À5Aã>áßjëßáöÞCî:pWoê^Ú×IuuÓ뤺öem¤}¦§VtL«ëÕܤÙSËRKs§6§EÙÓFÓ·is=¿§
S
+½§ÅSݺ§¥S¸§ÕmiëØvÚ^öXjlHÅ6׺¹ìñª*â0
+Ûó¶n-+b B¨K$¨0궲"*ÜTVÂ
Q·1P!aÔ¨ú¸urQáü0ñlíÓv²ca¹]õPâUg
[CêJôGÈzxø÷§ºì¬_Ü÷ê!¤î%;AÖ+¾£ ñ)¤n%{¤õÚå(Õ=
Ôdnã*)ô8»êF²$2}R87¬[³QhÙa¹5øQáTßÒp{Pá&²*쥢1jnU!bÔícEª1êæ±"FU5z`fö)\]j®ÛѶn{x?âz)lT8×£É-·ÿ3n+bT
Q71ªBÄHSßgT
qìä?a
Q·1ªBÂÀÍb%Tz¿ðª1Ì4âU!bØi<*]r«$(PÇl=ÏvoDsÑƲe8Ô7¤©½¡%ÆOc¼ÈÍÌl;Ëz Óp1vûbÜZ¦GÛǺQìÁÎÁS%0ïªyÇnú§!¬go¥*`
+¬v'eXÂ<£*DºcQö%Tzâóª1êî°"FUv²-yFUugر5<HâmTÌM÷¥aÇ·ÐlÜ¥U[¶ùþÃì¤;ÈѾ|)¤®¸<ÖôY$ÉnmÅÇm
+»ÂÏ=3sH1íºmW®!ir@ªD©[Â`ËÄ×µ]dêÉ3»ñ¦L'¨¼×cDÚDVî,kvwÜVÁMdeº#¬ÈÊ0vrepHT%á¹MTpGجÙ×yG]/uEûÁ
+ 0üä>ñTHa2x*$8yO<F¬'vßT8ÕmMÇu¸qVÉàÃàÝsnµ*a BÄÐRã "FÝÿôØ.2[ÿ¡¤T÷yß/üÉ©ãpÔ$)ϾÕó¡GÞAìd=Á<Ä'Û¥æÐW2v;Çí®M¬â&§ÇxMñû(_U"²éVÔú-ÁmOÇH÷ ÙÎ
+nzz¬× $I¬+Í>¤ÉÒãJá×*ñjØó[ N¯TM1V̾%¸B
à
'ÅðÂ×`Ü%Ã+GRuu
+£*Dº6Åáypë "Ã×æGÃZâðµ»)h=´º
+ÄeÝpø®×Ö,¢ûâ#E2[/B÷FZGW¢.3:]ñ#N$Ï@
Q£íETH5Öþð¬Ö±6EäD
+ÍÄ¡×Øúcy`âÃQ5R×<S¾ä>H1ÞÇzRô1P!cäùø:,
qYÏç è{AÝE¡îÒéS콤ðb/¼¹7qbSm\ò1(ûpë¬ISû÷_æåÁì?å×°=vXq=ͲEª1j÷PĨ
+#NNϨ
+£bL&¢ |{y Ѽ|(ú£ØåË2O¡Ë7i5rù&ÆKÞ#R ÊÑÆ"*FÆzK51P!aÄiê:Ï@
¦Ï@
§Ï@
1Æ)d<5üa!Dê¹<kÌ0ZVt¨t0VöP¯dÜ·Âeë.1P!aÄi6Ï@
¦>Ï@
1wð)RïÀ¨a7ãkF>MÕÎLÔ~¦¹ÚÉØ=0ÖË®6žÁö® @Ýã¯õØàVt9!ÂtoÒ©[½§Õ ÝÛ´¹»§ÕÝ´X{ÙýmÌ
+f
+ÿ:s|tÒF°sÞÿ®½Ò¿{ûìë¢Óõcÿþ7è~þoæ¥__¿{ÕÁeø;ã<<è¤s¶aáìÒ{ýúýëÿéëëïßþõëðΦ|zܶüµûåÓµþcó ,¬Rú ÂE>}äMùxë»=çY.]Ê?6RÝáòHLú¨Û¢,ºýÓÃiá-Åwµý
+á´ÇxÐ9.Ëãɹ`â-ù9`¶ôC<æÙÓÇpÌ!ü²¥¢1!½Ýby8ÃõõùìÒþhTR¶LÝ¢<£ß|òý7üôUª´Oþw+ÿÑúÓß¾¾þV¿¤u
+Ô~êú¡¿|ú*#©O¤¿Wr¤Ïþ{|ÿ×?ü@¿AÅû X4¿ÔcûOüéÛe¿ íDéÃÜçé÷ÃÅ|P¦~cìJ^½üÌ=¾ cº®R%T9cs dÂzTA¦áÝÿøw:àåÂJï¯'c85âÛSÓCÞzOÇÃ!=(ý=÷t°àÊ]´t:ß¾ÐÃÆܹßå=1Jï[1)ù)Ô&Ýú´¥Z£ê¶AµAܵ?á§ÕÚ¡ÃýiÜ«§ãá^÷t<JJP÷ÿ´'n«Ñ){à¾~1®¬Pûð`I)KPË ´B%*KEìPJ°{þþ°ÂÃþÛã{j[Ña\ßaOm:Ë;¥«çpXÞáIéY&EyØþ>&ùÇ:ÕI`|ÃÚnýþ»ÿÂvë¯?þî¾ùpj¶Äó³^ÚX?'WæwïÞ}ZJöëï¾ýñï~÷ã~üæÇíe¿óR(p5NÓ:u¢®¯C´¸/ûe¤Ó¸·WÎ.þðã7ÿýÝu©ÅU_jÈÜþw
¬×u9j=¯ëB £ Ý`X?(üÙÕ%¸z±F¼
RÁa¥ú|ʯÀº*¾nõâû,øæ:âÉ\yíFîÿõF`½=õèF®ìv#®±ßÞ _U¹ÎâV¾0ø^þ¾_|ñ1µÀUº&Y_þ£X.·¦ïóÿÏùµdÿ¼ýÂÑ9Õendstream
+endobj
+3 0 obj
+<< /Type /Pages /Kids [ 7 0 R ] /Count 1 /MediaBox [0 0 468 324] >>
+endobj
+4 0 obj
+<<
+/ProcSet [/PDF /Text]
+/Font <</F2 10 0 R >>
+/ExtGState << >>
+/ColorSpace << /sRGB 5 0 R >>
+>>
+endobj
+5 0 obj
+[/ICCBased 6 0 R]
+endobj
+6 0 obj
+<< /Alternate /DeviceRGB /N 3 /Length 2596 /Filter /FlateDecode >>
+stream
+xwTSÙϽ7½PÐkhRH
+½H.*1 JÀ "6DTpDQ¦2(à£C±"
Q±ëDÔqpIdß¼yïÍß÷~k½ÏÝgï}Öº üÂLX ¡XáçÅg`ð l àp³³BøF|Ølø½º ùû*Ó?Á ÿ¹Y"1 PçòøÙ\É8=W%·Oɶ4MÎ0JÎ"Y2Vsò,[|öe9ó2<ËsÎâeðäÜ'ã9¾`çø¹2¾&ctI@Æoä±|N6 (Ü.æsSdl-c(2-ãy àHÉ_ðÒ/XÌÏËÅÎÌZ.$§&\SáÏÏMçÅÌ07#â1ØYár fÏüYym²";Ø8980m-m¾(Ô]ü÷v^îDøÃöW~
+ °¦eµÙúmi ]ëP»ýÍ`/ ²¾u}qº|^RÄâ,g+«ÜÜ\Kk)/èïúC_|ÏR¾Ýïåaxó8t1C^7nfz¦DÄÈÎâpùæøþuü$¾/ED˦L Lµ[ÈB@øøÃþ¤Ù¹ÚøÐX¥!@~ (* {d+Ðï}ÆGùÍÑûÏþ}W¸LþÈ$cGD2¸QÎìüZ4 E@ê@èÀ¶À¸ àA(q`1àD µ `'¨u 46ptcà48.Ë`ÜR0)ð
+Ì@
ÈRt CȲ
XäCP%CBH@ë R¨ªê¡fè[è(tº
+C· Qhúz#0 ¦ÁZ°l³`O8ÁÉð28.·Àp|îOÃàX
+?§:¢0ÂFBx$ !«¤i@Ú¤¹H§È[EE1PLÊ
⢡V¡6£ªQP¨>ÔUÔ(j
+õMFk¢ÍÑÎè t,:.FW Ðè³èô8ú¡c1L&³³³Ó9
Æa¦±X¬:Öë
+År°bl1¶
+{{{;}#âtp¶8_\<N+ÄUàZp'pWp¸¼ÞïÅóðËñeøF|~?!( ®HB*a-¡ÐF8K¸KxA$õNÄp¢¸XI<D<O%¾%QHf$6)$!m!í'"Ý"½ ÉFdr<YLÞBn&!ß'¿Q *X*(ðV+Ô(t*\Qx¦W4TôT\¬¯X¡xDqHñ©^ÉHÄQZ¥T£tTéÒ´2UÙF9T9Cy³ròåG,ÅâCáQ(û(g(cTªOeS¹ÔuÔFêYê8
+C3¦ÐRi¥´oh´)J´JJÊq)¡Ñèéô2úaúuú;U-UOU¾ê&Õ6Õ+ª¯Õæ¨y¨ñÕJÔÚÕFÔÞ©3Ô}ÔÓÔ·©w©ßÓ@iikäjìÑ8«ñtmËî9çÜÖ5Í4#4WhîÓÐÖÒÖòÓÊÒªÒ:£õT®í¡ª½Cûö¤UÇMG ³Cç¤Îc
+ÃΨdô1¦t5uýu%ºõºº3zÆzQz
zíz÷ô ú,ý$ýú½úS:!·
+ñ,ÃÃ]ý¯b6u=2V30Î7n5¾kB6q7YfÒ`rÍcÊ2M3ÝmzÙ6³7K1«12ÍÌæ»Í-ÐNBLÓÃleZÒ---»,YXÅ[m³ê·úhmonÝh}ÇbhShÓcó«-׶ÆöÚ\ò\ß¹«çvÏ}ngnÇ·ÛcwÓjb¿Á¾×þ£È¡ÍaÒÑÀ1ѱÖñÆ
+cmfwB;y9v:æôÖÙÁYì|Øù¦KKË£yÆóøóç¹ê¹r\ë]¥n·D·½nRw]w{û}Gǧ©gªçAÏg^Ö^"¯¯×lgöJö)oÄÛÏ»Ä{ÐâåSísßWÏ7Ù·ÕwÊÏÞo
ß)´ÿ6ÿZÜæ©@ÇÀ}A¤ AÕAÍEÁ=!pH`Èö»ó
+ççw
ÐÐí¡÷ÂÃ
} ¯ aQÑ¿º`ɯ"½"Ë"ïDDI¢z££¢£_ÇxÇÇHcbWÆ^ÓÄuÇcã£ãâ§ú,ܹp<Á>¡8áú"ãEy.,ÖX¾øøÅ%%GÑ1-ï9¡ÎôÒ¥µK§¸lî.îooïÊ/çO$¹&'=JvMÞ<âRòTÀT§ú§Ö¥¾NMÛö)=&½=qTH¦ û2µ3ó2³Ì³³¤Ëí\6%
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 475
More information about the Stacomir-commits
mailing list