[Rsiena-commits] r128 - in pkg: RSiena RSiena/R RSiena/data RSiena/inst/doc RSiena/man RSiena/src/model RSiena/src/model/effects RSiena/src/model/effects/generic RSiena/src/model/ml RSiena/src/model/tables RSiena/src/model/variables RSiena/tests RSienaTest RSienaTest/R RSienaTest/data RSienaTest/doc RSienaTest/inst/doc RSienaTest/man RSienaTest/src/model RSienaTest/src/model/effects RSienaTest/src/model/effects/generic RSienaTest/src/model/ml RSienaTest/src/model/tables RSienaTest/src/model/variables RSienaTest/tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Dec 2 17:17:46 CET 2010
Author: ripleyrm
Date: 2010-12-02 17:17:45 +0100 (Thu, 02 Dec 2010)
New Revision: 128
Added:
pkg/RSiena/src/model/effects/generic/CovariateDistance2AlterNetworkFunction.cpp
pkg/RSiena/src/model/effects/generic/CovariateDistance2AlterNetworkFunction.h
pkg/RSiena/src/model/effects/generic/CovariateDistance2NetworkFunction.cpp
pkg/RSiena/src/model/effects/generic/CovariateDistance2NetworkFunction.h
pkg/RSiena/src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.cpp
pkg/RSiena/src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.h
pkg/RSiena/src/model/effects/generic/CovariateNetworkAlterFunction.cpp
pkg/RSiena/src/model/effects/generic/CovariateNetworkAlterFunction.h
pkg/RSiena/src/model/effects/generic/MixedNetworkAlterFunction.cpp
pkg/RSiena/src/model/effects/generic/MixedNetworkAlterFunction.h
pkg/RSiena/src/model/effects/generic/MixedTwoPathFunction.cpp
pkg/RSiena/src/model/effects/generic/MixedTwoPathFunction.h
pkg/RSiena/src/model/tables/MixedConfigurationTable.cpp
pkg/RSiena/src/model/tables/MixedConfigurationTable.h
pkg/RSiena/src/model/tables/MixedEgocentricConfigurationTable.cpp
pkg/RSiena/src/model/tables/MixedEgocentricConfigurationTable.h
pkg/RSiena/src/model/tables/MixedTwoPathTable.cpp
pkg/RSiena/src/model/tables/MixedTwoPathTable.h
pkg/RSiena/src/model/tables/TwoNetworkCache.cpp
pkg/RSiena/src/model/tables/TwoNetworkCache.h
pkg/RSienaTest/doc/sienaTimeFixDoc.tex
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2AlterNetworkFunction.cpp
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2AlterNetworkFunction.h
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2NetworkFunction.cpp
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2NetworkFunction.h
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.cpp
pkg/RSienaTest/src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.h
pkg/RSienaTest/src/model/effects/generic/CovariateNetworkAlterFunction.cpp
pkg/RSienaTest/src/model/effects/generic/CovariateNetworkAlterFunction.h
pkg/RSienaTest/src/model/effects/generic/MixedNetworkAlterFunction.cpp
pkg/RSienaTest/src/model/effects/generic/MixedNetworkAlterFunction.h
pkg/RSienaTest/src/model/effects/generic/MixedTwoPathFunction.cpp
pkg/RSienaTest/src/model/effects/generic/MixedTwoPathFunction.h
pkg/RSienaTest/src/model/tables/MixedConfigurationTable.cpp
pkg/RSienaTest/src/model/tables/MixedConfigurationTable.h
pkg/RSienaTest/src/model/tables/MixedEgocentricConfigurationTable.cpp
pkg/RSienaTest/src/model/tables/MixedEgocentricConfigurationTable.h
pkg/RSienaTest/src/model/tables/MixedTwoPathTable.cpp
pkg/RSienaTest/src/model/tables/MixedTwoPathTable.h
pkg/RSienaTest/src/model/tables/TwoNetworkCache.cpp
pkg/RSienaTest/src/model/tables/TwoNetworkCache.h
Modified:
pkg/RSiena/DESCRIPTION
pkg/RSiena/R/effects.r
pkg/RSiena/R/effectsMethods.r
pkg/RSiena/R/initializeFRAN.r
pkg/RSiena/R/sienaModelCreate.r
pkg/RSiena/R/sienaTimeTest.r
pkg/RSiena/R/sienaeffects.r
pkg/RSiena/changeLog
pkg/RSiena/data/allEffects.csv
pkg/RSiena/inst/doc/s_man400.pdf
pkg/RSiena/man/RSiena-package.Rd
pkg/RSiena/man/setEffect.Rd
pkg/RSiena/man/sienaModelCreate.Rd
pkg/RSiena/src/model/EpochSimulation.cpp
pkg/RSiena/src/model/effects/CovariateDistance2AlterEffect.cpp
pkg/RSiena/src/model/effects/EffectFactory.cpp
pkg/RSiena/src/model/effects/generic/NetworkAlterFunction.h
pkg/RSiena/src/model/ml/MLSimulation.cpp
pkg/RSiena/src/model/tables/Cache.cpp
pkg/RSiena/src/model/tables/Cache.h
pkg/RSiena/src/model/variables/DependentVariable.cpp
pkg/RSiena/src/model/variables/DependentVariable.h
pkg/RSiena/src/model/variables/NetworkVariable.cpp
pkg/RSiena/tests/parallel.Rout.save
pkg/RSienaTest/DESCRIPTION
pkg/RSienaTest/R/effects.r
pkg/RSienaTest/R/effectsMethods.r
pkg/RSienaTest/R/initializeFRAN.r
pkg/RSienaTest/R/sienaModelCreate.r
pkg/RSienaTest/R/sienaTimeTest.r
pkg/RSienaTest/R/sienaeffects.r
pkg/RSienaTest/changeLog
pkg/RSienaTest/data/allEffects.csv
pkg/RSienaTest/doc/s_man400.tex
pkg/RSienaTest/doc/simstats0c.tex
pkg/RSienaTest/inst/doc/s_man400.pdf
pkg/RSienaTest/man/RSiena-package.Rd
pkg/RSienaTest/man/setEffect.Rd
pkg/RSienaTest/man/sienaModelCreate.Rd
pkg/RSienaTest/src/model/EpochSimulation.cpp
pkg/RSienaTest/src/model/effects/CovariateDistance2AlterEffect.cpp
pkg/RSienaTest/src/model/effects/EffectFactory.cpp
pkg/RSienaTest/src/model/effects/generic/NetworkAlterFunction.h
pkg/RSienaTest/src/model/ml/MLSimulation.cpp
pkg/RSienaTest/src/model/tables/Cache.cpp
pkg/RSienaTest/src/model/tables/Cache.h
pkg/RSienaTest/src/model/variables/DependentVariable.cpp
pkg/RSienaTest/src/model/variables/DependentVariable.h
pkg/RSienaTest/src/model/variables/NetworkVariable.cpp
pkg/RSienaTest/tests/parallel.Rout.save
Log:
New effects for multiple networks. More ML.
Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/DESCRIPTION 2010-12-02 16:17:45 UTC (rev 128)
@@ -1,8 +1,8 @@
Package: RSiena
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.127
-Date: 2010-11-25
+Version: 1.0.12.128
+Date: 2010-12-02
Author: Various
Depends: R (>= 2.9.0), xtable
Imports: Matrix
Modified: pkg/RSiena/R/effects.r
===================================================================
--- pkg/RSiena/R/effects.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/effects.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -288,8 +288,8 @@
}
for (k in seq(along=xx$depvars))
{
- if (types[j] == 'behavior' &&
- attr(xx$depvars[[j]], 'nodeSet') == nodeSet)
+ if (types[k] == 'behavior' &&
+ attr(xx$depvars[[k]], 'nodeSet') == nodeSet)
{
objEffects <-
rbind(objEffects,
@@ -864,13 +864,15 @@
covarNetNetEff<- function(othernetname,
covarname, poszvar, moreThan2, name)
{
- if (poszvar && (!moreThan2))
+ objEffects <- createEffects("covarNetNetObjective", othernetname,
+ covarname, name=name,
+ groupName=groupName, group=group,
+ netType=netType)
+ if (!(poszvar && (!moreThan2)))
{
- createEffects("covarNetNetObjective", othernetname,
- covarname, name=name,
- groupName=groupName, group=group,
- netType=netType)
+ objEffects <- objEffects[objEffects$shortName != "covNetNet", ]
}
+ objEffects
}
###################################
## start of function getEffects
Modified: pkg/RSiena/R/effectsMethods.r
===================================================================
--- pkg/RSiena/R/effectsMethods.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/effectsMethods.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -21,11 +21,23 @@
sink(fileName, split=TRUE)
}
- if (expandDummies && (includeOnly && !all(x[x$include, "timeDummy"] == ",")
- || !all(x[, "timeDummy"] == ",")))
+ interactions <- x[x$shortName == "unspInt" & x$include &
+ x$effect1 > 0, ]
+ if (expandDummies)
{
- x <- sienaTimeFix(x)$effects
- x <- fixUpEffectNames(x)
+ if(includeOnly && !all(x[x$include, "timeDummy"] == ",")
+ || !all(x[, "timeDummy"] == "," ))
+ {
+ x <- sienaTimeFix(x)$effects
+ x <- fixUpEffectNames(x)
+ }
+ else
+ {
+ if (nrow(interactions) > 0)
+ {
+ x <- fixUpEffectNames(x)
+ }
+ }
}
if (nrow(x) > 0)
{
@@ -34,7 +46,7 @@
endowments <- !x$type[x$include] %in% c("rate", "eval")
timeDummies <- !x$timeDummies[x$include] == ","
specs <- x[, c("name", "effectName", "include", "fix", "test",
- "initialValue", "parm")]
+ "initialValue", "parm")]
if (includeOnly)
{
specs <- specs[x$include, ]
Modified: pkg/RSiena/R/initializeFRAN.r
===================================================================
--- pkg/RSiena/R/initializeFRAN.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/initializeFRAN.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -451,10 +451,11 @@
else
{
z$targets <- rep(0, z$pp)
- z$targets2 <- 0
+ z$targets2 <- ans
+ z$targets2[] <- 0
z$maxlikeTargets <- rowSums(ans)
z$maxlikeTargets2 <- ans
- z$mult <- 1
+ z$mult <- x$mult
z$nrunMH <- z$mult * sum(z$maxlikeTargets[z$effects$basicRate])
}
}
Modified: pkg/RSiena/R/sienaModelCreate.r
===================================================================
--- pkg/RSiena/R/sienaModelCreate.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/sienaModelCreate.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -23,10 +23,10 @@
n3=1000, nsub=4, maxlike=FALSE, diag=!maxlike,
condvarno=0, condname='',
firstg=0.2, cond=NA, findiff=FALSE, seed=NULL,
- pridg=0.1, prcdg=0.1, prper=0.3, pripr=0.25, prdpr=0.25,
- prirms=0.0, prdrms=0.0, maximumPermutationLength=40,
+ pridg=0.05, prcdg=0.05, prper=0.2, pripr=0.3, prdpr=0.3,
+ prirms=0.05, prdrms=0.05, maximumPermutationLength=40,
minimumPermutationLength=2, initialPermutationLength=20,
- modelType=1)
+ modelType=1, mult=4)
{
model <- NULL
model$projname <- projname
@@ -93,6 +93,7 @@
model$maximumPermutationLength <- maximumPermutationLength
model$minimumPermutationLength <- minimumPermutationLength
model$initialPermutationLength <- initialPermutationLength
+ model$mult <- mult
class(model) <- "sienaModel"
model
}
Modified: pkg/RSiena/R/sienaTimeTest.r
===================================================================
--- pkg/RSiena/R/sienaTimeTest.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/sienaTimeTest.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -62,10 +62,10 @@
{
use <- !fitEffects$basicRate
}
- if (sienaFit$maxlike || sienaFit$FinDiff.method)
- {
- stop("Not yet implemented for finite differences or maxlike")
- }
+ # if (sienaFit$maxlike || sienaFit$FinDiff.method)
+ # {
+ # stop("Not yet implemented for finite differences or maxlike")
+ # }
## Identify the effects which will potentially be tested
baseInFit <- use & !grepl("Dummy", fitEffects$effectName)
@@ -183,25 +183,22 @@
derivs <- sienaFit$sdf2[ , , estimatedInFit, estimatedInFit,
drop=FALSE]
DF <- array(0, dim=c(nSims, nWaves, nEffects + nDummies,
- nEffects + nDummies))
+ nEffects + nDummies))
DF[, , 1:nEffects, 1:nEffects] <- derivs
- ## copy over the others
- subs1 <- cbind(rep(1:nSims, 2 * nDummies),
- rep(toTest$period1[ttt], each=nSims * 2),
- c(rep(toTest$rowInD[ttt], each=nSims),
- rep(nEffects + 1:nDummies, nSims)),
- c(rep(nEffects + 1:nDummies, nSims),
- rep(toTest$rowInD[ttt], each=nSims)))
- subs2 <- cbind(rep(1:nSims, 2 * nDummies),
- rep(toTest$period1[ttt], each=nSims * 2),
- c(rep(toTest$baseRowInD[ttt], each=nSims),
- rep(1:nEffects, nSims)),
- c(rep(1:nEffects, nSims),
- rep(toTest$baseRowInD[ttt], each=nSims)))
- DF[subs1] <- derivs[subs2]
- D <- t(apply(DF, c(2, 3), mean))
+ for (wave in 2:nWaves)
+ {
+ thisWave <- toTest$period == wave & toTest$toTest
+ subs1 <- (1: (nEffects + nDummies))[thisWave]
+ subs2 <- toTest$baseRowInD[thisWave]
+ DF[, wave, subs1, subs1] <- derivs[, wave, subs2, subs2]
+
+ DF[, wave, subs1, 1:nEffects] <- derivs[, wave, subs2, 1:nEffects]
+ DF[, wave, 1:nEffects, subs1] <- derivs[, wave, 1:nEffects, subs2]
+ }
+
+ D <- t(apply(DF, c(3, 4), mean))
}
- ## We have now set up all of the ingredients properly, so we may proceed
+ ## We have now set up all of the ingredients properly, so we may proceed
## with the score type test of Schweinberger (2007)
fra <- apply(G, 3, sum) / nSims
doTests <- toTest$toTest
@@ -285,6 +282,7 @@
IndividualTestStatistics=individualTest,
CovDummyEst=jointTest$covMatrix,
Moments=G,
+ Deriv=D,
BaseRowInD=match(which(baseInFit),
which(estimatedInFit)),
Waves=dim(G)[2],
Modified: pkg/RSiena/R/sienaeffects.r
===================================================================
--- pkg/RSiena/R/sienaeffects.r 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/R/sienaeffects.r 2010-12-02 16:17:45 UTC (rev 128)
@@ -204,7 +204,7 @@
timeDummy=",",
include=TRUE, name=myeff$name[1],
type="eval", interaction1="", interaction2="",
- character=FALSE)
+ period=1, group=1, character=FALSE)
{
if (!character)
{
@@ -214,7 +214,9 @@
myeff$name == name &
myeff$type == type &
myeff$interaction1 == interaction1 &
- myeff$interaction2 == interaction2
+ myeff$interaction2 == interaction2 &
+ (is.na(myeff$period) | myeff$period == period) &
+ myeff$group == group
if (sum(use) == 0)
{
stop("Effect not found")
@@ -231,6 +233,6 @@
myeff[use, "timeDummy"] <- timeDummy
print.data.frame(myeff[use, c("name", "shortName", "type", "interaction1",
"interaction2", "include", "parm", "fix", "test",
- "initialValue", "timeDummy")])
+ "initialValue", "timeDummy", "period", "group")])
myeff
}
Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/changeLog 2010-12-02 16:17:45 UTC (rev 128)
@@ -1,3 +1,59 @@
+2010-12-02 R-forge revision 128
+
+ * data/allEffects.csv: removed to effect from bipartite bipartite,
+ added altDist2W and simDist2W to group covarNetNetObjective.
+ * R/effects.r: fixed bug meaning covNetNet effect was not added
+ for behavior variables. Altered code for covarNetNetEff to cope
+ with new effects.
+ * R/effectsMethods.r: now interaction names may be expanded even
+ in the absence of time dummies.
+ * R/initializeFRAN.r: make targets2 for maximum likelihood a
+ matrix of the correct size, containing zeros.
+ * R/initializeFRAN.r, R/sienaModelCreate, man/sienaModelCreate.Rd:
+ Add multiplication factor, altered default ML probabiltities
+ * R/sienaEffects.r: added period and group to setEffect so can set
+ initial values on basic rates.
+ * src/model/effects/CovariateDistance2AlterEffect.cpp: fixed a bug
+ in calculation with parameter set to 2.
+ * src/model/effects/EffectFactory.cpp,
+ src/model/effects/generic/CovariateDistance2AlterNetworkFunction.cpp
+ src/model/effects/generic/CovariateDistance2AlterNetworkFunction.h
+ src/model/effects/generic/CovariateDistance2NetworkFunction.cpp
+ src/model/effects/generic/CovariateDistance2NetworkFunction.h
+ src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.
+ cpp
+ src/model/effects/generic/CovariateDistance2SimilarityNetworkFunction.h
+ src/model/effects/generic/CovariateNetworkAlterFunction.cpp
+ src/model/effects/generic/CovariateNetworkAlterFunction.h
+ src/model/effects/generic/MixedNetworkAlterFunction.cpp
+ src/model/effects/generic/MixedNetworkAlterFunction.h
+ src/model/effects/generic/MixedTwoPathFunction.cpp
+ src/model/effects/generic/MixedTwoPathFunction.h
+ src/model/effects/generic/NetworkAlterFunction.h
+ src/model/tables/MixedConfigurationTable.cpp
+ src/model/tables/MixedConfigurationTable.h
+ src/model/tables/MixedEgocentricConfigurationTable.cpp
+ src/model/tables/MixedEgocentricConfigurationTable.h
+ src/model/tables/MixedTwoPathTable.cpp
+ src/model/tables/MixedTwoPathTable.h
+ src/model/tables/TwoNetworkCache.cpp
+ src/model/tables/TwoNetworkCache.h
+ src/model/tables/Cache.cpp
+ src/model/tables/Cache.h
+ added new effects: to, altDist2W, simDist2W. Altered altDist2 and
+ simDist2 to be generic effects which use same functions as
+ altDist2W, simDist2W. New two-network cache with mixed-two-path
+ table.
+ * src/model/ml/MLSimulation.cpp: changes to ML routines
+ * src/model/variables/DependentVariable.cpp,
+ src/model/variables/DependentVariable.h: added calculation loop
+ for rate effects depending on behavior variables, and stored
+ the product term for the scores. Also stored product term for
+ model type B scores.
+ * src/model/variables/NetworkVariable.cpp: fixed bug in
+ calculation of symmetric model type BFORCE scores.
+ * R/sienaTimeTest.r: added code for finitedifferences and ML fits.
+
2010-11-25 R-forge revision 127
* man/s_man400.tex: updated examples of sienaTimeTest.
Modified: pkg/RSiena/data/allEffects.csv
===================================================================
--- pkg/RSiena/data/allEffects.csv 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/data/allEffects.csv 2010-12-02 16:17:45 UTC (rev 128)
@@ -174,5 +174,6 @@
nonSymmetricBipartiteObjective,outdegree^(1/#) xxxxxx activity,sum outd. x degree^(1/#) xxxxxx,outActIntn,TRUE,xxxxxx,,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,2,objective,NA,NA,0,0,0,0,dyadic
nonSymmetricBipartiteObjective,from xxxxxx agreement,"mixed triplets XWW, W = xxxxxx",from,TRUE,xxxxxx,,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,0,objective,NA,NA,0,0,0,0,dyadic
bipartiteBipartiteObjective,outdegree^(1/#) xxxxxx activity,sum outd. x degree^(1/#) xxxxxx,outActIntn,TRUE,xxxxxx,,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,2,objective,NA,NA,0,0,0,0,dyadic
-bipartiteBipartiteObjective,xxxxxx to agreement,"mixed triplets XWW, W = xxxxxx",to,TRUE,xxxxxx,,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,0,objective,NA,NA,0,0,0,0,dyadic
covarNetNetObjective,from xxxxxx agr. x same yyyyyy,"m.tr. XWW, W = xxxxxx, same yyyyyy",covNetNet,TRUE,xxxxxx,yyyyyy,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,0,objective,NA,NA,0,0,0,0,dyadic
+covarNetNetObjective,yyyyyy alter at distance 2 on xxxxxx,yyyyyy alter at distance 2 on xxxxxx,altDist2W,TRUE,xxxxxx,yyyyyy,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,1,objective,NA,NA,0,0,0,0,
+covarNetNetObjective,yyyyyy similarity at distance 2 on xxxxxx,yyyyyy similarity at distance 2 on xxxxxx,simDist2W,TRUE,xxxxxx,yyyyyy,eval,FALSE,FALSE,FALSE,FALSE,FALSE,",",0,0,objective,NA,NA,0,0,0,0,
Modified: pkg/RSiena/inst/doc/s_man400.pdf
===================================================================
--- pkg/RSiena/inst/doc/s_man400.pdf 2010-11-25 17:39:16 UTC (rev 127)
+++ pkg/RSiena/inst/doc/s_man400.pdf 2010-12-02 16:17:45 UTC (rev 128)
@@ -509,21 +509,14 @@
/Filter /FlateDecode
>>
stream
-xÚVKoã6¾ûWè(#âCí)»´[ i¸§Ýd¶ÕèáJ²SÿûÎpd¯å*-
-9ùæ=dl8øa¿óý°Ý>pkx°X\
-&Ó$0<eÛ`±
-¾Y=:Ügå<±×M;ÿ}ñÈ,×Ló ½ÔËçû§»o¤Ã¦õíЮí¦&ôÅ
-Rj¡Q(ÒYà,=öK;W<lJ{ë
-6r0ggo¤ xÂd¢
Lð,³© ¼ç}¿0èá×ÏÅ®tÇÐéD)a !fRHBXÌïØFp/uñÇ
-ì"ËÀ-¥È2C %"iV«ñ¡êqq$èfMßÿ´¬¾GTá'·ËÚ¾r52ö&|é³ãÓÍ#g<,òî{:zÚ¹vå$>6eé6nd4@R|ÜT:xýÔ 2¯.ç7`
º!@óx2÷EðÅtl&Ò4È«Ù3ééßNÜáö¡âÁ§fö+ü®±O¬Ñ 9ºö- ÓÀO:ÁèËä2êgÜjrðnÙõm÷ïä// "®
-ô
è¹îiGê6É©¾Æ*>wצUçÞ*ª} i¤IÃÏõÁu}±¹ LDKûjW´EN
-O*(
-ߣÁUûJwÐEÇ®è¦å%rfÿÍàÃã0oªÝª÷É®m6mVS¿Í|¡|e ä
-?%Ô<kÛÂ! þÝcájB(V.¸I~ }®N>£È$ªêÏ+WXÓ1;xçË=H¹5 hB4̦ú2bíë å9ô\Qo¼OñØ0¤4JX¬uV9m 6jÀÝ{·"zEÁtÚE£öûâ©ód8ú¢CãÅüv3%êqÈ5]¯þÕ¿sýÀ\²ÿaÒ
-Ó3Q*\l©"¯#ìKÏØ!Â.*دqÄM¶,æ|âª×<\öò¦²tS
-ªlÅAP¥[M¨´%öõüϦTj¦¾Íým;Gý[ÒK®ßu°ÍïxßK`ÜS5}y¡×¹BVnܱæ[ä¨áî*â;\¯ã~IØ»üD8áÕ ÎV?Oø¥XjÎñf·ðyòyïÐYç=oqøö'µ%F
.k¾3FSxFÀ þÏ©lù?òN
-.ýf}Gx»|øPÊB¨ÍÕdk¨Í³¢îðnÔ)Ãt"¿µEßÃLð?¶páç¦_]ºû%iýáÇÕû¢ÎiøXPé`8/=#Ìö<Ô\áq~ú¸vãÚAxèùëÞû¸m±42G"àQá6å ]½».qÜ*¯ J<¿:&xü
- ¤D
+xÚVÉrã6½ë+x$«L±09yÆv2©²±5§(
+sQHÊþ>Ý ©:©ªD ÑýzA/ Á6 ÁOúÎ÷Ãrq}ÏTÀ¢fÁr0ÁH@³pfå:ø>duÄUxÈÊ(¦~_þ²z"ËQ,h'õüéîñfàèÐ(ub{EhÛvES{ôÐAÊ)IW(+AK3ýÖF
ÍkÒÎ:iÂW\#ÌÉÙë{¡(î b<CLÊ=ÞÓ¡ßô@ð«Ã§b_Úãhü±!k@ DpááaSyáòx¸çºøc
+vÍyËÀ-)½eB baÒ#©v¡êqqôÐÍÆý®eýC'B·vµ}ekdìÏuøÜg=Ƨbg,,òîGôxøF²åÚK|lÊÒníÄh0ÔÃÀÉtpûÖæ¶B]«(v6z ~åq95Îz·\0XÐLK¢¨Õ "
+òjñçB¸Cÿï#÷@¸¾¯XpÛ,>Ãï{dGäøÚe¿H9¦<7&H|Âò®Ý¬º¾Íòþ«Kè@Ìò1° }P
ÌDQ:ëàôTXTFʪ¨%Ü /4üT¿Ú®/¶g¤Mq¶~sWí¶È}í¦á£
äIÃ7ähpÕ¾ø( cWts2NsCf÷ÍàÃh7Õþ Ý»ë¾m¶mVy¦~¹BâHC¸ÈsÈùÔ£æYÛîsVq²ÒaÒÞ ÏÕè3l¼DÕ@pmËc:Ų¯Îùò Ò`ní= hB4ÌQS}±öeÍòʨ·Î':u¦!ô ëcUEî7LM7ànÀ½]{zå5é~M*﫣ζásèµGÙ%íjNå%ãp×ht½þWkÜÎösIþyzN+4ÎDÊp¹óyazÚÖ<QfQ°ß`w-'-elfJMsæ9RÆ©!a at uÍÍ ³2¨³´ëFÄXOÏpñÙJEä÷~0 ¿í°Wç¨çõz×µ«:Øæs¼o0|6}9¡H"+·vXó=r¾alñ&ë´ÞxvÇ®?Nx0ðÕO3~IêS¼[º{ãÒß[:Ü8ï¾Ê:ç \÷elÖ?f.1døNMá³þgW6ì÷îß]¸¡f\E8»\¸P
+
+!Tú¢³5¾Ì³¢îp:ªó+Ã4ßÚ¢ï¡'¸k[¸p}ÓÎÝÄý
+A~ýaÇÕÏ¢Î+liøPøÔÁ°Nj6GÝ©©ÙÂá®\÷±íÖ¶ðPóµ÷q×bjdÃ{ÂnËA
+¹xr¿àSÆ©×gÓÖo¿{Ï£'
endstream
endobj
345 0 obj <<
@@ -3393,29 +3386,39 @@
/ProcSet [ /PDF /Text ]
>> endobj
749 0 obj <<
-/Length 3048
+/Length 3050
/Filter /FlateDecode
>>
stream
xÚµZYÛÈ~÷¯Pö¬6oz$>bo0`ìG긦H-ëߧ®¦H{²'6ÝÕÕu~Õ»Ø.ÜÅÏ\y¾ºyvõ.ÐUÞâæn¤ÊuEiåFzq³YüìxJûËÖ^èüßçåv¹òãЩͩM¹6Íòß7»z,RF^lÜÅJ'ÊORæðÓΰ(®Áõ4?Ôa¤7u4ÿÓû·_sõbSÛIÏcÞâ3qò߳á6ë<kÍ?´»¬åOÇ¥8UÇdémegZ&û¬Ä¹]Vð¬Ü§V¥aBU3a_ÕB©Maîaè0ϱX%òÃÔºø
-®dzÏä0LØvLÉ÷ÂìAÈ'$bÉOY:¥vêj[g{µ\¥ëÜXý²SeWæ²<æ¢VËâÊB>Â]UóìªúJg\ç ñqøh0/ÑÎu×î`%Î%$R/R>ù¯S7B¿ÁeÕ¿½T¯RÇsµÃÀóCá§;´q"¢á=Î ¦yU2!P.~qC÷PWxàû¿3ÑçsÇþHgæY{\~ëb´
-GÉ\ÇáA IZØHı:?~7/«H'Î?˼ߪÅÁ'À'#ÏycYÝñÑF?µY7m¾n¾B8»_\bÃß_ÌÖ¨Ðm׶WWª¦¢£~QÙZu¯ÜÙÕyhÅGõû ömÖäk¼_ÉX8 Çõß)ÁqI¤×ú3OÚËlä·½Ä
)ø=§,Ô§¶ÅÏDµþ4÷
-?¡\=¥¡íx÷Ù#Û=:ÖÎ+Rå^©ósEÖáCÖ!RÁè"H/ÍH©«[fv¹rÎ|"g]ùdUtä²ÚLÏñ§à
f[ô°z'$ mÊdb%'?v¶2í5ñÐJ/Î÷I©uü`*.ÎÈ.¤©ÿ (ÍêrÆÉ¿ vçíÆÙVêÁ®! µæÀÆYçÅFOLfläGfkν8NtÞ£7r
<5@;+Îek[µe·ç,M#§@÷dtÐ
-CÓ´öSËÍÅ7² ñÀK/Æ,Nz{!7Ò¸ uV¬»"ãøÁ/§Á°-ÈÕf꺪á[ÄðáTüùåñ¡ZÍÕ$[Ps¤Q¨û¬þëлe0\¯YÓËyRq ôÔöáÑδ0
)TÀÃÄNËmEF' ®@Üqº
-¤5©gæ$ëªlr0éÏ¢ÅkZfbðïUsÈ˪©l([§9ç;ÅWb^Ëï÷ïu.-ýÎdª/ìÔvà9áX`=S%Ï`Á+½l?_uì]Ï(ÉåÐ?$3N;>àý'¶¡$°-iÛ¾'ÙâÀ£Q& àÝfþzòãDîÛ|ÙAQÊ 11Ãg93îÊr¾·ÑVIÜ77×CÍt7µ7èn0vÀ³FvM¶áQ»««n»c)8a uÅEú¼Ï ´®â%%¹Qô_ Ï0ü]&ÑØ`7<°f]Cj5¤²BÿüåÆø7ü¥1zu@
³Ïò$<kB+dü×Ðl£êäVõ
-aú*_!m( É>ya)×˪iù5M.t-â&à=À¾ÛãÔ¹ñ¢PE ¯ØÎGæ½
qwd~½B
-Üá!p,©ø_Ô×t<«4§DɺÀ§¤)-cZm¶ À &ï±÷8e4Dõ>^³êQ(I:êuÕä·Å±_t~ôU«hQ¾Íy$À^|Øa(@öÁW&ËÁbQQ·§rêZùL½(Çc)ºXSf2»ÈÓIeCm)²@ùû§yÕÕVMm`ãÎ`#BN9ò¥®áDø°Ã,;;~Áa£ì´æÖÛóXò(¯JìªQ«ßg
-£S£wÉscD*ðá5É°ªýO;¦©Òá×£ÀS®ïÛY§ÛÜ-°§ ®Z¼±>ßQl QÜÄù3uNx^2vt`ý!pqÃã=#kô@º&ó
-MbåɯH*ÖÔàt- ý'Á$ 6tqÃ;¡R0À³³Ó$kMÃÑóà%ô'зýñõÇ·7çÒ¡JýÔJ{5ÃJë=ͦh½;cV£:~õ.IDʱtÀ:a¯wf½]}ÅÆ'ïñ÷ÆÄ¿`.í+/<| Çè`\ÝÇÃ0gP%Tna ÝPâ84BÌVté£¼È ô33R8ÌÙ!VBg·éÂxèV>ÂëýJî_$B"_Eq2¹²ºôåÑVÆ«ë«¿lþoþDúÍè4P¡îD!+¹,ôCoª ïXñ¹±÷4ìõÔ¥RU
-5hr6³!#Ûã.¡^¢Õ?D¸³Þß(H äZ¹*·ù2àç©|â;>~ë·=ÕO*Á 8ôµe
'´ì%µBÙyæyJq ?;AËZwÐl
-.'(%/¡[,
-Òk¬'ÖIÑÙplËÍ%êAMüGjvöarm[ËuÜñpb>tà0VaÜC¶þuôiÖu~ÀD6û£ô;2ÖÌí!Ý /»áäà Ó4#¾ºÇk®¬æÛÕá¢Ö'ÒÀp͹á.2Ô¨òÔ+ö eµ!MÅ£MÞ~½ ôkDxâV®[Φ»[\¨N A½¸7`ÕµBQÔOê "*Í%ómb_ÅA&(w«¯ F"µ3xÃÜ;3Øikdàüg¢J¯zÇÏN8Z 8mÄ©P{ìc½m»\Y÷»X±<h6]ô, yáÿ«b=µÆÅÎäÎ0=HbþIH?JóÀô{ò2 Ô%ÉÀÙ:' ´ä*⯢B½osZfÿ
°.±¡@-
¯~ âtb[LÃA1¤ÿ§s~ɺ¶Ú¨ZC:<2¼ãl^-\l3/Ñ $Òå8UwbÖò3¿ï3î/ ÐÁû8ÝFz$à ö¾+f
AhËk(öT2ùuJÓÏ$ø -IJ\0e&
-KCWÄPh³ú¤SMÆÏX»é'¯²¨²
-© çð0ÒÑm&ÅúY ·y)Ü<¹Ó?ѳ¸««ý\%Ã`¥áÞ¯ÚþJjPTMÛ©6tÜ;nèBqæºu©Èûfk|5èN¤ÇòÁ-vLr&49Þ¼æ±`tº=ôû ]:ò³ '¤~½aBmór¿éöÜNøá
-è碧ÝJ½@8¯¯_~dÞ¹BµC¥T»¥cTOZæd'ÓþMÀA~É
-:0]Àñ|7@Ù8afï`Z¤|)I×áµ³Ï0½c¢³5²åøå|
-^Øf#~öòu#¾ÞßvÛV¶/¦uÃØB}¦¤MY÷yÿÄÀ§Ìêü¬[1ÇðöUMÒËûa
-¹ì¢mà¡üGH÷e7r¥¾mìGþJp>°ÏÙÅô(bü49]¡d`)t9ã®"ú½v¢+|&WØZ2,<T²D'÷GÈ[¹ðüPФáºáS#b§#[Ñÿ¨üÚaçÌv ã6z¡¢í+íËÏéþØÆooý#ï¿
+®dzÏä0LØvLÉ÷ÂìAÈ'$bÉOY:¥vêj[g{µ\¥ëÜXý²SeWæ²<æ¢VËâÊB>Â]UóìªúJg\ç ñqøh0/ÑÎu×î`%Î%$R/R>ù¯S7B¿ÁeÕ¿½T¯RÇsµÃÀóCá§;´q"¢á=Î ¦yU2!P.~qC÷PWxàû¿3ÑçsÇ~cÖfsnÉ:èHA8È$, ðÖ d¢SçÇ/ ÖæÅr¥óÏ2ï¹·88òZ2><y²0zcYݽÑF?µY7m¾içûå*ô\çc÷«#SlxÎk0Ù5qíÚöðâêêááA5À¸QdÕ/*[«îóU2»:H1ôÈà u?ðÛ¬É×<8¾p@þê¾S¿<)ä´þÌ6Ç2ÛÓ!ñm/á`
+~Ï)ùômñ3QÍ}COè`/WOih?ÞÄýcöçö@GµóÔE©¢WêÀ<ÃTáEõóu¡fðº ÒK3RêJ<v!á>g>³®Vü²*ºV"RXm¦çÃÉÃ0SðD³- at zX½D4Le²;&/mÜÄló¿Ñh¯^Pj|Áp¾OBLãSqqæà@v!MýEjV7 3Nþ´;og4îȶR>pé 56Î:(0zâddz4c$?¢hL6[sîÅqò¤ðö½±T)äѬé ÚYq>;XÛâ¬-»¥8gi9º' V¦µgZn6(¾áÈP$¤z^z1fqÒÓܹ&pÀux¬³bÝÇ~¡\
+OH©å&«7<ÍÔuU7öváéæóËãCµ+E¶8 æ<H£PöYü1±Úy·LF)ð5k° C8Oê.À Úþð0<ÚÖ 0¥±Õ
+ØaxÁi9°Èè»Ðè;N×0±l´&õÌd]Mæ!ýÙP´0
+ÀÊLþ½jyY5
+eë1ç¼s§øJÌ`ùáþý£²Î¥¥ßLÂSõ
Ú\ 'ø
+¬gªä¹,f¥á竽ë93%ù£údÆi#Ò<þÄöж1mÛ·";Sxô#¸Äàº[Ê_oNÞc|È}w/;(JáBò!&føð,g¦Õ]Yη4:Ð*ûæúb¨¦&Q±öMMÆx`ÖÈ®µÉ6<jwuÕmw,' ¸H÷9ÖU¼¤1²$#3x>ò䱫Â$»ìÖ¬kH- SÒÊ
+ý#ðCãßðÆPêÕ9RÌ>ËXð¬ ]®ñ_@´ªW[¶Ö+Dç«0r~
´¡&ûPæ
¥\/«¦å×\6¹Ð¬÷ ûnCFRçÆB¾b;÷ÆÝùõ
+5pÀ±¤âQ;Óñ¬Ò%ë¦X´iµÙV l¼¶8ê)|¼fÕ1£PtÔëªÉoc¿èüè«4VÑ¢|ó
+H½ø8±ÃPì¯LÅ¢¢nOåÔµòZPÇRt±¦Ìdv)$+5<¦Ê.Ðÿ7Rÿd6ò÷%O="óª«2&ÛÁÆÁGräK]ÃðaY0vvüZ Ã"FÙ hͬ·ç±äQ^ØU£¿ÏF§ GïçÆTàÃÛaUûvLS¥Ã¯G§\ß·³N,¸=![`O÷>\µ( yc}¾£Ø@£¸ó[gêð.¼dìèÀûC !àâÇ{F 1
+Ö8.ét+LæÄÊ
+'ß:!?T©ÁéZ.8Aû'OI lè¾'wB¥`gg§IÖ£çÁKèO oûãëooÎ¥
+Bú©öj!>×{M1ÐzwÆFuüê]48céuÂ,^ïÌz 5»ú-9OÞã[ïÁ\ÚW^x.ù@ÑÀ¸º7`Ρ$K¨*Ü 0»¡$Äqh°S^â(/2(ýLæsv¥£ÃÙíDº0ºðz¿ûÈWQL® ¬®c+#½@y´ñêúê/[Àÿä?~D3:
+T¨{'QÈJîýÐ*Àã«U|nì=
+{=u©TB
+Z MãlÈÈöø§pä. ø!ÂõþFA!ÔÊUé¸Í?O5à_íñ[¿í©~RyŦ-+<¡e/y¨ÊÎ3ÏSùÙ ZÖ¼fkp7<A)y ÝbQ^c=±FL&Ìc[n.APjBà?R3´«´[lÛÂX®ãó¡±
+ã¾8²õg¨£oL³®ó&B´Ùw¥ß±fnA¼pè }Ù
+'ç¨ ¦ñð=^se5Ø.8¨µ>ÎkÎ
+w D½§^± -«¥á¸h*mòæPdl$ôëL !ÂG°rÝòp6ÝMÜâBuꎫ®=¢~RQi.±Ðoû*ú4y@¹ë¼l]}m1©Á.`äÞ¹¨ÁN[#ûK|ç?0à8UzÕ;~pDpÂÐj Åi#NÚc7ëmÛåʺßÅåA³é¢gÍÿ_뱬4.v&ÿ^$ ðèAó/1@ÊøQ¦ß(H æ(IÎNÔ9¡%WA
+øê}Ó2û¼(u
+Òl)äxõ§sØbi$ý<óKÖµÕ@ÕÒáIägójábqxN .Ç©ºã³_Ïø}qIÞÇé6ºÐ#O°Wô`\1+B[fXC±§ÉTz¼~&Á_LphIRä(Kì4iXº"BÕG$j2~ÆÚM¿t=EmHM8@ n34)¾ÐÏð¼ÍKáæÉþIÅ]]íç*þò*}÷vxõÐöWR¢jÚÖHu´y¤ãÞqC0×kLEÞ7[ã«é@§p
+ =n±K4`;0¡ÉñæÍ4;¤Ðí¡ßOètÈÐe8!eðë
+jûL·ðävÂ/\l@?§t=íVêB¤Äy}ýò#óÈZ¨E*¥Ú-s xÒ2÷ ;ö@lZðKVÐéîçK¼ÊÆ 3Èä4{|Ð"åKIº¯
+t}é«(§À'(çkð:À6Éô³×¨ñõF<ø¶Û®°²}1ͨÆê3%mÊj½Ïûøß>eVàgÝØ9·O¬j^ÞSÈeàhåÿoDº/»+õhc<òW;ðQ}Î.¦Gakå§Ééú%K¡ÌáÿtÑï
+°]á3¹ÂÖ
+aÙä1ä %:Ù¸?BÞÊç§&
+×
+;ÝðÙjþGåwÔ;`¶K·Ñxuh¯Xi_~N÷Ç6~{óì¿F¼K
endstream
endobj
748 0 obj <<
@@ -8187,7 +8190,7 @@
/D [1403 0 R /XYZ 88.008 808.885 null]
>> endobj
1400 0 obj <<
-/D [1403 0 R /XYZ 453.597 4439.089 null]
+/D [1403 0 R /XYZ 453.669 4439.089 null]
>> endobj
1402 0 obj <<
/Font << /F61 600 0 R /F8 356 0 R /F7 488 0 R /F11 770 0 R /F51 487 0 R >>
@@ -8565,23 +8568,32 @@
/ProcSet [ /PDF /Text ]
>> endobj
1447 0 obj <<
-/Length 2015
+/Length 2005
/Filter /FlateDecode
>>
stream
-xÚÍYMs㸽ϯPnTÕðS[<o%lR³¾íîa E* 8¶kÿ|ºÑ
-¯¼cOr" @£ûõënP,¶±øþàçÕÍ»÷×\È,N³"YÜÜ-ÖU,ÄzQ2
\ÜÔ¢«åJÊ$>îT»Õýry´éöeuM=×ÑS+Ûm©óeÊHÛÞtm¿üåæ/ï¯×*®¤ÀÄbÈxð&7;Ã+ß.WÉ:Ò[Óú,Roy·¿o\dz,MI¨¾æºÍÊ¢®mi~2M| ßMOr¿34F]õ³©Þðn§iµ¡ìRFñrUô³ÈÅ?l·µj¿Sâ ñPRÆUÓ¡ú]74(NÂÚ~hpÙ4ãeqtæ¯Ý`ÿ¬Ñ4¯kiìãç?þ@ÎÒÃoÆ>¯î:»åï¬>~ʨëQhã:ûq¹N£Ä(ë÷×2ØÀPe£Ó|Mç Êo¦¦ÄV
-ã~n"¤ %¬ü¬\_â^ɤøp²,`n" #Rd_C¸Uàêµ/ -aouwðLªèóF·Æ<áyëu§©ËÚ-hlºñKÃ
-ªih°Õ÷Ô¸ÓÊ
-ÖãÞ¾J/ìb[[M=)|= ï-§{Ç&ïX³þ 1ËòÉ9Ò fzökeÙwC»q ÿñK½Úó$ö$÷ÄÙëø9«Ø+ÇE^¼Ôl?S4Y91YJ&Céü¡@éÁ@Ô0^S{rm^ lùRa¯âêÑKÚÅÚnp¦ÕÁs¡LW R8ÕxG$ ³@}4
-Ãf¼7nGöø-°94<«Ö¼t[óÊA{9p5ê¶Ñ}üïR á/û=/.qøüÕ^þÞY¼v;lçLiYSeÝÙn?A(Gäþ`CêSô0-Ós«ªù~éúó¹[¢ÿmÄÉNc¶9º¤ :ÛCô¥d±jåµ0^ þI
-¦0Ç©ôl`§Ì_3ð!à¨qDCVo¡ËÛ{¿Ä=lù«0Ô·{Ó¯ÎÆÆÄgì´@äT_¬Äâ
J<ÇÈÃI³@ãY¤9àqÃNÚ;;lßUCê´Ôèvó¿{ßyÖºaƾ£`þ³üÄöLo
ZïIøÔæ4a³ãà:¥øÀ ¦Ý4CM%Ñ DgGï¸L°RO¯ýa¢OKC5NÉÚ° Øî XPF§|®Ï¾;ÕKi÷N¦§km!^.áhùµ$-VIrIgtòB(@<~JÐ ö$nÏa~¿Óíð!5fõ ¼ãip©dÍ9$OÐ;È´T3JBaD~?NÊ~9Cù! A¦0
-ò)
-ct§äïýu>:ÉD¼ù(ÆÓª³t|ÿ<²4ö$ª¼>TûUîÐÉÛæhè? T]ÀA½
-yZx+¤\
-$X±QÍfh{Ã:eÝSP²Öú±9!ÜtL(þfA±yæ´@OùZïuhET«D\
-Á&¹À-Ø÷)"ôo¿¡ÚÓ¬9±~D-«:ÄÇMwtXеÓÌæ;U+o(çäÌÐÕ¿¶æ9XòÈÂ:`¼¢ë Øàðò6 ö`Í4&$ö¡d
+¡7I7þ?¼"Xv,N¿¡7®É31ñFèL½±¤,Ñóu4£>Òâ
L+²èSçëÍ°÷X7.8P>T£àM\*·ÅàîvûØûêâñ\5/¨ÔVLþð¬Âèô¯£/Y¾|rÊ|ª6èIY ÚÒÁ±íÓüb£E<¶äôÆ M8uâù>y¸6z3÷ÅYàgªä+Õø@g¢èI£*qLéqR:hGÑ:IäaÐìJÐFEc¯-C _eÁÔ=Ó4CÎD,³ª² W4ëPÒÿÏæDurÁ¦ß|%|,×Gmcç¨mìI ùªä»áTôð*ÇñKxg°6¥uÆ;^ÇÅç¼"ñ>!¼3º>½ÀTnYõIxßµ ÇR~4-3pô¾v¶óh;ÈÓ+19?Åâ§U.Ö>K¸ßÏÊ@}ü¥hË%)þGã¯J¥ñßX¼Cà¹ÏgÛyxNÎJµ9þvh;É×aúeãAæ
è
-AÑs»rd.¿Þp"ý˩áÊánà 8åvL#Kôå$¿+Çü®ô¿^ fíS¤zåIõÊp^R4<ã:úK}u,§éÀicK´6!E;^LÎ@**$úoÂ="1)÷$SÕã+)%¨¾À,è|ñô¦Ã7Pg§¦e3(Ú¢íVôKÂ#u7îÉ">µâsSÅ3ð!@!ô6%ô9~¿þsÉPú dR¸"háBñ ¶')hvØôØ< öä:ñtRANÉ¿ñªyúð§wÿ|bè
+xÚÕYKs7¾ûWзa8æÁGªö°TmÅΣÔ=@$Db33à3Uûç·ÝÎPBÅa¶ö"<úñu÷PL¶1ùöàÿoo_½¹)äDi^̳Éíýd¹J
XNs¹Ün&?%o§3)³2¹Þ©f«ýt/Êdmë½rzC½ÖÒ\e´£Îçi.í¼±þóöoonUºgs<ILfLr»3¼óÝt-½5M(Õòæ
+öýºµ<ËÑLÕ4óDѬ"±MõHó7ºU¦OaÝP¡1êª
ÌõÏlwvë<4dâ¦2I§³r¾J~¥ø»³[§ê´D
+Q))ÓUYR~g»
+ÅÉs0Xã»
+·ÍÞG{i¾³[óJÓ<ÛÐØõ§¿~¤uôÅð~§O³{붼Îé=ØgXBÖ¢ÜÓe¤ ¶DY{¼¹ÅÀ/ UQ0± ÒâhÍÐØÊa<ÌÍ3ÍDvR®Ïñ@d¶üæh[ÀÜ@f FeNÛÿç9¤Hb¹¶ÎúÈTðkë4Ý=ó$ê<Ù:CÚ+ãgûÖ6 n£+ÿÌ3b&K°ãKeþðÖØ)xï:®<vÇÒ °7
+£f£ZÀ,"ùhe.ݲcM6>"3êõåÔú¨YÕ(0û
i@>òÿX÷I¦9ý7¤Ñ-"×^Ñ
+Uµïo³\±;MMýôr
+\«æcº
+¯Û÷QdpËSöÕòÔ;å _ý iLkTEÏÓ²PÕAÄó¸ÉêU£ÙÉfÚ>2ïÕº¦àT1V
+êVe'ot£>ôsí4è|A?Ý/¡$É"¹ë02dÔZ5&o¨&êÆá¹g,¢iÉ¡F¨ VmÚØÚç¡"Ò¹§©°a`̪ U|«üÈæ\w*(b¢¿zî*}é( ª%óä*jÏßZØÕ¾¥a˱ȡñ æl}
PÐÔÛ`d§µö4;6jõÅ«xie~ Ù®2;.=eW,Ý%±,´ª
+TÉQÌ9K1KÒ gÖ×'é?z¨m¡mÜØ
ø ÜT,pY0_)
°ÓíymW×Fû kX£ë°Á¢þ²ÅñæI{ǧ
+[ïâ>
+N) ñ_ðýê(_e:ùùÛOxÚïÓçX
+DPº\~-K Å,e~>K)Ïs±ì£(p¿@Dn ´ñhXÌÙ*ùôFQeÁwDSØz*3jUk»7qk at 85*Å"¹TܹC K/ÆîàA¼Ïb^
+-ÀÅ ¿°°?P¯¿R´ÊYè~Æxµrìû® xñ: ¿^Õ<IÅ3wà`(üv&/RùÜ|FËÜûbçÂÎÅá;¯óå|¡oC ÄE·p)Ñ@¼í ¼u¼B/X
¿ª(ÊPîH'Dõ ãÛhÞ
+í<ä=T·üÁ/¿>úÅ9Ñ_^0ú©¦D«eÐ'Ǧ²mD¥²ÇX0äÉ
+àDêÓ
·¿äØaè]á/£Ã1$ÅéÑéE`ÊZ¡~¡~ÐƸJ -"Ëò4äôV¹
+tùøxÛh^|w«tìþ*^x"³½TìJùzÄ9ýÀJyÜpúÖukHöñ¡ÿÝ2R
Üê-õðf}t)^Ècûa6bgEÆNÇÁ'éÊWÈý`uÕ^yÎUÄÐú«~ÊfÄ
+
+É^Øñݽ©¤Ç«S=º¾üjº=aLÊ$¸=¥§{m¡NìÿÜ,fÙ9ïGÅårs¼Jò2§9ªÙc|mHxl¾èù®ùRi+à[àªê¡â!¿íS±ZÐÌGnƦÂ,JÃXÔò½¹)2g
H¢ìÅxúØ;O¼ÿþ<~²Å
+¨¬¿úý Õ Ê. |R^©bÐ ]L` 7.`>MÄÛázt).ØmãÃ_nUµîªÁPO][åÚHħ©'¯§g<Ex²Ë!óÇ8ù7éqRù½«Y&ÎÀ`ôV¢*à/'²ìH §ÃM`ðjkâg,Nä;µ.½\4,)\õØ;*ìk ]ÖEÈ@JÑ\`ÎÂ'i"`ûGþ³÷Æõàwÿø+LøüøÊUÄÊUüq¸¤8,Ä ¡3ÃU"åã°\&#i±ªµ4#TXüI¦Íä
+FXã|<¯Cä»kÛï;x÷ø.Ud`ÑuKà®ö$Kî§(Öø¥¶Ê gzý¬ÝÈ_Ç¢Ùä|`6YÍ=)çh¶|àØÚ¶ÕüJK«-¿D~{¤qB,GÁ1XÃá÷óQðâ¬SøÈe¢$§"'mVã9ïo_ý£®«
endstream
endobj
1446 0 obj <<
@@ -8589,7 +8601,7 @@
/Contents 1447 0 R
/Resources 1445 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 1451 0 R
+/Parent 1449 0 R
>> endobj
1448 0 obj <<
/D [1446 0 R /XYZ 88.008 808.885 null]
@@ -8597,73 +8609,75 @@
330 0 obj <<
/D [1446 0 R /XYZ 89.008 771.024 null]
>> endobj
-1449 0 obj <<
-/D [1446 0 R /XYZ 89.008 181.225 null]
->> endobj
-1450 0 obj <<
-/D [1446 0 R /XYZ 89.008 165.569 null]
->> endobj
1445 0 obj <<
/Font << /F41 418 0 R /F8 356 0 R /F14 784 0 R /F61 600 0 R /F51 487 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-1454 0 obj <<
-/Length 1992
+1452 0 obj <<
+/Length 1955
/Filter /FlateDecode
>>
stream
-xÚÍYYoÛ8~ï¯ð[ vIɺú¸í¶è{ õl÷A±¨/%Å
-úçw3ÔáhÓi>$¢8$53ùæ°Xìbñî8yþ´yöò\/ÒUùÑbs½"X¥¡¿#¹\lòÅßÞG!ã6¿ôû^¾MF{pÀ¼]ë)"ZúáÅ2ïry]µgÔnt]IôÕɱðÅ/råd±0åtü{øbÔ1òæöÂO¼,×[úö¶Æ÷0ò2£³V54_f8K,í3ZäÇ¢R7®vô»C/+:ÚxYÓ 9d¦a!uuèZÑˬ]Ý'ä¹^Êp®åC¥¼Te=°ì¸©Kæ^WÙá`ê¦ò[\êôz Y/4àÒµmYK Í_iµÕnY¥ZÜ~ĵùÔ<@Öúa[þ*\^K|Õ]Ûk»ªKÈÛÖEvUðνéÊ23·E(àOÕY&¯¬Û'èum¨Ø]Û¶®rÝ{d}¤Ô`?½ÃôÐÜ¥j3í3^Âo½CßËkzVuËeeQˤæp±
-j«¯o²W4èM.g´©W½º§¾æ'M7''â}ÆQ+êåÛp,|à'«0rÂ4ZUÙ¯µå0WÅ7,¼f ð;¯Ïèeª .¹JhEÀOù
-ø|wüÿ¯ãÈ©ðæ[|
-=°¾=ëèGÝî^hg
-]©¦U(0UéYS,ª«24·Ó7øÅ_TÆÔæÅÅ2ìêHÙu¥s¢+º61½°mÑåê÷ª¸uH
-´1¡îØß2VäH8\Ä#å¸ÊAÅY<ÑÓfúâ¿ýxþu/r»Wó®`Û«dGò,Æ5``Äòɺ¢©.ÕÃ>b°,º²úfä%øMÐtí&Û±r³¢U°·Â'Òå SÀæÐrÍ
-Õ4sFÍô®*ô'+³¶¶âG¥=CPÈwfêåÄ:1pãX1ÒÍõ±ÅAW´úP° ;SwXÉ© Ðq»N¿`©òPÁÆ&\¡?w¼ÕØUVªÓü¥k5Wö~èu
-@&½Ô¦¹EÇzzÄ»êv48îE~À8µ/Ý\$G¹Lçà³Ú
-Ë- ãè"Õ_<IpWðÙZÉ)n%«ÌªÅU9ÝÉï¨d&Êiz²`¿°^{ilhu½!UhÀKÒUhéL!{Óa¦ {ïX}´p]ÄOGÂÁËH8иåܧH4ÝÔ³¶ÚYÞ¯À»c$ò&(åVpR´¼àkðë(ȵº¹ØÚ;9-%ÌÕ§|-tEXñíº§K?]úI8Ò%@XT/×ák.B¾ë4-²^ð´æÖPmkShjZÂ^Ñ \+üVêýL}5«ªÙ>Ó¬n;«Óô
-fÀðq¼µ<ç±YA<üIw®É±²WõNUJ·£»Ù}8
-:Öêò¬ä°ÄcɼàC'8!á¸O¼ï+Ñ#r$¨ðÇI
-i}!¹ëÊB²vA
-äCY,Â2Þ¦ùÙ£´£ú(3ë
-}
-A·6÷÷n¯ gÕc@
-È= Y°r²é9ôvåWNkª¨wgQîÁ4ôÒ` á<1aîÀĤ÷pþ´ÅA³[ÛÌ$*}}v·¡÷¼ VêCóü14y²2Þ^̸&¹êÀw'¦Uc64®òIót¦IèÛ¨'}Òú¤O2¿¶®lHnI¨eÊö RlO0'»ï\JdQ±M
m}# ìbock8òÀ»UN¾þTá¾áã4³Ò´º(ÚU¹ca6W
-ÍB^}pLñOLáÁqìzj0²RÆX Ø0ár8¼B¿¶@±ÂóyÅ·x4èÀ"Òóéáý¥ÒµUÌ`Â8ûdãõøsèà»y¥ãÏ5õp¶3zß[,?˯U¦H8ù®ëìÍYÆöÖß<£~ß¼wPÌqIóG¸
?s=eÖëFQ<4¢,(Ĺ(fA|Ei0æ8¿äxPg@CK±±HòDñT3ð®ùfÀ[ÑÖ!gD öfø·ëûõÌv1ÏSº5~8Ã_4?%¦Y®8ìx6s²v0Ïk*µáso´föW k¼3jêû]£ÌyR´õ×cC4®µ,NPÛ¾=ϧùÕ¤äÀNSÿ3çßÛÖ³ì1®õKF
- ÕnW|ÎIn5+ððK¾x¤Dß&"±m¿¯ÎýT1VB"VÉ`0¶alëñ=5ÈXt¿íJ¨øãõú<Ö¸k
-Å\· K;¿¨,dâ[íbE }4õ'k~Þ<ûÿk®Á
+xÚÍYYÛ6~ϯð[d ò:,9MºA4-6.P íÖ¢m":JÊfÑ?ßÎP×I¼iÖÈIñóZÌv31{óLµ?]]Ëh¶Z¬Ár¶ÞΤ«8%K¹K9[ç³÷ÞßB&óÖ¿öû®®ÓÑì
0n×B
+_¤~ æ~/½[¢£>êF×}I¿ûÑJàÑ'Óðm·£æuVU&Rú8øçÐdE§qÇuûAêÕ¦}#ËÀË*>²ÔUm¨»©QÙ})ÝHo2<3½¶Æ6òl'ÞãOݵ4Woiî`@DíµnGÙ'ùÚ þV)'°¤ñc2~I ÌJ3j¬¨±£íâZÝê¬pçô媬D©ã$²m"èV
+¾þÖnR{+º?õ %ÝV Ï;\¯"1ê4u!9
+ºu°V hd0%eÖEN¸ØLîãeL SfïýXOUyß
+Ì(qf¤àôئ¯®ñ°|ºFW;F
+ at S,ª\Û=FU'Ëm¦ð§Éµ¨x±óDmê®ÈéÔªnÚΰnõ!3ms£YýùÎ41fùí^5L4
¸ ¦â`ÐTKoG},ÐîLÝêßévO½
+pÒfk'^[ïQGY®7t4Ò³úë-¹U|Átꪸ?4IïÎIg é7g_±ø
l Aw
+Í82N±]ò"¾"B 3cN0Ö NI)AË©ÁàD¥ZkóPÍGÉèc?dtEUûÊ>«Üõ¡íïÌZjU¶Á½ûS8 amäS+>_ßlÅK?ÏÀÁxÓç`aì%Zhhcl§8zmm°s¹Õ`Úl±±³ØXÌyÜÕË£c!ûå%rtJÊ¿_ CE"V×9D&y%{KRoÇpWêfÀ`"§!ðÍ^ ß(ç6 ëeö Môê1NÏä*ëbGL]ö5;L}°üràÚ ó$[Ⱥcß~«ò±¼¾ä¯åq v)8
+ÚÖf¬A1 te{Ä]DQF¶L^¡ä)µ÷²§7B¹F8"÷ :´ºÌÚÞaz-4÷e©ZãLûhá±$¿íe¡6¯©¥´;úihÂ1µÑÛ{Ù+êô6GÊmêA®Õ[nù6Ýú2©«ëxÌ|¤HG¶ÿVÒª
+×LÈ+£À5zcù~r¦ß?åøËó4-# å¸ðØëÛ³ÜhR)/´#
®¨n½FÊ&OÖÔ'jëÆvS"RÆÔºXJ°«;ÌÌ®³¹sO®NÖu¢ËÕï1$ ¹ªcËXª.rÛtm¯9³ Pq Ä2ÑÓfºñß^Ýå£ð¡j^
+6½HFXA¦K û wlMTðêR½8ìã Ë¢+«§bàºs8DÖM¶cÙfE«8ð\Jä#I9`
+ØZ¸¸·ÈÉ fsF½íë5ýÁòà¬Í½$PÉÖìù®¬IgÖª®JÂGløPäCÓEøiqS¶dp
+w¡³ëôv*?
+Ué¨ÐÖ=OÄúµþäØæ§ {]ãfseõ㬦OVh`[ë>9Í)?Ï`çnOï"Ð}qj
+^º§¡G¹çà³Ú2Ë©
Þ
+Dª¿xà®à³ µÒ!S8ÞJV µÅ)T}d-ac¡ü¥Ó9Á0áÒé#
+í ®ÈRE¼Ä(õ~ïÙë0Ø{JI¢«sð1bkk±´ q£¦[³ò¨2´´ßÚäMr! F)bZJ^
+;[ðë(HµºSVÐ;9-¥}£èS¾:À"¬¸,tô¤ñH8Ì¢Xé¼Ðs³|ÓiZd½;à
-iͽ
+¡8ÚÖ4¦ÐÔ80%µ{E>ráûHóXdê[ÿÔ»h¡Ê1ÁÇpå^Âék Qky*/#g~;ýóÁ3&DÊ^rÖ;U)ÝJìfcôá8èXªËKnÿTøc,y
+>2tÂX+ñÔû!pÅ2*äQ
))äK~Ø;ve!ÃÐr»
Gr®Í¬aoÓÜüpGè£ÌIoèóTºîMëso7ÎWèo¢Xü0äÞñèÍØ`¢eÁbÈɦ;N¡÷ôñ·*êÝÅEû,ÆÞjE-Ø£$##h|ÆxâÔ©5H1~hÂñÈ8J]Q}}öðAïyA¤Ôæù%}Ï0U:ý_F¦M%Ãh±C:nLÖü¼~ö38l0
endstream
endobj
-1453 0 obj <<
+1451 0 obj <<
/Type /Page
-/Contents 1454 0 R
-/Resources 1452 0 R
+/Contents 1452 0 R
+/Resources 1450 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 1451 0 R
+/Parent 1449 0 R
>> endobj
+1453 0 obj <<
+/D [1451 0 R /XYZ 55.693 808.885 null]
+>> endobj
+1454 0 obj <<
+/D [1451 0 R /XYZ 89.008 689.385 null]
+>> endobj
1455 0 obj <<
-/D [1453 0 R /XYZ 55.693 808.885 null]
+/D [1451 0 R /XYZ 89.008 673.445 null]
>> endobj
-1452 0 obj <<
+1450 0 obj <<
/Font << /F14 784 0 R /F8 356 0 R /F61 600 0 R /F51 487 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
1458 0 obj <<
-/Length 2190
+/Length 2215
/Filter /FlateDecode
>>
stream
-xÚ½YYÛ¸~÷¯GªÊ¢ ÞÌÛÚko9õnÙJ*UI0"F@Íx²>ÝèI5Sã-ÍDЯ¿>]í®¢«_ÞDGÿï7oÞ}ÊÅUVy_mn®D
"N®\lꫬþ³ùëøÒ»Oåü
(,¢
-ÜÌ/êaµN$Í®7z¸m-¶ÓàæÐmÝw4úï(º~ îhÊ~%¹]ÅEp·Êò@îÔ_Vë4ÍxB·ÔwÙîÅK×Ú¨íÐGXUGG]·æîEéKeûÝô;£¬¥3ô|êV~×í*.CK¾Ã&UÀ3ÈtÛ¯ÖÐA¿5MÚrK]ð¼ï;Ø$AÛ"ý®,h3)«`o@°÷@îí~À®GîP©¥f½ZÃ}üzÞBO
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rsiena -r 128
More information about the Rsiena-commits
mailing list