[Rsiena-commits] r190 - in pkg: RSiena RSiena/R RSiena/inst/doc RSiena/man RSienaTest RSienaTest/R RSienaTest/doc RSienaTest/inst/doc RSienaTest/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Dec 14 16:36:14 CET 2011
Author: ripleyrm
Date: 2011-12-14 16:36:13 +0100 (Wed, 14 Dec 2011)
New Revision: 190
Modified:
pkg/RSiena/DESCRIPTION
pkg/RSiena/R/bayes.r
pkg/RSiena/changeLog
pkg/RSiena/inst/doc/RSiena_Manual.pdf
pkg/RSiena/man/RSiena-package.Rd
pkg/RSienaTest/DESCRIPTION
pkg/RSienaTest/R/bayes.r
pkg/RSienaTest/changeLog
pkg/RSienaTest/doc/RSiena_Manual.tex
pkg/RSienaTest/inst/doc/RSiena_Manual.pdf
pkg/RSienaTest/man/RSiena-package.Rd
Log:
Fix for bayes which got missed in the last commit.
Modified: pkg/RSiena/DESCRIPTION
===================================================================
--- pkg/RSiena/DESCRIPTION 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSiena/DESCRIPTION 2011-12-14 15:36:13 UTC (rev 190)
@@ -1,7 +1,7 @@
Package: RSiena
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.189
+Version: 1.0.12.190
Date: 2011-12-14
Author: Various
Depends: R (>= 2.10.0)
Modified: pkg/RSiena/R/bayes.r
===================================================================
--- pkg/RSiena/R/bayes.r 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSiena/R/bayes.r 2011-12-14 15:36:13 UTC (rev 190)
@@ -422,8 +422,8 @@
##seed <- NULL
}
z$FRAN <- getFromNamespace(model$FRANname, pkgname)
- z <- z$FRAN(z, model, INIT=TRUE, data=data, effects=effects,
- prevAns=prevAns)
+ z <- initializeFRAN(z, model, data=data, effects=effects,
+ prevAns=prevAns, initC=FALSE)
z$basicRate <- z$effects$basicRate
z$nGroup <- z$f$nGroup
is.batch(TRUE)
@@ -465,7 +465,28 @@
{
z$priorSigma <- priorSigma
}
- z$ratePositions <- lapply(z$rateParameterPosition, unlist)
+ groupPeriods <- attr(z$f, "groupPeriods")
+ netnames <- z$f$depNames
+ z$rateParameterPosition <-
+ lapply(1:z$nGroup, function(i, periods, data)
+ {
+ lapply(1:periods[i], function(j)
+ {
+ rateEffects <-
+ z$effects[z$effects$basicRate &
+ z$effects$period == j &
+ z$effects$group == i,]
+ rateEffects <-
+ rateEffects[match(netnames,
+ rateEffects$name), ]
+ tmp <- as.numeric(row.names(rateEffects))
+ names(tmp) <- netnames
+ tmp
+ }
+ )
+ }, periods=groupPeriods - 1, data=z$f[1:z$nGroup]
+ )
+ z$ratePositions <- lapply(z$rateParameterPosition, unlist)
for (i in 1:z$nGroup)
{
use <- rep(FALSE, z$pp)
Modified: pkg/RSiena/changeLog
===================================================================
--- pkg/RSiena/changeLog 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSiena/changeLog 2011-12-14 15:36:13 UTC (rev 190)
@@ -1,11 +1,31 @@
-2011-12-10 R-forgre revision 188.
+2011-12-14 R-forge revision 190.
- * added directory po with .pot files for translators.
- * R/algorithms.r, R/phase2.r: rationalised algorithm code and
- added function comment headers
+ * R/bayes.r: fix bugs from previous changes
+
+2011-12-14 R-forge revision 189.
+
+ * po/R-RSiena.pot, po/RSienaTest.pot added files for translators.
* doc/RSienaDeveloper.tex: updated to reflect changes in
algorithms and other minor details.
+ * data/allEffects.csv: fixed typo in shortName for symmetric
+ networks
+ * man/sienaModelCreate.Rd: updated details
+ * R/initializeFRAN.r, R/simstatsc.r, R/maxlikec.r, R/bayes.r,
+ R/phase1.r, R/phase2.r, R/robmon.r,
+ R/algorithms.r (RSienaTest only): rationalized and tidied code.
+ * man/maxlikec.Rd: removed file, details now in man/simstatsc.Rd.
+ * max/simstatsc.Rd: expanded to include maxlikec, initializeFRAN
+ and terminateFRAN.
+ * R/print01Report.r, R/printDataReport.r, R/sienaPrint.r, : minor
+ changes to reports.
+ * R/sienaeffects.r: fixed bug in error messages
+ * src/model/ml/MLSimulation.cpp, src/model/Model.cpp,
+ src/siena07Models.cpp: formatting source only.
+2011-12-07 R-forge revision 188.
+
+ * added directories po ready for translation files.
+
2011-12-06 R-forge revision 187.
* src/siena07setup.cpp: correct change to name of included file in
@@ -22,7 +42,8 @@
src/model/Model.cpp, src/model/Model.h, src/model/State.cpp,
src/ml/MLSimulation.cpp, src/model/ml/MLSimulation.h: added
facility to return log likelihood after simulation, stopped
- returning of chains every iteration. Bug fixes for ML.
+ returning of chains every iteration. Bug fixes for ML. Added
+ R/algorithms.r to RSienaTest (previously in examples directory).
2011-11-27 R-forge revision 185.
Modified: pkg/RSiena/inst/doc/RSiena_Manual.pdf
===================================================================
--- pkg/RSiena/inst/doc/RSiena_Manual.pdf 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSiena/inst/doc/RSiena_Manual.pdf 2011-12-14 15:36:13 UTC (rev 190)
@@ -5034,28 +5034,27 @@
endstream
endobj
2060 0 obj <<
-/Length 1815
+/Length 1841
/Filter /FlateDecode
>>
stream
-xÚ½YKsÛ6¾çW¨7j&¢ >D*·8Sw¦ã¤D`
-0æC@~´¾»XÙãÈi¤Ärwñíî·p4ÙL¢É/o"÷{¹|sq&I:'Ëõ¤XQTLò(
-Y2,W¿Ëé±8>ly³z:Kò,(ÛzÇXÑiéWpUI¡èán°@(-ÛFOÿ^þzqULX.¢ÃOEYyVÐW[¢Qp3ÅE 6²qÜà/ÈjV4ñ[iZ÷¢8o§³4ÊîßjêF+a¸¬4I)§°¯3Vï·æhX"JCf+h°×0`² Îæl|²èwÕÎÐ6´±pedÍFñºÛaozÛî+Ô*IÁqÞWH:@éûëvC+ MZ¹·Ú~?|~ÿ¤µfd3gëVmÜ>%vÖ[¦UÓ"
-BСæ.®à(ábÏñxØ<,¬ÊÃyä¬]ò=£-Qh"z9±xÆRRb Q
-ÝI-±bñ*3'øûu¹ªðZ6ä´4¸Ù£»5=xv¾RÆ
- P9 )<úÞ¸¦{W¦I6p%.±bNg2¾¡ÛZÐäÍÍÅlhíã5=mdÍ;ÕZ7bµWn÷ P죬ªç°Ï+#Ô@Ðûp¨äfh`<¥i¼_^áÉ´JmM3ë}SIHpë@õE/Q
-X at s;n£évÍ8³
-Åù0ÏĦl(79x± éÿ¾¤Yx=.9zôÿXWB¡ã]9E7ÞÓ¤:;8®xUÊMp ïÛÌ9ýf,ç,y=Ã5f-«@%øç<0.õvºè¤%
-z»\Ø0ûéxÍã×jþ ^=I6ã²ÓA8
->÷p>~£Ö²q%ànAY«ö~'°µª|æÂb\ #¾ÓgIêÐ>Øw¡ý¨¤¾ÃsÈ+°P>øéÏ2éϲϾ%¯Ê}åò-yk¹q_ÑÁüR)²;ÂÖäÝéBû`úö>hw"ÖO
Rû]ï<ïÕÝw!ÍòBBÓS¤1D¢÷ýÈ°ÿ°.ÃPDlEM«µâ4Z«Öå±s _TòÓ¾§JnOÓNRãÓ[Y;8Æ÷ÄNÏ3Çà(>!J"©O¢Ã
-¢½vf¯Î]¼,ÅÎp@ÉØûxIOm뽬E¤ç4CÒãFµûݸ¦Á
-£>âF(i·#ÐU8ÔháP£å?âLðI©Ì¥Td¡Tæ
ñ ²Yù °»·îÀ6)§6 Ä{ÂDp] ðuÇÖºÀÀ:Uߤ+[ü³³«Tý¶_ò
óB´~ð3N ᶷÑ2yÇrµþÆ9ÿ8{ y~Q0P'?¦!¥ewØ)É]%Íò¡¶öñ!\¬}ní;hXÝrDÞÝ´kÖ}¶ìît)Ä÷À´°q _Z%ìjÇsaZíöRw»7]ÜÀ$d÷W`î3MÄ!KÃIh^üç[_á
-h
<×A
-`:1Ýq¦mfJ|ËÞ]®Û õkrtü}ÒãrüÇï6vÒ÷vãÖíøòÜ
-#êY¸O`úAÖ.GÚ Ëàh+¹%g·6m®hµo, Ëdi|ºtòèÎ
-^îÃÔ¾YÙÄ
-³+AÁPµ»iU·x«Ûºô ú£q©üÆõ¯oR4 ]·Ñíh§ßºZÒ; Îó¶çºøôÕPxµ²kßtùR#}±²A(DgH'GÍÚ¨e¦Ô_¨óE Ûïìã3QaÔ@þ +8²ã ))×y7¼3ÀE41vì¬
ÓñF¶q)©ñnv|p
-ü¡è×á9XUdÕxWfhà|CE7àë¾Áò9Mc+¦{òã`÷¦;øÞ.Û^Èn¶L»âÒ &8íû/uÕc%JéÂÌ,êÒß2ÊÑÏ%OfjN<»{ c4¦çá2Ñü.sì¥ûÿ}ñ¨(l/°óçú±®pÒ
¯0¿ö®÷ö¤ÅòZÖÒøJØh£¸¤*0u÷t}U¼rs÷àÍ{E+·vd[,5ihöy*.EóÈÔ§|ÌÝm=w©Û
Ûá×ÿQbYÌ+@
Eáþ¯ÄæñhÏÏË7ÿüp¬j
+xÚ½YKÛ6¾çW¸7y&ÖzXrnI¦ÛÎ&é$îôÐôÀi³zxDz³iÿ|dïvãM³>"E > èh²D_^Düûfùââ2M&"
+tOëI±£¨äQd>Y®&o¦3!â,x»ÍFé,ɳ lëìÔlK¿JvV=ÜN¨Îè¶1Ó¿¿^\
h!ðSÑdÇaôåV£èE\Ogq¨nxBZüYÍ&>¶å·:£hñr:K£,þ¶©¾Òh¥¬Ô!)åöõ¦Àê¦9Z#¨ÒÒ¢Ý*ì
+DÐMENgs1>GYô[×ÎÐ6´Fpedͦu
+¶ÃÞ$ ̶ÝW¨UÂÁ5f_YZ é0 rT
+¤oÜw®Ú
+6iÅoµ
+ý¾ýøú=Ik;ÑÍÀ4ø8[·Ý÷ujçN«5Ú¶Ý×i!h/Pó
+àE¸ÇstEUy8Ø*Ð%?Ús°%
+S MD/Ç3ÏDJJ4JA£[À %±hp©ïÓõ~shÚNú¥ø\+µælqúvê3ë®ùÃ$P ¶3xÆêÇâbqÏâZ7Þ`¼[²sp¸54C8WT×ù}µ2F°ÏdhÂô`hd#CqIs°¡øikEd'tCkï®èY«kiYNìºÖA¸T«}Ç»GëuU=²²}xt
+Ðg¥7[d!a Æw¦ÁëÕÊ»FVm§í¶¦õ¾)Ël$¸eÒªKÐÜNºè¾fó sßÀÊ ÌĦb,7 jÂbAÒÿyL"ñzôá
+! ªG¬Fç Ü»bE7~¡5H½ù¸Av²ªTÅÒ!ÀícæÌX¿È¹HjO¨e5fQ§@¥ä9LTa\ ̺è¤%zsnnýtºæñS5ÿ ¨÷ùÁ§ô¨öNwpÆlÁðßhn8#ßN3(³ÕÞïÄB¶VìÝ 9¨Uߪ1³$e´ ö]h?)妯ÐYp ê;Nº½/ÁiïËRVå¾â<ä
+ÍKª´ücaÌ/Í"[lM^=_h_Òá%¾Fã´;M;?̧Pö»áðü©î¶²iqv$õ¦T$ò½`ìGýÛâC±UC4Ö<&5æ:ygQéÇU7¼§im/©ñ鬸ñ5±å3ÄÌ)8GHm4$Ñq1^;»ïþ¸dYª{±÷#1ðÆÕ{]«>(FIý4CÓã¦k÷»Ã2+ì87ªÓ®`Ò]£Æ(FÑ«3Á#:%¥
+N©ØQWÖ'ÈfåÂEîÞǵc±u¦æE®{¶ÖÖy¬úþ#ÕX¹âXE ê·Ï%_ð¹ t@ë»ÿèi@ÂÍ`#¼Ø³\c¾áçgÏ D1Ï/gLt³pHCJÇ o±ë´äJ [ÚÎÚÚÇâÝøÜ:tô°ºCwÈaLóØ8°»çK!¾ Ø(¤µ#øÒ*äV{Óݾá´òmL^÷q@ù\`î#MÄ¡HÃIh^ïýç[_á
+è<ÔA`:1Óq¦mfh|ÇÞ9×í?ú)9:þ>Ãr|Çï6vÚ÷vÛ3bàwÊs+`¨gÁ.2Àô®9Gº ÇÀµÞÒa·.m®huh, Ëdi¼Ãòè
+^ÑüOËaj߬\b
Ù¢`¨Ú]´*ìK¼åÊ]]z ÃÖÁp*§ßaýÍÏ ¾[èß½äZ2þ8çmuñé¡ðde{ÖpxSÐç3LHöÆÊÕ)$:c:yЬ´ÌþÚèÙAý:Ù8_Æûó8>¶H
+téï p°#g0 r½Õ·ã;\Dcðqc¶¼ã
+qÃ)©É® nüá@²ü±èwWá9XUäÕxWfhàÎnÁ7$+|CäsÆVL÷ä¢ÄÁïqvð-¼ív½Ûì»âöÃúê±¥taæ\¦ô×ÞzgÍCÉÁZÏ|À1Vik+u.ÍOà2§^zÿßô
ëvþ2ß|k\¦äðUâ³}wó¬ÅòJ×ÚúJØÛIMU`Ê÷tCU¼ss~ðæ¢Ö[{`Û-5#ihöy*);æSïó1¾ÛzèR··ã¯þáYÌ+@
EÁÿsy|°ççåÿÐ
endstream
endobj
2064 0 obj <<
@@ -8795,21 +8794,14 @@
/Filter /FlateDecode
>>
stream
-xÚmo·ÇßëSð¥Ô:
! µ
-à$mâeI½;Ùõ·/çé{¹§ =Þ!÷÷r÷?ÜÕy0ö¿ P . ¸BW±QøÌBQv
-/*Dª>ÃIhÐÔÿJ!QÔç)ê¼"ºP%ê7h%^fd Qq1RuØÃÎHÍuÑêÒú*Eà0'Òé°«DÑaˤ9'}âÙEHÄÍ¥/«.bI±Ñµâ]LÆõ¢cÎÄ(ÁÅ"×ÐÅZx\t±EbäHQîQ¤:Jq%b>yþüdõýúý´s?î¯vÓõ~swÏË-pß¹/ihh³D:è{3Høii¡9oöædõró~³)Mzsrq±TS:ý¦iCJ¤ÇèÛ6O$JjÊ=Q` -éHE¬ïë9Ç¢½(#Ý´m®"Ó^_ξ6!øA"R"-¨Íæ+(Ó²8Öã Aºó¼ Ê3J$hFõUZÄú¾s¬ ÊÔ_Û9*m#yýB?ר l]£º;}N|Î?wtXåxæ°¸ßóÀ÷q§4©u1Ýlx*>ÇÅ4Ý<×Å4ݼQéóÆóZ DÈúÔ¸¦j]LS -,¦ÝlE|¢|`8ûêU~(K|KIêZJöW$â8Tsã5«îáä'KFҾ£<Íàq)KíÉ×2éÜã,»T|ªl-³(;oBÊË"/M(SqÔ+êR!\K¶yåÃEñxáª~8û³´åë ÂRü?
-ÅWyV½ûûõÕí$ýÙÖQ.¾ôÄÞªÎÃCYßmnúè`ëÛ´ Z,ȯi/ޯ·ûÎøû~zßm¦7ÐÞ°ÀøÑøó]Ó#Æ9#Úhjõllz`:3b:0J3©N¦:êd«LlïQª1o©N¦:êl«MGCF"¶#èl¢³Î¶xÙdH#âa;BlG6ÑÅD]lñé(ã-å°ÉÏÅD]Lt±µ+&£w<VªâPMr5ÉÕ$W[ºj*êx¿+5ÑËw÷ÿ Lp5ÁÕ7[·f"Úl³/Þo×w»ývóÐ!×ýtþúnóÛÍ´Ýýu=m?L·7{?¨«YͪhVE³µl&Í/A÷»wÓ¶õ/Óé¿k9<ôó÷àÑnZc{ ÐÙ3ñûÛcÿD<}XÿÚqnjèÝ$[P,¨=zßÏ4`I&¢¦òС&L4è`+LFCD¨FÈs at 0ÅÁSlåuÈejU
-&M0`ë<h1
-¿üº¢îdÝ
-[!r´å³ö|÷ Îý£TZçBë\öµÃ¿Bi`ZbùCßǯôPJûcg¥ÆÉÖÂ}nñ^XA)=ÙøG] Õo]
-«¡u5´®tÅw=jëjö]È?¢i`2r9ò®?µáÙ¤çöäf..»µC´vÖ±à±EÝñÅ´ëø½>Í®^~zÜêõ~}{ÿëÉêU/¯
-ò¬þù¸¿ÝÜñ%y#íË?òÿiÊ?îo¦Õ¿w
-_ý°>NÛWÛéi;Ý]O»çÏW/6»Ûõ§.òr³¿Ü~û8]\ðüë«éÆ|ÿø~÷ïÁ«S8»¸ BGØ#ä(ö(rz8Ê=Êj*GGMîìéÖJap@ $ BÂð D $
-BÂpqpqÖÇ
-77777777777777ÂEâ¢p¸¨+ËK+\$.
-ÂEâ¢p¸(\$.
-ÂÄÂÄÂÄÂĺ§¼©ÂÄÂÄÂÄÂÄÂÄÂMÄMÂMÄMÂMÄMÂMÄMÂMÄMú4ñã$ÜDÜ$ÜDÜ$ÜDÜ$ÜDÜ$ÜLÜ,ÜLÜ,ÜLÜ,ÜLÜ,ÜLÜ,ÜLܬÏ1?ÈÂÍÄÍÂÍÄÍÂÍÄÍÂ-Ä-Â-Ä-Â-Ä-Â-Ä-Â-Ä-Â-Ä-Â-Ä-úñ+$ÜBÜ"ÜBÜ"ÜJÜ*ÜJÜ*ÜJÜ*ÜJÜ*ÜJÜ*ÜJÜ*ÜJÜ*ÜJܪï.¿¼ÂÄÂmÄmÂmÄmÂmÄmÂmÄmÂmÄmÂmÄmÂmÄmÂmÄmÂmÄmêlæbêëwx6¯îáÙ>¼úgñê -Ä«x6¯.âÙF¼úg#ñê$Ä«1±©12s2±2ó213s3±3ó314s4±4ó415s5±5õ5`cu6`k`*¦ªZØÞ@ý
-Øà@Øâ@=Øä@]Øæ@}Øè@Øê@½Øì@ÝØî@ýØð ÍáÅâU¨ëÛ¨ï¨ó[¨÷¨ûÛ¨ÿ ¨[ ¨ ¨Û Dë7ÒpT[!¨!¨Û!¨"¨#["¨'"¨+Û"¨/#¨3[#¨7#$ë~ÒþT$¨C[$¨G$¨KÛ$¨O%¨S[%¨W%¨[Û%¨_&¨c[&dëÅÒUÛ&¨o'¨s['¨w'¨{Û'¨(¨[(¨(¨Ûè~¦ÒcÕ_÷oï·§g+>êô_?^ýÖO|=úf;÷=÷r}9ýè>nöoÝÛ~Ûö³{X_¿ëÇ¡³Õ«íýÍãõ´=}¸ù¥{çÑÓqvõÝôéãýöfwzv"wêgÈëýäN_ü9øî ¡?oýÅôþ?}D?-'/·ëéƾ]ßî¦~»üÛçß>ÞÞ^ïî¦;½|»Ù¹þG4üÉýÐ?ß;ÎõïØ÷2ägáMZÞËy¹ù0ÑÏýèÝÃzÿv7ÝÏû¸3Z¡ÿmÝÜ
+xÚmoÇÇßëSìK ¨É},mÔ EÜÔ¨Õ h`tÓJRvýí»óDǾ=2aon÷÷Ý»ÿìÑ#78¡ýpÁÞ%äºà`H|):@È%1óýÙA@Qq~HpÖ"4"¶¿¢µO5^/µ ªDÑá #C(;ô±8lacÄêh5im¦B8Lô%ï0'*,¡Ã"QpXiNÑ
!òäDâ¦Ü@î+.`ª¡Òµ<¸Ý×)#{²\CJæû5#G¥ª#g¦³/Ï߯Þ;÷Óùîùf7Þî×°È´Àmgþå¾LJÄN¢R¢Nq-Ñö¦Z¦Æ^ÆTìíÙòÕúýzßS8ôöìòr®¦¸ðmÒØÃ!%zÒCK´m&"%z5¥ÈÐIÐæx¤"Ö÷õãÑ^änÚ:Uh/üP:Æö:¶6ÞD D8ZP¹9VP¢eõa
+ˬ;
Nt§iA
GäÔIÐ2tTi9Vëûẕ
+/R{m§0ª´ö䵩¼Jagë*ÔÜésâsð¸£ûÄ*û#»Åýî.Xx?.Ò¤.Ùt[t²á^Ú«øfÓ4y*³i<û^éÓúãO- ÝfDÈú0¦JMS ÕϦ]»lE{<Q¾VÐ}¢zïóÄÃ\¤Ç¹d¤ºæí ØO"Õáxͪ»;ødÉHCc÷cWx§ËR{ºkul~Ý
+*;eËèeGñM(]yIäù¾ %*zEËÒ3³cÉ1õ³|¸ð!/\ÕwG(<I[ö¡Ì yÑÏeÉÿcW|gÕÛ»¿_ÝlFé϶rÉó¥{«:Ce}·¾kw{[ß ÁhA² M»z¼}ñf¿Úîãïûñ}³Mè@ªN =¼`ññ§»¦û#)#Ú`jõlémZ`:âÐgx`ä<eDSMu4ÕÑV-ÙÞ)#cø¡v¦:êhª^2ÉwÐÙd¢N&:Ùâ%!mtíð¹³ÉDgMt¶Å˦#÷·ÜçÃvÄaÈ&:èl¢³]6¥¿ãñ°R§bI.&¹ØÒSQúû]¨^ÿ¼[¿ÿ_` .&¸ÚºUQ'}ýó~»zØí·ë§¹]ïÇÅõowãv÷×Õ¸ý0nîöC§®jUT«¢ZÕÖ²´:y ¾=îÞÛÚ¾,ÎÇÿ>¯äðÐÎßG»jmvmXà-@&ÏÄï§Çöxþ´úµ9ãÔÔp6I² [P,010y2tÞÏØaI&¦RÑ>w&L4ho+èM÷]/FHS7ÅÞ{Sìmå¼ð¥HeªUò&M0`ë<h1t ¿üº¢îdÝ
+[!r´å³ö|÷ Îý½TZçBë\öµÃ¿Bi`ZBþC߳ǯôPJýcg¹ÆÑÖÂ}nñ^XA1lü½.Ñê·®ÖÕкZWÃGºÀì»Lµu5û.äÑ40)y×Omx2é©ÜÌÙe·vÖÑÚ!f<¶È¯Æ]»ÐkÃìêõ§§Ñ-¿YíWÇ_ϯ[yí&/ïáÙòÏûÍú/Éi\þ9ÿOCþñx7.ÿ½íöåëñã¸}½·ãÃí¸{ùryµÞ=mVÈëõ~3ºýöy¼¼äñ¯V7ãîùþùý¯Ïáâò8ò-òa£Ð¢ÀQlQä(µ(q[9*-*ÕUy ©Âá @H@(áA@H&
+ázâzázâz®'®®'®®'®®'®®'®®'®®'®.
ÄEá"qQWV¸H\.
ÄEá"qQ¸H\.
tOyS
õiâÇI¸¸Q¸¸Q¸¸Q¸¸Q¸¸I¸¸I¸¸I¸¸I¸¸I¸¸Ic~
õ
+âWH¸¸Y¸¸Y¸
¸E¸
¸E¸
¸E¸
¸E¸
¸E¸
¸E¸
¸E¸
¸Eß]~y
[[[[
[[
[[
[[
[[
[[
[[
[[
[[Õ5Ø6Ì7Ä8Ô9¶A½c`óÔ=¶Aýc`ÔA¶A=d`ÔE¶A}d`#ÔI¶Aµ\LlLµ¡£¥§©«©¯¨³[xóT1UÕÂöêoÀêpÀêqÀ&êrÀ6êsÀFêtÀVêuÀfêvÀvêwÀh/¯ZØô@]Øö@}Øø@Øú@½Øü@ÝØþ@ýØ AØA=ØA]Ø!X¿£ZØ
+A½ØAÝØAýØAØA=ØA]ØA}ØAØA½Ø!Z÷ö§ZØ AØ"A=Ø$A]Ø&A}Ø(AØ*A½Ø,AÝØ.AýØ0AØ2!Y/f¬ZØ6A}Ø8AØ:A½Ø<AÝØ>AýØ@AØBA=ØDA]ØF߶3«þò¼¿Ü_,ù¨Óþ}ó|ó[;ñµèí¸Ú·Ü«Õõø£û¸Þß»ûvÛ¶³{ZݾkÇ¡åëíãÝóí¸=ºû¥Ýöa ãìò»ñÓÇÇíÝîüâLfjgÈ«Õ~tçWöCs ߰ؾ$ñ?ív.O^oWOOã[~»ÚìÆv»þÛo7ÕÃøuç×÷ëkDÃÜíó½á\ûÞiÓT^ø´v{+çÕúÃH?3¶¢wO«ýýn\¹:,-Ú}´BÿtèÝê
endstream
endobj
2378 0 obj <<
@@ -8819,69 +8811,70 @@
/W [1 3 1]
/Root 2376 0 R
/Info 2377 0 R
-/ID [<AB3E80407547EAC351EFCF13EE9BC0A4> <AB3E80407547EAC351EFCF13EE9BC0A4>]
-/Length 5788
+/ID [<6140A9D0F7567030B64DCA5A7EB1D38B> <6140A9D0F7567030B64DCA5A7EB1D38B>]
+/Length 5791
/Filter /FlateDecode
>>
stream
-xÚ%{lY}ÇïïÞ¹sývc;±ØíÄvâÄvÎ$qüí8qâwâ¼lv¡µP^âYfE
î²Ò^4,P(¬D/ `ÛmU:j{¦¶TÐ.¨Ò®@v¶V¶´ô~¾ùçã9ß3s<÷ïïÌßL&ùE6Éf,i¬üÉg3UÏÝC3E{vb8-È Ý¡.¡Ý¦X Uhuh«A
-ZÚ-µ m í&ÅzÐ6¶N±ì@»¶F± ìD»¶Jqض¶BqhF»¶Lq/hA»¶D±´e39§
-mâ>°mÚ
-í m?ÚuÀÁæÐ(h;ЮQìÝhmhW)=hchó{AÚ9´+£hhsûÁ Ú$Ú,ÅApí*ÚÅã`í:Úe'ÀI´[hÓÁÚ}´)£àTEK5¾O3hú½Ï14õß%ç¶mâypm7ÚEÂ8úôE50Ö¦ËôϧСyuãÑÔ/úúѳhê1ê°+hêÝ®:û*Ú=´35Pt¶ÐôS5È7ÐÚÑNQAУ©d®4m¢¹¦ñPËÔ7Ñn¢¤¨Ø@»¦áQ0ÝAÓý
-QT VNCÓÐÞh
-hÇ(nm4õ³lQäLT v÷*ÎP1F°GY´³hø*"Ø#MAw"Á¹hshx2"Ø£*´%´>{T¦#=ª{~^BE=j@«G#"=Ú&ÓtS$Ø£h-hÄQD°G»ÑZÑ:)ìQ3Ú4b0"Ø£´~´ ö¨
-íñìÑ~4ýÞ{ÔvME|mm?Eý£N´45¥ìFÓdÔFQ?°Mý¢ÛPçô¡m¡µPTÇVz<_RÐé'hPÐ`ÍÕèZ5~>Ðv¢í¦¢hÐÔu81AS_í¤£ShGÑÔíD at tíÚDO4¦ Óy¦ k HÔFЮ i¸ öhm"ÁM Éè²
-ÁM¡i2ª¡H°G`w;d~Ù`fÑѪ(ìÑ4ý^Y`®¢
-¡¹ öhí$ìM°G7ÐÑ{T±·ë÷¢)4öhMh"Á¡é¡©°"Ø£J»Æ(C`6Ð*?«ª¨¸$Ø£;hø¯¸M`î¡£ÓÁm¢Ñ÷ÅMªØFcr+êJ£öd%Ø%ÎP¹÷ÐTn·°HàïRÌ xb¸h<·)@O¦âÅjPF@oQ¬uhÑnR¬
-h+hëAÅR
2f-®Ql;ÑÔ«wÝh¡¸BqevÞªüÀ¦wðódhm`hà èÍ©{ZW¤¨ÐóKY´x ìåJÅãUUï/µO&¯npô^У Ap¨Ñ!pÃ`Sà48Î1pxà<¸ .qp LI0¦Áe0fÁ¸nÐeÛϨ®Þ¯¨y°FAãqÓj¤eyC¦d3ùï>Ø[`<àESo ôÞ¼måïcÀåX5à}r¬ð9Vxwk¼15ÞÇvÞÇö Þ Çö}@ιntrÓ¢exVÅý tà 8:AèAè}à8
-úÁ ÇÀq0N`Qp
-gAeÞðsÝÚp¬Uàóà¸ÆÁ%0&ÁÁsà
-WÁ5° ®`,epYæ·tkk8W¦"Þ"Ï¢:×¢â¨0©z§x<{<Þð<uÝmpÜ÷À}° ¶x76,óÞ÷êÿnÓ<Ã`¤ #Z¶äi´Úìw?Ëy
-j,ó©~µbÑR¡`§¤a® _Zà«@+|hý¯:X%,óT×j
lìµÌ_PE+hôF¹Ìà«@7¯|à« #ôF`à°e¾ÿ:5¯Üঠ7¼Ý;®ÅWn
-pSpÚ2?ù;]³fýÕ*b #IKØ,À\æ
-ðU¯Kf}s³×dt2
-°J0iö«%i8,ÀapXÃðr\ÔOÅHÁu³7þDa³ 8;Xëà&k0êÙ;~ªñ_°°JU¬`@VÙ¸6doÅÝÿ:U¸ äÍ´¨5 ÔzÐ ÁÐv]`7h ì5{ê%µ¼°(,²sXK:f|Jµ@8döZi,-ÖN·Ùç^v½f_úci}4Ê:ÏQËGÍþ¬Eýà84ïKcÝèèä!³ò´´`}å¿¥±FtX :§Ì¢¿v#=ÿ¤4½8sÄÏñ̾=¨óà¸höÝ÷Kcè°ºs&Ì^\6 fÀ´Ù? ÅÃJÎ5{ùõÒæÀ50oö_&KéNo³W~¡ë`,ýO½´%°V,kJ[·ÀºeÝïIëî
-ËÖ~GÚmpܵlS4Þcêµm°iÙ=ïVÅËk¹îe÷¶£ù˾gVGÈZ¶sAÅÀ\~Þ²=1ý*}èãD'úd&üËû}èãD'ú8Ñß°·¿`Lcú8Ñ'çácQ_YC@¹Lè+×|å-z²XÏÇW¾@©læ+|¥°
¯dÝäbðÉø,{æ¤îKùØÌ?x.O1
óæí<]<ýÀà¼e§vêZçcܲsOHÃp>ó§Fò1?KËúYàe¯Méy*ÔkzR¯- ,åãɲ7¿®±¿p¿*ÎyÕæpsü» [øà¶eíouLÃs°¨_Î,27ù[}óÿqJ±\áS:Â*ià4gÙÇÞ¨
-[¤Ø"ÅC)T#R~GZcÙ7ë
-æ«tGL±J-RlbÌXÊ<âG¤$m¶ì3jEãÁzÆÓÿÀ/).I;,ûÅ¿Ð)Ø'Õá[¤=
-5U¥Ø'%Åâ¡¥$gX1)ÎI,ûµé
-Üâ¡¥JSÑu©S&UJé&UÒ *UJ
-¿¤J:atزßø´Å%éÿW÷UR%tJ1Ó¤J&ÍLÎZöÛßP$Å )fH+yQIiIqN#R櫤L#)IñFºjÙÓeø%]L2)¦I·È
-1=¤iä§?"³ER¶ØÆ,ų{Ã%Õæ¹Ø Ë55¨ÎV5 m³Uê@=h d¦§Ý »,×ú5µ´V°è®öý h ¥£àåz6Ô@'èÝà0è½ # ßrCOë²0!pÃà8
-.QË{Ø9gÀY0Îóà¸&À$¸¼Æ-7ÿ]µ2¦Áe0fÁ¸4¡ðXôÔk·ÀåV?©Ë@©ÄU â:¸
-ýX|lXnó£j@ÉB²~[8Ei>
-ü¦å^ó¬Jó9Üùân˽òmU`X<|+}â&_b,»{ÛÏu¼"=¾óvpÄpÇ;,÷ÞaBÏÓµ8"n¶Ürª`)]¤cl·Z®ø3UàÄû-÷ámiíà8`¹?¸ þ1HÜi¹gþR¦qI|Ør[sbüc³¸èqI|`«ÄX%Æ*1æñK¬ì³Ü_T{Ø'Ækñ(Ð+é^O}½cü{«tF1\<ðF<a¹¯DªÅR1ÎqNKâË=ÿÕbø*Àk1éÿÅø/Æ1ç-÷»t±OLÅ#BcùeÍr/ýN!õc½s¥b+¯¥beÌ YÈ@¨5@\æxÛrÿöZ©¥¯Î³(%eZ¸ .<ÛÚm{@£åþ÷õjEy`Õ*[ÛlNõ*öeu÷åm ekåh»2³ò±½ìê|»9»~¨öÕb,Xy#ýT2®óÇ9ÕùAs|DWv'§:?
-ȤÎäOçϲ¦óçÀ$¸Íé|F
-??ÈÎÏ sý¦jÉÎ+¡FNu~\óà*X³æHuÅ5pÜ «`Ù±{ª]ëà&¸6Àmp¬3þSÌV§¡Ø÷ÍûmUl£7³|1ç'uKJ9s6¬¢&Õ×_úkUб%Sªl
-F*1´¥:s~½O'cÒ.JÜU©û(Ý
-ðA ZÌyó.Ã%lQÂ%ÌPª÷[ºUKJØ¢-JØ¢-Jý ËGÇu^fØâh(ý®|û9ï{«NaK¨¨·îÃ@·-JJ°cÒêØ¢¤d:¶()
JJ«¯?aÎãïTój1/Mó¡ßvàÒ,À%F¿Äè®óïÓy``Ò2`àK7ÌùìÃÀ¥57Jx£#Jw{Ã?ÕÉldxÄV [0
-Dw奯æÒ9å7ISÄ; \P li/ѱÛøN®u 4F°4`Ø
-Z@9ÿô65À4Ò¡-»(ÿÃëDZÍùf×öý tà 8*øÏwënÐúÀpô0S ÇWNéÚãàÚÍ8mùLjÙ+êçÀyp 0 ¦À4`o¢cÆòµP+ÚÑþÇ<ЮÇ5 ½ë@;ìLÕÞ]°lù.5À¾FÇ*`7£c°Ñq°sÑq°_ákïY¾ë=ºö>`¢c°-Ñ-|jYúº>>`që²àu+Ûü"Õ2Ò~Áò#oQ±
-T#X溬WÝÊ27?±¤ó°ûì.k]µ®ËZ×e
ë²ÂuY¾º~«åtcÎZ×eë²ÖuY;»>cΪ×eÕë²®uý.ËßÑe<K_¥oU$e¡`
ëúG,ÿÈûuf`%ì²vY »¬]V³®?dù×+ X»,]Ã.Ëaå°ËrØeýë²®uý³÷ +x^òYËbÙõñk]5¬Ë×õxV®. ¸¬\]6þ]¼ne9ÿàûÔµ¾¯X»,n]V®¯=¯e .ácª®_1ÜǧÕÞ`Áë²:v}¼ákLÁ\¬u]G$ľßòy»®Õ¾^ðF-=&¦ÌmlRsD '®åÿÜ7àç$Ì ì°üW÷ë<àG$L 3C7¼à¦¤`[$= ÝòßÔ
-ÞHðF7¼`©¤`[$ø%a>HÆaLÆOä¤×òßû¼Å% .IpIK\à¦d`$Ì £0ú £0nÉå4¤ö0C_6a,Æ<$Á ¶H°EU¬0ÜÉåÓb6æÔ>HðAÆ7Áv7íi2úv2øDû÷Ù÷SËKÿÅÏu¤ML>»¥ß)x»ÌýÄÇ3¬JmI¹-´(¼¹¥iR[Ú¬2÷ÈSª¨õÍÄÅZsOT¡=ÈFÀÎãb`oqqhûA;h»:wQ×îÚ$¼ÌQ8 C tnp£`¹3Ϫ©Ðx£X<Á1pô»òðWC`4÷Þcª§À5÷gNóà¸ÆÜÅ0iîkÛuÙX ³æ¾õµÒæÀ0®åÃtí
-°nëæ¾ûtÙX«`
-¬à6¸ðÜç²QÜæ>þ¼Z¹îyhóðFYÞØ6÷©7éÚ6CémÑ/W\òG#
-ÓÙ¸.ãr¹_¸¢Z}Ê8¢¬½èVÐ`î|Y§`ò. h\RÆ%eÌPf9Â4eF¿sÊmæ~ù5 at f¬¨Z¬RÆ*eRî0÷kÓ:çqD¹ÛÜ¿ÿ¬4SÆå^s_ø®4½|â¦òQsð*iý Í}¹NL[ù$2÷9Uà«ò(6÷g4,UÆ/åSVÈüX¦)gPsIÚÀ>eÏ
-
-ÿ*
-_±^yÜ
-ÍKÒøP¤_ÊÓ`Ò
-]ªÀ\eõÕe+ôü²4<T¾æ¬0øQiº¯ñZ¬0"g¯|U^´×/
-¯qXyÅ
-Sg¤ñ}IQ`Ìòºæ?¬
-üWÆzå
-+,ÝÆ×|u×
-7ëÊ2V;ʤUåé}²âµG6TäAåi[ÅÇ>§×b
ß*«ï
-<ÞÞù¼4e4ÙðøÅcÎãëÏM¼0
-è>
-x'ôø.ÃSâ//<eÎ>ðø<Éã¾÷ø2Äã3<¦ÇwëFoíöøË㫧"¦=¾`òøÄ»a
w}]÷\éçç¿ £%«jþG-[Õä't´bU¯þ VêÑÏëhͪ¾1££u«úÑÃ+nZuÛ;tt˪Ï
-èhê?õ°åÛVýbîXMfJGwfß¿ëèÕL½¬£ûV³õZmZÍÿ¥£-«y馶¶åi=°ÚoQJ4cõþVeãU*ÕõY«ýê´rVûýtäX]]£òV×ûj¹VwY?°X°ºíGuTeuÏõë¨Úêþùã:ª±ú!Ýn±ÖêýAÕYýÓÏéüPQÓ&]\Ô:zÂê-çËVÿìÛõm¾y"ãð¾
-cGû9V~Ì¿Å)!$oÈÖeC²òefÈ'ä³£¼|ECv!÷²6²º! !Oû¤]Èã8dG;$Oâû¹.ÄÔ!{!óZÈ×1!Û0!ú!YÝð à{Íç°ð±LÈæFÈ«sÈÈædÈH%$zB> 9,$zB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%$RB"%dC1dC1dC1$Ï}B>ù²:ä»ÏÅÂ
-ÀW YElÿ|ÈÀ|ÈÀ¯îªü7?áÈ@äòÀPªA
-¨u 4F°4`Ø
-öf°´VÐöý tà 8:AèAÕ¿ðHæÿ5¼úM
+xÚ%{lY}ÇïïÞ¹sýã8qlÇvÛ±çå$Î$qüí8qb;¶çe;T[Zªº<Çl¡¨KyH;í,°
Ba+¸ÐK¶ÛQÛ[ 0í°¨± ¤E JQ;h
P¡¥÷óÍ?Ïùã¹ç|gæüÎär¹Ü¯ò¹\>g¹\SõO~t5«yö<Ú´»À©jaíÅ"pÑí6ŨAk@[£XêкÑnQ¬
+hÐnRl[ÐÐV)6hçÑV(6mhWÑ)¶íhh7(î h·Ñ(îmhwÐ)¶|®àÔ -PÜ:Ñv ]§ØºÑ:Ñ®QÜ
+öT5¿6Oq/èAÛvb/èCë@»BqèGE£8 Ñ΢]¦¸@G¥xB@¡8£]A¦x£]C»Dñ(8vmâqpí>Ú$Å`¤ªeß §Ài4ýÞqgÀ(úï"ųÀCkA£xGÛv¢0¦>=OQ
+£õ¡é2ýóI´ÃhEÝø%4õþ¥~ôúe¢:ì2ú@·«Î¾ví4E
+Tuf4ýT
+òu´.´2È"Ú4uÌuÍC;AQÆ\AÓx¨eêh7ÑQT@¬¡ÝEÓð(î éþ)*«E') ihïu´-h)nM4õ³lQä\\
+v÷Í9*NSq`óhgÐðUL°Çî E=vÑfÑðdL°Ç5hh ö¸M??Ç{\
+öâ&
~{¼X öx+LÓG`·¡µ¡G1ÁoGkGë¡H°ÇhûÑÁ`ÛТí¡H°ÇhGÑß`;Ñô{»)ìq7Ú4uò´)´NúG=hóhjJ7٦ɨ¢~`?úE·¡ÎDÛ@k£¨öx±¬ ÓOÐ BSµRdTãÃhµhúù8"FÛ¶"n¡íES×áÄøújE\ @S·ñi´h[)=ñ(NCFäÅnE¢6>vMÃM°ÇchËh
+ öxMFUöxMQE=®»Û-óËf{<ÖVC`/£é÷Ê¢{|mÍ¥H°ÇóhÇÐdo=¾vÍ¡H°ÇU{»þ B`o iÍS$Øã4=4V{\s7Õå(ìñZõgÕK=¾ÿM{|m öx¾Ö)ªbÉ-Ð)ÕFíj°ÿF£s÷ÐTo·´@àw)ÆÜ¡X.O¦à6ŨAãɬQ¬uhDpb=h@»vb#Øvmb¨ZªTÁ¬Á
+Åf°
+M±L±lGÃÁ
+;,·íVõ6¿7'Ú@;è »@è»Ahµ\ÃSºbÀ :BGÌ/³h°ìäJÁªÅ÷Z'×KEØúÁ ûÁpCà0P£Ãà(8à$§Àip³ÀçÀyp`LI0.i0fÁepÌ^ËÝ~Z=tð~h æÀ"X
+ÆMªä
+FnÍä¿û`lMðM½Ð{gð¶9Z¼c o£µ÷ÉÑzÀ[äh#àÝq´ ðÆ8ÚxOm¼î ¼î»sÍröê6ä¦Ë½÷;Aè»Á°ô^Ðö~0 Á~p À8apÇÁ pSàè°Ü«©[;
+Î`xà8.1p 0 ¦À%0
+fÀ,¸æÀpÌkà:X ` Ü£{Ã-ÝÚ
+Îá)àÑð ÔÙ¼ö£~À¤êíâñìñxÃóÔu·ÁpÜ÷Á:Øà5^ÞX³Ü;Þ¡ÿ»IóOBjÙR¤ÑZ³?ø$ç
x(¬³ÜGª¨
+%Ë=5/
+s
ø*Ô_
Zà«Pë|jÕÁ*!¶Ü72]«>±E¸Ór/|Zí Ð!æ
+1W¯BÝ8¾
+ñU¯BÒ!F
+1RAÂ}ûÞ«Ô(¾
+qSBÜòvô ]¯BÜâ¦ðå~úoº
gÌÖª-B\°\zDÚ(Àf!æ
+1W¯B|^4ͽ<§±TU ³ß,KÃa!qXÃBâ°ã@?#
×Ì^óS]ÍBâìp¬¬Á4ª7ÌÞô3ÿÂ5UB¬b«²Ê&xÀµ9` x£Z¾óUªpA+(½ûíÒJ ÔzÐ Áжf°
+´í
+´.°ÓìÉïªå]EaÀrÎa-ét}äIÕî½`¯ÙÇ륱´tX7:}fzQÚ>°}ösÒiu£ýM*#`È,º/u££Í*SÒà¸ÙþGkD 3bÿ£´Sà,¨éù'¤éÅá8G¬øÏìëCª8.fßz§4«;gÜìÅei`Lýà=ÒXì9¬ä³?*m\sfÿõEi²îô:7{éWª¸ÀÙ/¥-pÃòö´ep¬ZÞý¶4¹îX³|ý7¤Ý÷Á]Ë7÷Jã=6P¯muËïx*6X^Ëu,¿³ÍÏYþí3:r@Þò=ó* æòïÿ 4é× èãD'ú8Ñ'3áo±üáß×ÉØÑÇ>Nôq¢ý {û;Æô1¦}r>õÕØËÀ¾2xÍWÞb ([õ||å+)1Àf¾¸ÉWÚ[øJ6ÐM>)\¿Ûò§éî±Íü3çB0Âηðtñô/sܦk1-ü1ËϾWóq?0¹üZÖÏZ -uRWÌQ¡^Ó[zm`)¿ø¿ùe¥ü çøk ê=l
+çø8Ç¿°
¿n[þÿªSd~9³TÆÜäoXþuÿÇ)YÎ
+¥ê«dE²åßõU¸4À dØ"ÃÊ 2ñ;²:Ë¿¿UW0_e¤;z2Ã*¶È°E-22cóP#2a¬ÕòOO¨ëOÿ¿d¸$ë¶ügþ^§`L·_2lõ[>ÒTaW2<N³c,3
+[þKïÓ¸)ÃCʦ¢ë2%§0M¦ÓM¦¤T¦~ÉtÂÙqËåcjdü_ÝVÉ`Ò(]ÄL)40M6cù¯E
+`d!«äE$[¢Qb&Ã9È_2¬1d$ÃÙ²åü.]_²UÀ$al¬ÓCVF~öCò9$eä)±Â«/ª¶ÈÝlÀ6àX¡yjIàlÔÒ6õ 4- ÌôT±´= Å
+íPS;Ah;îjèÝ@K(U {п¦z@/èû@? `?8Zaø)]vÃ`ÇÀq0Nà¤Î>ìÓàgÁ9p\ã`\J^cVûZSà3`\Px,zêµ[`Þ
+ËQ@IÅ% Tâ2PqÜ~¢A¾Ö¬°þ§j@ÉB²~8Ei>
+üº^þJó9Üù`»^úº*°E¢D>H¾ÃI3À/ H\+¼ñºD^@'¤ï¼1ÜÉV+¼ã¸N!çéZ´Zá=U°èç[$íV~®
+`¤Ó
+ïßÖöÝVø³óÒè¿$=Vxú¤a$û¬ð©Ui8'Á/ 6KÝ3.I ¬`«$X%Á\ ~ItVøÌjû$x-9 ôCº×S`ï¿$¢]¼[á±j±TsàdÚ
+ÏCµØ'¹ðZBb:Á þKpDA9+¼ðV]ìfñÐD~Y±ÂwÿP§zN°^BÂ9ÁR ÎIWÆR²ÉÈJæ<( J Ô: .óF²i
½WÔÓWçÌYIÊ3Ií Jí6 É
+ÿû¨ZQXµÊÖ¶S;¬@YÝ]@yÛÝ@ÙÚ½@9Ú^ Ìì> |ì »:×eNËÔ²Z«¬s¤JÆuî §:7dÎîè
+Ò®säTçN2©s§ ùÓ¹3¬éÜY0.ãæô<ÈÎdHç¦Á¸9GµdCçP#§:7.9p,sfºâ*¸®e°dÎè=ÕÞ «à&¸ÖÀmp¬3ö3ÌV§¡Ø÷Í}*ÖÉÑÊÌYÚVÎóÕc:Â%å9ë?QQÏêkίý*èØ2Î)76ÊM #Úr9¿5¨±E¹à2wUnÅ>Êg·|PÆ å6s^wBa2¶(c2f(Wûõ}ªÅ%elQÆelQÆå ×ÇÆtÞ fØàh(ý®|û!sNaK(P[I÷ã@·-ÊJ°c²ÒêØ¢¬d:¶(+
ÊJ«¯?jλ߬æÕ2c^2ç}$íÀ/å7Ê~Ñ/_1çÏ×yó``ò`àË×ÍùäÃÀå7Êx£#Êw{ÍÏÔÉldxÄV[0
+Dwõ¥¯
+æò9×JSÄ; \PliéØM+ú N®
+ lM`+hÛ@ØÚ@9ß|£`éVÊ]ÿáõ íæüG«Îë »@'èÝ`7Øöªþûmº¢A° Á!0ÐoÎK#ºö8
+Níf²bnPµìÉúgÀYp\ c`LI0Øè¶býÕ¶C´ÿ1´ëqh¯ãÐ;SÚ»¬ØÖ«Ø×è^ìft¯ö0ºov.ºoö+|
+ã=+ö¾]×ÞlPto ¶%º±
O-K_×Ç,n]¼nuq[ül¬ZFÚ/YñÄëU¬µ à¹.ëU·ºÌ-/ê<lÁ>»ËZ×eë²ÖuYẬp]¯®ßnÅ
y]Á³ÖuY뺬u]ÖήϳêuYõº¬k]¿×w§uÏÒ×eé[¤
+V¸®¿ß¼SçaVÂ.+a°ËJØe5ëúÃV|TÁrØe9ì²vY»,]Ã.ë_uë±¢ÿ}]ÁóÏ\Ë®7X뺬a]¼®ÏÀ³ruùÀeåê²ñï²àu«Ëáâ?®¦ô¬eô}ýÜÄÂØeqë²v}íy-ítá3°Tuýªá>4¥¦ð^Õ±ëã
+_û`2æbëú8"%öýûVüøïéZí[é
o¤Ø"ÕcbÒܦfU0G¤rêZñï<ix#Å)HqNÊ2 éV+~±SçáG¤8"e¢HR¼â7¥í [¤Ø"í]Vüj¨VðF7R¼âK¥½ [¤Ø"Å/)óAÊ0¦cÊ0¦|Ê §Vüö_ªQ\⤸$Å%)nJI1HÊ|2ú)£2ú)ã°âÕfHñKÊЦeÊ§Ó ¤$Å)¶H±JUR;´bVVSczQÐÆÂ)>HñAÊø¦!Õî&3Cª=MF?ÕN&jÿò>û~jyÑ¿ú¥´©Ñg·Ôã;¯ÅÜ(ÇÉÚ¡Ô¤ÛæH+(»wIv(µÕ¨=Ès÷?©ZÐØL\¨7÷XIÚlì<.4övVÐ º@¨ÞÕÙºv'Ð&á%ºÁn°ì= ô}à8 v;ýê7
ý`GÁAso<üGÀ08{ï]ª8FÀ88iî#+NçÀyp¸Ó`ÂÜWvé²I0fÌ}Ã+¥ÍË`\ÊéÚë`Ü×Ì}Û¿ë²E°Á
+X7Ámp<à¹Ï£¸ÖÌ}÷ójå.¸ä¡uÎÃycÓÜ'_«kVZÿ¦ô¶ÎèWª.ùÄ?KÃ46®+8¢Rgî§/«¢`
+¨h/ºl1÷¯Ó)¤Ò´K*¸¤*2ÃG¦ÂèWpN¥ÃÜçQdÆÕb
+V©`J·¹_Ò)8§#*}æ~íÒpN[TÌ}á[Òôò*Ìýþˤ¤2dî¤éÉĸUas_U¾ªÇÍý¹'
+KUðKeÄJ¹HÃ4³àê.JاâYiËJÃW¬W³Rë+¤ñ¡H_*S`ÂJÝçT¹*ê«KVê4<T¹
+f4ôyiº¯UðZUætâ/T{
+à«Ê¼ý×*8¬rÃJÒø¾$P+³²j¥¹Ï©ÿU°^eÍJ¯Æ×|u×J7?!
+×U47å¬~ÅOïU¯=ò¨<¨<m+²¸õØçôÚ¬ô»ßQ-ßx,¼CVzó¤)£ÉÞÇw([t_x|nâ 'ݧ ïßexJñå
§Ã9ÀG'y|#âÑ÷_x|ãÇôø.ÃcÝèM²Ýpy|ãòtCÄ´ÇLx×ôÖïé«ýü|¬£E«iÍt´d5ÏéèÕüú_éhÙjû²V¬æ+JHz«VóÃWÜ´Ú}9êݲڳt´fµ}Øòm«}qPGw¬.wOGw®³FG÷¬nª¨£ûV·ñ¸Ö.hÑÑÕ}÷U:Ú´ú¶guôÀê¯?¡hÎ?öêþöT4«ô¼Õñ¾
+Vÿ½_èȱý:*Zï#×.é%kØ|JG5Öðìjá;«£:k<ªÛ
+êÑÖQ5>õ5
+4mÒžÔÑVoá|<,Yã3¢okõÍgõU;ÚÏâĨúc#Bk"5IÞË'F81b âËÌ%OÄgGyùF$í"î%b%jdu#6 "öI»ÇqÄvD0Â÷s]©#ö*#浯c"¶a"6ô#²ºÑÀ÷4ÏQ/àcÍWç=ÿÍÉ=ÿ4KDôD|
+$sXDôDDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJD¤DDJÄ0FcÄ0FcÄ0FcD?"û1E|ñeuÄwEk9'"¯±Øþøøª_Û[ø¯þK#yP (@
+¨u 4F°4 l-`;ØZÁNÐÚAØ:Aè»Á°ô^Ðö~k|á¹ÿªªú´
endstream
endobj
startxref
-907623
+907649
%%EOF
Modified: pkg/RSiena/man/RSiena-package.Rd
===================================================================
--- pkg/RSiena/man/RSiena-package.Rd 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSiena/man/RSiena-package.Rd 2011-12-14 15:36:13 UTC (rev 190)
@@ -30,8 +30,8 @@
\tabular{ll}{
Package: \tab RSiena\cr
Type: \tab Package\cr
-Version: \tab 1.0.12.187\cr
-Date: \tab 2011-12-06\cr
+Version: \tab 1.0.12.190\cr
+Date: \tab 2011-12-14\cr
License: \tab GPL-2 \cr
LazyLoad: \tab yes\cr
}
Modified: pkg/RSienaTest/DESCRIPTION
===================================================================
--- pkg/RSienaTest/DESCRIPTION 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSienaTest/DESCRIPTION 2011-12-14 15:36:13 UTC (rev 190)
@@ -1,7 +1,7 @@
Package: RSienaTest
Type: Package
Title: Siena - Simulation Investigation for Empirical Network Analysis
-Version: 1.0.12.189
+Version: 1.0.12.190
Date: 2011-12-14
Author: Various
Depends: R (>= 2.10.0)
Modified: pkg/RSienaTest/R/bayes.r
===================================================================
--- pkg/RSienaTest/R/bayes.r 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSienaTest/R/bayes.r 2011-12-14 15:36:13 UTC (rev 190)
@@ -423,7 +423,7 @@
}
z$FRAN <- getFromNamespace(model$FRANname, pkgname)
z <- initializeFRAN(z, model, data=data, effects=effects,
- prevAns=prevAns)
+ prevAns=prevAns, initC=FALSE)
z$basicRate <- z$effects$basicRate
z$nGroup <- z$f$nGroup
is.batch(TRUE)
@@ -465,7 +465,28 @@
{
z$priorSigma <- priorSigma
}
- z$ratePositions <- lapply(z$rateParameterPosition, unlist)
+ groupPeriods <- attr(z$f, "groupPeriods")
+ netnames <- z$f$depNames
+ z$rateParameterPosition <-
+ lapply(1:z$nGroup, function(i, periods, data)
+ {
+ lapply(1:periods[i], function(j)
+ {
+ rateEffects <-
+ z$effects[z$effects$basicRate &
+ z$effects$period == j &
+ z$effects$group == i,]
+ rateEffects <-
+ rateEffects[match(netnames,
+ rateEffects$name), ]
+ tmp <- as.numeric(row.names(rateEffects))
+ names(tmp) <- netnames
+ tmp
+ }
+ )
+ }, periods=groupPeriods - 1, data=z$f[1:z$nGroup]
+ )
+ z$ratePositions <- lapply(z$rateParameterPosition, unlist)
for (i in 1:z$nGroup)
{
use <- rep(FALSE, z$pp)
Modified: pkg/RSienaTest/changeLog
===================================================================
--- pkg/RSienaTest/changeLog 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSienaTest/changeLog 2011-12-14 15:36:13 UTC (rev 190)
@@ -1,3 +1,7 @@
+2011-12-14 R-forge revision 190.
+
+ * R/bayes.r: fix bugs from previous changes
+
2011-12-14 R-forge revision 189.
* po/R-RSiena.pot, po/RSienaTest.pot added files for translators.
@@ -38,7 +42,8 @@
src/model/Model.cpp, src/model/Model.h, src/model/State.cpp,
src/ml/MLSimulation.cpp, src/model/ml/MLSimulation.h: added
facility to return log likelihood after simulation, stopped
- returning of chains every iteration. Bug fixes for ML.
+ returning of chains every iteration. Bug fixes for ML. Added
+ R/algorithms.r to RSienaTest (previously in examples directory).
2011-11-27 R-forge revision 185.
Modified: pkg/RSienaTest/doc/RSiena_Manual.tex
===================================================================
--- pkg/RSienaTest/doc/RSiena_Manual.tex 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSienaTest/doc/RSiena_Manual.tex 2011-12-14 15:36:13 UTC (rev 190)
@@ -9423,8 +9423,10 @@
repository.)
\begin{small}
\begin{itemize}
+\item 2011-12-14 R-forge revision 190
+Fixed bug in Bayes left over from R 189.
\item 2011-12-14 R-forge revision 189
-\item Fixed minor bugs in reports and error messages.
+ Fixed minor bugs in reports and error messages.
\item 2011-12-04 R-forge revision 186
Fixed some bugs in ML estimation procedure which will alter the results
slightly. Added algorithm functions to RSienaTest package.
Modified: pkg/RSienaTest/inst/doc/RSiena_Manual.pdf
===================================================================
--- pkg/RSienaTest/inst/doc/RSiena_Manual.pdf 2011-12-14 13:27:34 UTC (rev 189)
+++ pkg/RSienaTest/inst/doc/RSiena_Manual.pdf 2011-12-14 15:36:13 UTC (rev 190)
@@ -5034,28 +5034,27 @@
endstream
endobj
2060 0 obj <<
-/Length 1815
+/Length 1841
/Filter /FlateDecode
>>
stream
-xÚ½YKsÛ6¾çW¨7j&¢ >D*·8Sw¦ã¤D`
-0æC@~´¾»XÙãÈi¤Ärwñíî·p4ÙL¢É/o"÷{¹|sq&I:'Ëõ¤XQTLò(
-Y2,W¿Ëé±8>ly³z:Kò,(ÛzÇXÑiéWpUI¡èán°@(-ÛFOÿ^þzqULX.¢ÃOEYyVÐW[¢Qp3ÅE 6²qÜà/ÈjV4ñ[iZ÷¢8o§³4ÊîßjêF+a¸¬4I)§°¯3Vï·æhX"JCf+h°×0`² Îæl|²èwÕÎÐ6´±pedÍFñºÛaozÛî+Ô*IÁqÞWH:@éûëvC+ MZ¹·Ú~?|~ÿ¤µfd3gëVmÜ>%vÖ[¦UÓ"
-BСæ.®à(ábÏñxØ<,¬ÊÃyä¬]ò=£-Qh"z9±xÆRRb Q
-ÝI-±bñ*3'øûu¹ªðZ6ä´4¸Ù£»5=xv¾RÆ
- P9 )<úÞ¸¦{W¦I6p%.±bNg2¾¡ÛZÐäÍÍÅlhíã5=mdÍ;ÕZ7bµWn÷ P죬ªç°Ï+#Ô@Ðûp¨äfh`<¥i¼_^áÉ´JmM3ë}SIHpë@õE/Q
-X at s;n£évÍ8³
-Åù0ÏĦl(79x± éÿ¾¤Yx=.9zôÿXWB¡ã]9E7ÞÓ¤:;8®xUÊMp ïÛÌ9ýf,ç,y=Ã5f-«@%øç<0.õvºè¤%
-z»\Ø0ûéxÍã×jþ ^=I6ã²ÓA8
->÷p>~£Ö²q%ànAY«ö~'°µª|æÂb\ #¾ÓgIêÐ>Øw¡ý¨¤¾ÃsÈ+°P>øéÏ2éϲϾ%¯Ê}åò-yk¹q_ÑÁüR)²;ÂÖäÝéBû`úö>hw"ÖO
Rû]ï<ïÕÝw!ÍòBBÓS¤1D¢÷ýÈ°ÿ°.ÃPDlEM«µâ4Z«Öå±s _TòÓ¾§JnOÓNRãÓ[Y;8Æ÷ÄNÏ3Çà(>!J"©O¢Ã
-¢½vf¯Î]¼,ÅÎp@ÉØûxIOm뽬E¤ç4CÒãFµûݸ¦Á
-£>âF(i·#ÐU8ÔháP£å?âLðI©Ì¥Td¡Tæ
ñ ²Yù °»·îÀ6)§6 Ä{ÂDp] ðuÇÖºÀÀ:Uߤ+[ü³³«Tý¶_ò
óB´~ð3N ᶷÑ2yÇrµþÆ9ÿ8{ y~Q0P'?¦!¥ewØ)É]%Íò¡¶öñ!\¬}ní;hXÝrDÞÝ´kÖ}¶ìît)Ä÷À´°q _Z%ìjÇsaZíöRw»7]ÜÀ$d÷W`î3MÄ!KÃIh^üç[_á
-h
<×A
-`:1Ýq¦mfJ|ËÞ]®Û õkrtü}ÒãrüÇï6vÒ÷vãÖíøòÜ
-#êY¸O`úAÖ.GÚ Ëàh+¹%g·6m®hµo, Ëdi|ºtòèÎ
-^îÃÔ¾YÙÄ
-³+AÁPµ»iU·x«Ûºô ú£q©üÆõ¯oR4 ]·Ñíh§ßºZÒ; Îó¶çºøôÕPxµ²kßtùR#}±²A(DgH'GÍÚ¨e¦Ô_¨óE Ûïìã3QaÔ@þ +8²ã ))×y7¼3ÀE41vì¬
ÓñF¶q)©ñnv|p
-ü¡è×á9XUdÕxWfhà|CE7àë¾Áò9Mc+¦{òã`÷¦;øÞ.Û^Èn¶L»âÒ &8íû/uÕc%JéÂÌ,êÒß2ÊÑÏ%OfjN<»{ c4¦çá2Ñü.sì¥ûÿ}ñ¨(l/°óçú±®pÒ
¯0¿ö®÷ö¤ÅòZÖÒøJØh£¸¤*0u÷t}U¼rs÷àÍ{E+·vd[,5ihöy*.EóÈÔ§|ÌÝm=w©Û
Ûá×ÿQbYÌ+@
Eáþ¯ÄæñhÏÏË7ÿüp¬j
+xÚ½YKÛ6¾çW¸7y&ÖzXrnI¦ÛÎ&é$îôÐôÀi³zxDz³iÿ|dïvãM³>"E > èh²D_^Düûfùââ2M&"
+tOëI±£¨äQd>Y®&o¦3!â,x»ÍFé,ɳ lëìÔlK¿JvV=ÜN¨Îè¶1Ó¿¿^\
h!ðSÑdÇaôåV£èE\Ogq¨nxBZüYÍ&>¶å·:£hñr:K£,þ¶©¾Òh¥¬Ô!)åöõ¦Àê¦9Z#¨ÒÒ¢Ý*ì
+DÐMENgs1>GYô[×ÎÐ6´Fpedͦu
+¶ÃÞ$ ̶ÝW¨UÂÁ5f_YZ é0 rT
+¤oÜw®Ú
+6iÅoµ
+ý¾ýøú=Ik;ÑÍÀ4ø8[·Ý÷ujçN«5Ú¶Ý×i!h/Pó
+àE¸ÇstEUy8Ø*Ð%?Ús°%
+S MD/Ç3ÏDJJ4JA£[À %±hp©ïÓõ~shÚNú¥ø\+µælqúvê3ë®ùÃ$P ¶3xÆêÇâbqÏâZ7Þ`¼[²sp¸54C8WT×ù}µ2F°ÏdhÂô`hd#CqIs°¡øikEd'tCkï®èY«kiYNìºÖA¸T«}Ç»GëuU=²²}xt
+Ðg¥7[d!a Æw¦ÁëÕÊ»FVm§í¶¦õ¾)Ël$¸eÒªKÐÜNºè¾fó sßÀÊ ÌĦb,7 jÂbAÒÿyL"ñzôá
+! ªG¬Fç Ü»bE7~¡5H½ù¸Av²ªTÅÒ!ÀícæÌX¿È¹HjO¨e5fQ§@¥ä9LTa\ ̺è¤%zsnnýtºæñS5ÿ ¨÷ùÁ§ô¨öNwpÆlÁðßhn8#ßN3(³ÕÞïÄB¶VìÝ 9¨Uߪ1³$e´ ö]h?)妯ÐYp ê;Nº½/ÁiïËRVå¾â<ä
+ÍKª´ücaÌ/Í"[lM^=_h_Òá%¾Fã´;M;?̧Pö»áðü©î¶²iqv$õ¦T$ò½`ìGýÛâC±UC4Ö<&5æ:ygQéÇU7¼§im/©ñ鬸ñ5±å3ÄÌ)8GHm4$Ñq1^;»ïþ¸dYª{±÷#1ðÆÕ{]«>(FIý4CÓã¦k÷»Ã2+ì87ªÓ®`Ò]£Æ(FÑ«3Á#:%¥
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rsiena -r 190
More information about the Rsiena-commits
mailing list