[Phylobase-commits] r411 - in pkg: R inst/doc man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Dec 30 19:42:00 CET 2008
Author: francois
Date: 2008-12-30 19:42:00 +0100 (Tue, 30 Dec 2008)
New Revision: 411
Modified:
pkg/R/checkdata.R
pkg/R/class-phylo4d.R
pkg/R/identify.R
pkg/R/methods-phylo4.R
pkg/R/methods-phylo4d.R
pkg/R/treewalk.R
pkg/inst/doc/phylobase.Rnw
pkg/inst/doc/phylobase.pdf
pkg/man/check.phylo4d.Rd
Log:
attempt to make arguments consistent: c('tip', 'internal', 'allnode')
Modified: pkg/R/checkdata.R
===================================================================
--- pkg/R/checkdata.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/checkdata.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -76,7 +76,7 @@
}
## make sure that tip and node labels are unique
- lb <- labels(object, "all")
+ lb <- labels(object, "allnode")
lb <- lb[nchar(lb) > 0]
lb <- na.omit(lb)
if(any(table(lb) > 1))
@@ -174,7 +174,7 @@
}
else {
## Some tips are non-unique
- tipsTable <- table(labels(object))
+ tipsTable <- table(tipLabels(object))
if(any(nU <- tipsTable > 1)) {
nonUnique <- paste(names(tipsTable[nU]), collapse=", ")
nonUniqueMsg <- paste("Tip \'", nonUnique, "\' not unique", sep = "")
Modified: pkg/R/class-phylo4d.R
===================================================================
--- pkg/R/class-phylo4d.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/class-phylo4d.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -69,7 +69,7 @@
}
if(!is.null(node.data)) {
emptyTipData <- array(, dim = c(nTips(x), ncol(node.data)),
- dimnames = list(labels(x), colnames(node.data)))
+ dimnames = list(tipLabels(x), colnames(node.data)))
tmpNodeData <- rbind(emptyTipData, node.data)
## TODO? - add test
tmpNodeData <- tmpNodeData[match(rownames(all.data), rownames(tmpNodeData)) ,, drop = FALSE]
@@ -89,7 +89,7 @@
}
else {
emptyTipData <- array(, dim = c(nTips(x), ncol(node.data)),
- dimnames = list(labels(x), colnames(node.data)))
+ dimnames = list(tipLabels(x), colnames(node.data)))
emptyNodeData <- array(, dim = c(nNodes(x), ncol(tip.data)),
dimnames = list(nodeLabels(x), colnames(tip.data)))
tmpTipData <- rbind(tip.data, emptyNodeData)
Modified: pkg/R/identify.R
===================================================================
--- pkg/R/identify.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/identify.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -1,12 +1,12 @@
## setGeneric("identify")
-##
+##
## setMethod("identify","phylo4",
## function(x,n=1,...) {
## plot(x, ...)
## last <- .last_plot.phylo # information return from plot.phylo
## N.tip <- nTips(x)
## N.node <- nNodes(x)
-## tips <- labels(x)
+## tips <- tipLabels(x)
## if (!hasNodeLabels(x)) {
## nodes <- (N.tip+1):(N.tip+N.node)
## } else nodes <- nodeLabels(x)
Modified: pkg/R/methods-phylo4.R
===================================================================
--- pkg/R/methods-phylo4.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/methods-phylo4.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -113,11 +113,11 @@
})
setMethod("labels", "phylo4", function(object, which = c("tip",
- "node", "allnode"), ...) {
+ "internal", "allnode"), ...) {
which <- match.arg(which)
switch(which,
tip = object at tip.label[order(nodeId(object,"tip"))],
- node = {
+ internal = {
if (hasNodeLabels(object)) {
object at node.label[order(nodeId(object))]
}
@@ -145,7 +145,7 @@
setReplaceMethod("labels",
signature(object="phylo4", value="character"),
- function(object, which = c("tip", "node", "allnode"), ..., value) {
+ function(object, which = c("tip", "internal", "allnode"), ..., value) {
which <- match.arg(which)
tipOrder <- order(nodeId(object, "tip"))
intOrder <- order(nodeId(object, "internal"))
@@ -162,8 +162,8 @@
object
}
},
- ## If 'node'
- node = {
+ ## If 'internal'
+ internal = {
if(length(value) != nNodes(object))
stop("Number of node labels does not match number of internal nodes.")
else {
@@ -201,26 +201,26 @@
setMethod("nodeLabels", "phylo4", function(object) {
#x at node.label
- labels(object, which="node")
+ labels(object, which="internal")
})
setMethod("tipLabels", "phylo4", function(object) {
labels(object, which="tip")
})
-setMethod("nodeId", "phylo4", function(x,which=c("internal","tip","all")) {
+setMethod("nodeId", "phylo4", function(x,which=c("internal","tip","allnode")) {
which <- match.arg(which)
nid <- switch(which,
internal=x at edge[x at edge[,2]>nTips(x),2],
tip = x at edge[x at edge[,2]<=nTips(x),2],
- all = x at edge[,2])
+ allnode = x at edge[,2])
#sort(nid)
return(nid)
})
setReplaceMethod("nodeLabels", signature(object="phylo4", value="character"),
function(object, ..., value) {
- labels(object, which="node", ...) <- value
+ labels(object, which="internal", ...) <- value
return(object)
})
Modified: pkg/R/methods-phylo4d.R
===================================================================
--- pkg/R/methods-phylo4d.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/methods-phylo4d.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -3,10 +3,10 @@
setMethod("show", "phylo4d", function(object) printphylo4(object))
setMethod("tdata", "phylo4d", function(x, which = c("tip",
- "node", "allnode"), label.type=c("row.names","column"), ...) {
+ "internal", "allnode"), label.type=c("row.names","column"), ...) {
which <- match.arg(which)
## FIXME: should have no labels in this case?
- if (!hasNodeLabels(x) && which=="node" && missing(label.type)) { }
+ if (!hasNodeLabels(x) && which=="internal" && missing(label.type)) { }
label.type <- match.arg(label.type)
if (which == "tip") {
if (all(dim(x at tip.data)==0)) {
@@ -32,7 +32,7 @@
return(tdata)
}
- if (which == "node") {
+ if (which == "internal") {
if (all(dim(x at node.data)==0)) {
return(x at node.data)
}
@@ -67,7 +67,7 @@
nodedata <- data.frame(label=nodeLabels(x))
}
else {
- nodedata <- tdata(x, "node", label.type="column")
+ nodedata <- tdata(x, "internal", label.type="column")
}
if (all(dim(x at tip.data)==0)) {
tipdata <- data.frame(label=x at tip.label)
@@ -100,7 +100,7 @@
})
setReplaceMethod("tdata", "phylo4d", function(object, which = c("tip",
- "node", "allnode"), ..., value) {
+ "internal", "allnode"), ..., value) {
which <- match.arg(which)
if (which == "allnode") {
namesmatch <- all(colnames(object at tip.data) == colnames(object at node.data))
@@ -115,7 +115,7 @@
stop("For now, only data.frame or matrix can be provided")
switch(which,
tip = object at tip.data <- value,
- node = object at node.data <- value,
+ internal = object at node.data <- value,
allnode = stop("for now, must set tip and node data separately"))
if(check_data(object, ...)) object <- attach_data(object, ...)
object
@@ -128,7 +128,7 @@
x <- object
summary(as(x, "phylo4"))
tips <- tdata(object, "tip")
- nodes <- tdata(object, "node")
+ nodes <- tdata(object, "internal")
cat("\nComparative data:\n")
if (nrow(tips) > 0) {
cat("\nTips: data.frame with", nTips(object), "taxa and",
Modified: pkg/R/treewalk.R
===================================================================
--- pkg/R/treewalk.R 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/R/treewalk.R 2008-12-30 18:42:00 UTC (rev 411)
@@ -16,7 +16,7 @@
if (is.character(node)) {
## old getNodeByLabel()
nt <- nTips(phy)
- tipmatch <- match(node,labels(phy,"all"))
+ tipmatch <- match(node,labels(phy,"allnode"))
vals <- ifelse(!is.na(tipmatch),
tipmatch,
ifelse(nolabs,NA,nt+match(node,nodeLabels(phy))))
@@ -26,7 +26,7 @@
## old getLabelByNode
nt <- nTips(phy)
vals <- ifelse(node<=nt, ## tips
- labels(phy,"all")[node],
+ labels(phy,"allnode")[node],
ifelse(node<=nt+nNodes(phy),
ifelse(nolabs,NA,
nodeLabels(phy)[pmax(0,node-nt)]),
@@ -70,7 +70,7 @@
node <- getNode(phy,node)
if (is.na(node)) stop("node ",node," not found in tree")
n <- nTips(phy)
- if (node <= n) return(labels(phy,"all")[node])
+ if (node <= n) return(labels(phy,"allnode")[node])
l <- numeric()
d <- children(phy, node)
for (j in d) {
Modified: pkg/inst/doc/phylobase.Rnw
===================================================================
--- pkg/inst/doc/phylobase.Rnw 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/inst/doc/phylobase.Rnw 2008-12-30 18:42:00 UTC (rev 411)
@@ -147,7 +147,7 @@
Print node numbers:
<<nodenumbergeodata>>=
-nodeId(g1, which = 'all')
+nodeId(g1, which = 'allnode')
@
Print edge labels (also empty in this case):
@@ -232,7 +232,7 @@
summary(g2)
@
-Or use \code{tdata()} to extract the data (i.e., \code{tdata(g2)}). By default, \code{tdata()} will retrieve tip data, but you can also get internal node data only (\code{tdata(tree,"node")}) or --- if the tip and node data have the same format --- all the data combined (\code{tdata(tree,"allnode")}).
+Or use \code{tdata()} to extract the data (i.e., \code{tdata(g2)}). By default, \code{tdata()} will retrieve tip data, but you can also get internal node data only (\code{tdata(tree,"internal")}) or --- if the tip and node data have the same format --- all the data combined (\code{tdata(tree,"allnode")}).
Plotting calls \code{plot.phylog} from the \code{ade4} package.
@@ -444,7 +444,7 @@
\subsection{phylo4d}
The \code{phylo4d} class extends \code{phylo4} with data. Tip data, and (internal) node data are stored separately, but can be retrieved together or separately with \code{tdata(x,"tip")},
-\code{tdata(x,"node")} or \code{tdata(x,"all")}.
+\code{tdata(x,"internal")} or \code{tdata(x,"all")}.
There is no separate slot for edge data, but these
can be stored as node data associated with the
descendant node.
Modified: pkg/inst/doc/phylobase.pdf
===================================================================
--- pkg/inst/doc/phylobase.pdf 2008-12-28 15:39:20 UTC (rev 410)
+++ pkg/inst/doc/phylobase.pdf 2008-12-30 18:42:00 UTC (rev 411)
@@ -10,7 +10,7 @@
<< /S /GoTo /D (section.2) >>
endobj
12 0 obj
-(Package Overview)
+(Package overview)
endobj
13 0 obj
<< /S /GoTo /D (section.3) >>
@@ -100,345 +100,351 @@
<< /S /GoTo /D (appendix.B) >>
endobj
72 0 obj
-(Validity checking)
+(Hacks/backward compatibility)
endobj
73 0 obj
-<< /S /GoTo /D (appendix.C) >>
+<< /S /GoTo /D [74 0 R /Fit ] >>
endobj
-76 0 obj
-(Hacks/backward compatibility)
-endobj
-77 0 obj
-<< /S /GoTo /D [78 0 R /Fit ] >>
-endobj
-98 0 obj <<
-/Length 1259
+93 0 obj <<
+/Length 1330
/Filter /FlateDecode
>>
stream
-xÚÕXKoã6¾çWèTP@¥ð-òT$éfÛ^tÝ^¶=hm%6bǬlšßyP~È6âMÑÇ $Q9ßÌÇápF2»ËdöþL y^ŽÎίÍTUjål6º…f,Cå2¯\i¢ÎF“ì£åJLájò?F?ÁŒ¸=ÃèÒ‚ ÉC qè ÜæK¸Ù4aÂ…RW¦Ÿð†F*1Æi5ÜVx5+ì•¢~€· ·
-´;Te™ÚC7& -3¥ÊèœFŒÂØÒ9—:”!*†ºÄÙ I;q‰êÍáºÏu%ðC‹ ¼ø†¿ßPw‡F·ÜsµÌuÏØ_“ €Í´*uð cJ¬Ì÷8iÜ,pø'RsK¼†¦‚ë[ª%´e`¬É”-õl‚¡Î‚
-Ž ¿Z¶†[DÁ™JeÖÞeÜøå=,®
-Y,£× %JÐ(RI”Ê‹*ü2´èZ&ÕH"õ ®q7[ö†®]&ûɨaöaÌ5J`Í(7¨h=Æû}î¨ïÈŸ
-ŒøšŸQ‰¦¥–³æyÕ _æDTè¿¢ÌÈ%îM³û$äÞù ›zçü‚ˆN¼êpéC]TôÆŸ¬‹e]Fyô
-lȳý-íÒÞBªŸ:†Ç¨»z ‚ä=u¬;–Ñj|ÙG³ÎJá_CKÎäíCòO´ƒQn7cî‡Ò+%½'ÚRíÙR<£ÃÔó{4æ0‚‹±ñD„À tЧºÙÍQ^Òû’ùÏë>@íù¨§BF†|²þ¬pÇØ9? µòJ •z~½½Å!~Dk!vP(L8%ÅœBIm ~<_SDS1æv c ¸=.9$@¼{Ƹêþ´Xv©gI=šd´õŒ¤QR4£ø4'wÆÁíж¥(óÂƸÿpòø7~ ·¥W>ñÔ÷ Xa RÔó¤¬ßD °c@½za»Ò ·—!~°î…O7í”!O؛ȓÇxÓ‰·Ñ´až¦u›ÎíiJ|7ÄöA}Œ)`LÉW(œÁ…©ÊàÂn$¸È q‡‡ß¥²éÀ¢Ý”Î`NŠÎñ9O§Ew þ¸(½oŽiT•SÜ¿ëðg‡xÎù“ÿÿHØ›–}¸S.Ò&9DëdQUá+âç‹G $TJ¨ß"Ô0¡ Œ,tj÷Ç•!}¼9â¼Áþ_ùýT}axêCÂvnw á òžßòè ãB†'}tÂté%¥EئS3eùG3Hä=E©Skˆ+PÀGñC¾)! ž§<sÓÅ9a;I
--)wgg¨»ŽÍ9ù%µ÷N@§õF¯a=:A©|\WOJaù´]õE |OcòÅuµyÙÀ “£i"Rt‹%—·côéy. ²:Š &#«q›Æ§ú2MëÖu:½"û\H_C ÚŠûΔ¶
-;5{ªxúÃÅîël\ée5¨ÛIu;åHxFõÊôu;¶qšM¥)˜¬¸
-†*C<÷æqËNÙÒº¥ß
-à’!–2¸ÝxÊE Œ¦2_Ð'\úŠ³Q\ ¶¸,”Å~N “†Õ< 9~Àþ[¤`»X„”(³%ë|¦Þ.Û
-PŸ)ÂpªM “#4«f[Éz'e†¹ËÛ†»±êŽ&Ò¿feÇS•¥ñøo#–!„Þ ·Ç¼ýÞºÝ#
+xÚÕXKsÛ6¾ûWðÔ!g*o§NœÆi{Ê$Ê)í–hIcÉÒH´Uÿûî”(JŽåtúÈ ûa?,>ìJf“Lfï/ä3¿WËËkc3U
+œÍ†·ðE(]æ•&êl8ξäÃBåS¸êâáo0"vG-,ØÜu…]Ÿà6_Âͦ.]švÀ'ê60Rå# VÁmƒW½ÁV™W÷ð6æçE
+Ï
+NeY ´‡fìLZfJ‰èœFŒ±Â9—
+t!*†ºÂÑ÷`I»ü
+§7‡ë®ÐeŽ ÖøÁç?ð÷ÔÜ Ókny»,tÈ·Ø^‘ €Í´:x€1 kó3Õ ì~CÓì˜×ðàú‘j Ï2° ÖdÊ
+c=» À¨³àƒÕ"„ÈÆß. Û
+ÃODÁ…Je¶ždüðñ=,®
+YÑk%Ì(R%›RÅ Â~:oÖLª‘Dê\£f¶l Ý…Lö ’QÃèÓ˜;”À(šQ>àD«Þï
+oójBñ40Á ,Lào5Îâ®Y½=‚5Þag†ýŒ2#/T>A8Íñ“ Ûèƒfj¯ø#£xÓàÚ-úsQÑö\,ÏeXDŸ£ƒ5…6 oÑÓ&m.äú¡ax\‚ª©Ž(Ð!Hpí<Xw,£UørŒf•¹ -E“g´O)xnh £ÝfÆÜ÷—Jú<œéKyäË`‹SÍïЙÓ.Æòl„À ŒÐ‡¤
+ÍìÃQžÒû’ùÍ«V¡ŽbTƒs!#C¾[V ¸£xÎOX-½’ÏZ½¼îîqh-ˆiaÂ`v»’Ú€€ÜS\“$«(ºÍžÃ1B~®X@ð¶ø·QuÏŸË&µ,©E“u5#kÔ€ÍH æÎØyÝ÷-F™‹b`c<þqòùoüÓß–^µ!Õ¶žXa NRÔò¤¬ß«x‹PmžØ¯tÀí© @ ¾>áó];§Ëß3vŠ¼øyò9Þtâm8™§iµNw4•ÿÔÇöA}Œ)`LÉ(ë ÂSŠà¡¼) t‡2‡ß¥²éÀ¢Ý”aΊ.ñwžN‹æ„þ¸ „!§øfµx“vAYš|5Åý»“?ÛÇsÎÿ›üÿGƾiÙw;ÅwhÕ§i ÷!Ê2|Gü¼ºçIBõ+¥‡5Lè•…NíöX¢:¤Õ›g‚7Øÿ !ÿ`œêWÊS+ ]yºy‚¼ç—bŸÂïåèæ uKy~«ü˜,¡R-V”ÌR÷Ùœó£ŽÏPåÖ$aúTUA gÔ~WÃ(…EL·*jK˜ÃÈbWÇ Ê çcA&7‡Ó<'[,„¸È a`- Ô‚= ¹Õ1 cF°SÿTå¥aÍ®Z¦W”n®f.¯!v;â댰e8¨œSÙÑ*¼=ž³qÂ˲W=[“ªgJTpeÚÉ´Õ3>cŠYïË
+È+óñ†kQHõómëþ÷Í”=ÖTôC\„(dp‡{++èMÅ(¾`åRãÒ—œâ: âá²P*ù˜@Æ5wª¸r|í·HA·bƒ”²'»Ð‚¡·Ëõ ¨M× ;«õ¦îN²:È[aìòv?ÃCÁ˜Ð@úÇYA z"Ô†ÕVÝè—c¹XÑ|w C5v0©Æ£Â‹ÞÙgzü(ØÆ°ó§Ëaèx#¼R_ Ú–i›ÖÇad£(¥é¨hÙï
+8Ò«Iš#§mÉ5ZZö€@V õÉߦ)“O‘3¨¤v6D K„í…•ªÝ¾Ý>ï†Q[
+·
endstream
endobj
-78 0 obj <<
+74 0 obj <<
/Type /Page
-/Contents 98 0 R
-/Resources 97 0 R
+/Contents 93 0 R
+/Resources 92 0 R
/MediaBox [0 0 612 792]
-/Parent 109 0 R
-/Annots [ 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R ]
+/Parent 104 0 R
+/Annots [ 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R ]
>> endobj
-79 0 obj <<
+75 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 497.715 212.801 506.582]
+/Rect [132.772 497.323 212.801 506.19]
+/Subtype /Link
/A << /S /GoTo /D (section.1) >>
>> endobj
-80 0 obj <<
+76 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 473.865 240.368 484.664]
+/Rect [132.772 473.473 237.18 484.272]
+/Subtype /Link
/A << /S /GoTo /D (section.2) >>
>> endobj
-81 0 obj <<
+77 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 451.947 277.129 462.746]
+/Rect [132.772 451.555 277.129 462.354]
+/Subtype /Link
/A << /S /GoTo /D (section.3) >>
>> endobj
-82 0 obj <<
+78 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 431.962 244.811 440.829]
+/Rect [132.772 431.57 244.811 440.437]
+/Subtype /Link
/A << /S /GoTo /D (section.4) >>
>> endobj
-83 0 obj <<
+79 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 410.044 228.283 418.911]
+/Rect [132.772 409.652 228.283 418.519]
+/Subtype /Link
/A << /S /GoTo /D (section.5) >>
>> endobj
-84 0 obj <<
+80 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 386.194 202.699 396.993]
+/Rect [132.772 385.802 202.699 396.601]
+/Subtype /Link
/A << /S /GoTo /D (section.6) >>
>> endobj
-85 0 obj <<
+81 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 364.276 213.748 375.075]
+/Rect [132.772 363.884 213.748 374.683]
+/Subtype /Link
/A << /S /GoTo /D (section.7) >>
>> endobj
-86 0 obj <<
+82 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 342.358 241.364 353.157]
+/Rect [132.772 341.966 241.364 352.765]
+/Subtype /Link
/A << /S /GoTo /D (section.8) >>
>> endobj
-87 0 obj <<
+83 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 320.44 197.678 331.24]
+/Rect [132.772 320.048 197.678 330.848]
+/Subtype /Link
/A << /S /GoTo /D (section.9) >>
>> endobj
-88 0 obj <<
+84 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [147.716 308.485 382.832 319.324]
+/Rect [147.716 308.093 382.832 318.932]
+/Subtype /Link
/A << /S /GoTo /D (subsection.9.1) >>
>> endobj
-89 0 obj <<
+85 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [170.63 296.53 260.423 307.369]
+/Rect [170.63 296.138 260.423 306.977]
+/Subtype /Link
/A << /S /GoTo /D (subsubsection.9.1.1) >>
>> endobj
-90 0 obj <<
+86 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [170.63 284.575 269.808 295.414]
+/Rect [170.63 284.183 269.808 295.022]
+/Subtype /Link
/A << /S /GoTo /D (subsubsection.9.1.2) >>
>> endobj
-91 0 obj <<
+87 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 262.099 231.939 274.054]
+/Rect [132.772 261.707 231.939 273.662]
+/Subtype /Link
/A << /S /GoTo /D (appendix.A) >>
>> endobj
-92 0 obj <<
+88 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [147.716 250.702 201.385 261.541]
+/Rect [147.716 250.31 201.385 261.149]
+/Subtype /Link
/A << /S /GoTo /D (subsection.A.1) >>
>> endobj
-93 0 obj <<
+89 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [147.716 238.747 206.914 249.586]
+/Rect [147.716 238.355 206.914 249.194]
+/Subtype /Link
/A << /S /GoTo /D (subsection.A.2) >>
>> endobj
-94 0 obj <<
+90 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [147.716 226.791 224.328 237.631]
+/Rect [147.716 226.399 224.328 237.239]
+/Subtype /Link
/A << /S /GoTo /D (subsection.A.3) >>
>> endobj
-95 0 obj <<
+91 0 obj <<
/Type /Annot
-/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 204.874 235.337 215.673]
+/Rect [132.772 203.924 302.425 215.879]
+/Subtype /Link
/A << /S /GoTo /D (appendix.B) >>
>> endobj
-96 0 obj <<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [132.772 182.398 302.425 194.353]
-/A << /S /GoTo /D (appendix.C) >>
+94 0 obj <<
+/D [74 0 R /XYZ 133.768 692.105 null]
>> endobj
-99 0 obj <<
-/D [78 0 R /XYZ 132.768 705.06 null]
+95 0 obj <<
+/D [74 0 R /XYZ 133.768 667.198 null]
>> endobj
100 0 obj <<
-/D [78 0 R /XYZ 133.768 667.198 null]
+/D [74 0 R /XYZ 133.768 510.385 null]
>> endobj
-105 0 obj <<
-/D [78 0 R /XYZ 133.768 510.777 null]
->> endobj
6 0 obj <<
-/D [78 0 R /XYZ 133.768 168.458 null]
+/D [74 0 R /XYZ 133.768 189.926 null]
>> endobj
-97 0 obj <<
-/Font << /F34 101 0 R /F39 102 0 R /F20 103 0 R /F43 104 0 R /F48 106 0 R /F8 107 0 R /F55 108 0 R >>
+92 0 obj <<
+/Font << /F34 96 0 R /F39 97 0 R /F20 98 0 R /F43 99 0 R /F48 101 0 R /F8 102 0 R /F55 103 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-112 0 obj <<
-/Length 3517
+107 0 obj <<
+/Length 3437
/Filter /FlateDecode
>>
stream
-xÚµZÉrãȽÏW(|#šÔ‚ÍG/m/Ž°å“Û€HºAP¨V÷øç]¹U@P3>H kÉÚ2_¾ÌBöpxÈ þô]ÆÏß=~÷ýÇê¡NëBÏʘ´,ª‡"/Smò‡ÇîáŸÉu§’Éýõý¼ÛëR'ÍØÑKëJ/ç—jhvr_vºJzh`’N*ú}©ãßRz> Aîî_ùþcžÇ)LZ(åf‰SxqÍ é7÷7À îï Ūd"â¥Ø:-3 hÚ.“Ï»¼HšOð
-Š^̶§éã /®¸Hz^ìÇÅ^Ç æñƒ>ìµ2©Qöa¯TZç¼gOØõr=îöVeI?º ¼«äæ ¦™
-š¨rkžP~gj® [<Aå· eÂé:A_N;êÏñÀcÒ£½œÏÐn¤Ÿó+7»âžbÙ噞~ùÉeÀQañÙrÕwÿ ãö|VnN&Ï¥?¼Òæôôc†sE
-‚6¹…•”ÔË&Í€Rðý6¦‚Éqcpé 7Ôàt#9Ï—‰;¢ö PVŸ H/*Û’ <ˆf`=›¡fþઊ,yÆs9qÙ¢
-¼±Ð ‡7K#€ßh>ÆèÈ°¨Ž¢A(Ìøuˆê2~ N¢-ð>£Ô±“ ì åØíÄÇ
-ÍàA>OJ%g;§8seÓÚ®Ô÷㮲Д ³\fZº6+8„±ÛïX«QkP±oÍQ¥Y^H?·mÌ f¾ž?,毵JÞdßú}˜zi3|£"<}Ø¿9ŸgR==Lá.¡¸¿U5c8oÖ(,†.ÓeöŠ¾/5®›v© U Q}Ê”uãAŽ Wg0Y½aÊ3UxKuï¸Ù[¦+‰µ ƒ,ý2aÑ/n
-D9î¤ÜvZ÷Þð o±ù
-T&ulhîÀ`‰'Þ
-èÊÛSCèÛã©ŒaÏ64½}e-þB£:Y† Á戀AàÕQý"(¢Ž%Õ‰ÎÊF¨£÷T‰ó EU&ÿ˜eógj + …ç;_¨’‘ß œÅ]Äf:ðŽˆä¡3šU³¹Ð»3[Ñ£ #V¢b^Åð Õªš Òµõ®àù•aÎUâûØ
-Ä\F:×¾%£vrQdvx®ç›àÒ‘j°öïé ]æÜSë[85ʬÀÄÆRû¯ -i`MÑõg at eDô…™e •¯ GºÁP45 wC czŠð’‡©“OYží" Šf0ÓtZ Í©çÚ—#ª›3;+r+&klÜ(Êu,…ù:,%° NÖk·«‹qÝ"àóäŒ]š·!å h2îìâe»åuN¬^¼÷¥ÍßAj›4Ϭ@n×£* ŽCäŒ×s+È6iµ€l›W¤^[ŒMç©-·øÚž ÔhVæ–/ü *gò4«ì{TΔŽÅ
-ƒœÆÛLEž ¦T4*{Fn‚Vî!,¥¬"–’^ *à]T¸½F4ÇU2òU±¤[òæm€¶†Ö·ð-hµ €àÜ.b
-ÌT%<Þã.~åO ù™{°ÁœB]èQVÝtþ)¾íÎRvôÐÁ²µhšBã ÏS~;³Ø°8ÜÕ}$F6a2%
-èÞ³dnÎüöÔÌ sÙU
- i>Ø¥'ü;Rí¦Ve|ÈÿáíÇSë4øefz …˜3GÛ–9Ïþ.ÚL¢_?FäÏIÍË%ÊËàÛàÇüMÜÌù€zªŠ\;üDÍGÄš…à“à)ÛÝ/0|x%fŒ-ÞE‚ íÍ çJVˆ˜G†Õ Äq$ò £êäÜ‹gc¥ b _Ü<^GOʉZ‰¢ËÚO¬ ®Tå‚}º™á¡¼Š'€þ—š¾ˆùÛD±H¾Šž£Û4ÀYú›ß™„KÅ
-ͯ1½¿O¯dÁ¤ÝΛ|Aý‡Ð-”ؾŸÜ; ;(n ±> FèjÎTsá)Kˆ x„=Ì‘L—ésˆjÐF~"Æø+säUî‘;5ñ2¡ìiæiLMËà늇 |°‘°÷ª¤sGÚ{aQâRO´] à9~=îÝCŠ²›X}îƒ>c#äoÒ1Ò-7pŒ#Þ÷-–Ï OS+ÖYyÄñ\} („5‹H² vã a3•‹Î¶¤ßŸäH“Û…Ö MdJê÷‚ßîúíáŸã`’)¹;ŒßcD°¿ îÞ=ºàmƒGÔ©©ë_‘øɳ´Ö•£© ¤ƒÍ nÄ ‹*xáùÍ^ÆnÇ5Ã}A ¯óÕF Ñ×y²f¨X9…ÁÐK ;
-ÔTŽ©`,@¥©²Ôèr¹r:€¤dÛ |± !f>Æ9JØÑØmÓèÛØT D0Ny¾ŸøŒ‚ÏôMWØõ±3`¦Bq[Pƒ:qZ§»0HQ "m™< s“`"ï^w1õXj¦µ*yÜd®JÛT-S…¿\å´©ß%¨Z¼5ÓB÷#¿þ³ø%7ÿ =· oµ¼H aJ›«·’Pg! UîG¯Š%/©rN’œq£…Ϻb ¢vôt•Hò8âêÙëRîÍ…&뎰vGˆ(4zæz— hja¸@Í&¦¬æPÂõÂÄ´Ç–¬ õ®IZ! ä ݃²Ùžéb`ÞpÓ1°RÊ Ï…Š–è,¾‹w$¡h˜°ð»èŠC¤~]v¥
-#0ÛÆP,QÀfÏgô$¹¬PZ¦ á7êÖÄ|§â3±¼Ûð€òHle¾¯ò2QŸ«Oé…πѡjöœåLsRJËÌè$' þky; ²Ü‡Æ(þα°â”§ }Îþí93ÒQ·•~3ÏÃŒSMw§p:ñ³ñ äà’ʈ ÷áH¥ UM>ªºÅ&Žšÿoaµ-X2Râ˜pXì¨.Ë[«/Ùy‚Áï$Ú1IšB.ƒ ‹Ç/i9P ÀHÏ®$„¾1åÒ׬åv1(Ò[ãÐZù)¦+´’;)Sz;_Èžóêî‰Ù)¿H¶Ö “- Q혪ë‡(#<Vþv·Ï o’
-Õp#ÏS©ÊMHÉçšxÆ)G¼òi¡ÿõ¬|uäüÝd±¤%å@¤19枃d’š’§6Û>±‹P™Õ#×>›#q Xª¶òé“ßÀ<£ÙVQ¬Aø á«õ"î3…Þ’˜í¹€pšy–,oæ´OÜ‘‡åyßÜ Ü'F&+iXÔT÷wnSw5œ"òI]Ÿµ¨HDz2ºÃ@ÕøJ¥ "êZßÅv'/ŠV•ß%}O©*•–VÅè0Qº•Àýëà|Ï "qØíe` KeÂC…ÓûQ\D6‹ Œ¦/Vó:}Å&œÙ†WÒL' 3æWº‡ÀÖXý&A¶÷±6«'¿ˆæóÂYd X)òÖôVu¡Ò,Änâès‹Ué="¼o¡¼Û sCضAØÚÚ/ÝV "š¶§É6:Ûù¤Œõq v÷‰ýo ‰‰ø+±
-Pà e‡¹ƒXNÓ
-ì›âúD7ÏÈKªýµÈ|¥j§×.=DŸ†•.ô¬¶ëdHíï‡ã¼omWy_jècaãVÜ]ÖvËtÃF: 6~óeäpûÐ÷ÝÖ2g¼2êß„ë2#º×…4 }2°<9R<‰§Ò%_[_EÑF ¾Æð¤^£ü*W¾‰Ûöy‡‘&†T ^fžXËמ–2ÁÐyùG”h at CÞß;ê ? (E&÷VŠÌ÷¸ ªHÎANHÌ”mãënNÄ<¾ŠlQðR1^ÂT—x: tbú×güy„‰æѦy P‹Œ+ü 9Ó$dlÍê·?QÉoŽÊÇX—çÅII¬Õ.sŠØ#ʈSî,ðP臇Vx«ÁM‡@M» ìMÎ ™ t„9¿Qþ ”X
-%ú<E™' ŸÈ|û*±^˶á`¡æ=Zž¬ì ©hc–—åÆf÷Î3ö`;.Öâ=4wüŸ²Uª‹pç„.ãⓨ>ËVhñ(ŠÜF#V;ù pƒuA?tš¥öT6‰§G ·2ͤ0Jøúf/³\lÚ)ð®ešC¥Uý«¾¨*Ò:\Ãñ
-È Ñ/ã«Eq0@¥tM<ž DÄ~Dê&X·\ØðÎ4
-Å…PŽ ä ÞÞA ¾*êx^œmË«´*óåNþݵ³Äp.ÎeæyòïUÚ ª6by·/›±<‘¥øë ˆùÍËOv¢)kaxöxs?Áî™Ò/zC-¬IskßS {'tôº„×öÍ ÂÅ?Ï1t1sí¨Š‚¹Ë˜2l%éLZ”ÅýyÞµÚ¨¾?Ç;fâ–VYßáxlà Tž…
-æp+ªJsS½¿³ ^,%µOU±"‡!Yg̳´ ñß™Aoˆðògžj¡SÒ˜èM$=
-™`Ë An&Qsí(ÿ¥jT¤™)6È–žWYúp4þ<„yeq9øiŸòݘ:HžúðõÞ^•*UµYzdòtáF·]]MzFf
-ËB%?Œ+7\µ-BUã‰:DÍþ³ÅV¼îÓâû:$ú ! mÐ,A¬‰·{ß¾Ž‚¢´•+_v%isí·|ð!°H¼ž“sDç
- µ4ÜÒ"ðÑ} š4_H"n9ÞAŸÉÉeb!`HÐÞIäå?T~PE§_û²Lˬ¢©éE›?>~÷?è«ÆÑ
+xÚZIsãƾûW¨r¢ªLèn \RI9Nœ“ËžTq ‘Ì„BÒØ¿>oí…e;“ƒD ××oùÞÒ( 6åÃ_¾(å÷O ¾øêÿÐ]cš‡Ï•µEÛø‡¦n cë‡ë‡.ž —¦YŒçíãÒUåb8>V‹5>W‹ <Nü;MÜÐ'/ðد M»øøX7‹~3pûÚ‡×Gãà ÇZ8áZ<â ;Š«`׈ ½î y>þ 7²'ÿ¬ÆÃÇ ùuºÈ°3nÇmã3ÿži½%,8îi×}ø0dYUEWË©÷2ý#î‹GÄ ÉÖµÎÇGfÎÀ/ÓŒÔklqx’–g¹E¿§Uèùã‘151†ŽŽKs&Ü{sLÖy O2·¼(“4nH ÃYè]ñ:$ˆži†Å±gúºšrñLrÙÉ|eÑŽ7žáŽ§í%òz Þó{D¡%èàw (ú#.Š_ö:oG"ú’'©¶àóD« ×ÊÁ5Žü™¦íD¬8 Eˆë QÕâ@ËNQ^¹¢s.'ÿÃV¶ 6Â-®7¸‘ñÕâ´ç—'RÓÿýXVîŒ~õM™³`6-0v¦ñëå£Ø é!™
+ÍL':W4¾ÑyªþHí¡ÿ¨êl´"3êÇ{/ѪÊíYl7¬Ä4#!²liJSø¦Í™$ª†õô›šT»&ÖVºYê¤êÜÌ` v’"VÙ&Á¤´8z„ªsC ‰Ñ#ZLîÅNÑž(ùӸ̔ºáâ˜ÝÏja¦^¼aÙ¬‹ÞÅÐ@be*|"`Ń' \:W-þ>±4˜ ¸´Úڞ߉qÓÈ/3ªÅÒÅÎg:ÀA¦ñÏI8ƒè5%<žgŒcÁÉåÅrά£5¢a ïcL
+Þ›_¶eÓ–q6’÷©Ç9/{Ö\ãró-IÁW¦KŠð89,ý O³ƒZ§V£ñŸñwñìDz.k at g Ã&‡$ìú³Ì—/¨G„²ã™Mΰ@‘Í Ö°Á0ZBÇŽ¸pJ¬Ð ¢Û 0‘ŠcÜp VÏ{‹òÉ™É/¼ƒå… T Í+XÉ«èLƒ´µâÕ
+TÕUa¼"UªÙÎVê
+É!M¾ÅÉÚµºÈYý*,—ˆ ¬Tï|— ý5\"d0$úD9œø'ãŠ>â#)õŸK 6 O±ÿ4n}(ÄÕ$ô¬à,ÞW9[ñì–LíØ;Áo SaÎ×3aP"Zè'&¾ñüà ô³š®'nˆ¸enQ#½÷Çlç6ÝYÍc¹’ÕsÃ~Ò€iˆ«¥† Ww~ñGð/Ã;æ%Tݪ ©Š² Âÿ_4°,l\à½hR,Ä¿Õ®v1GSÛ¶ÿo4e€QÒ^fŽ¼ô„3©É
+æPw"iy%ç©ã× úŠvmÑy—»8µ Û´¿E㈞H7˜‡ã”»–¦‰¡ ŒLl=8Ûùè<@Q”.
+>['¨ K F'`¨Ä°'*4Ö–U¶Ì š·“ß„Ç3JH¦¾—Y‚ Zúç„Ùx$0k8ùK>³p4GÐ)ê×s’òJ © …HEbb6ä(à‰×ØIxûýý8ö0™„oðÒ?)‰u+¤"Šûμ=*N¢.4-ˆÆêùÚ~#vÞšJ廢®ºÏ´•®
+¶‚[÷s ™@$`ÎwrïM[»Â×Wì
+:9H¦• kWFwë».&ì‚~0ü
+¤…gv4ü ]6¼<ßd&×h<ðà3Ç7!cXõB*•œÝ‘pf3¬í
+Ó\9G»Ö³™âC áb[28¥‘S 2™ÍŠÄ mã$k at jj£H†hLÁ(G¨+ a/¬˜B2š¸ç’ÆÛD Ëv~¡ôà™ ¢îÀïýJF†\© ”ó-«Iœ†œÒÈV)®ÇãÀVOkÀ< (éYU ŸÇÄ¡W ð·]éßÊÀ;àÒTz>Þ”0šá£Aµí,P´uÔè¶ÉS{˜’eØ4bŠëe¨ ]‚¢$9ohfѬùEù’ZG03è—À!€4QÀŸä_Î vê?´´¥!*È«lÎÒBû_Õ
+Âþ¥åMK™Rb…bE±ôY‰*ïa|Ï?!5•ÄP3$}Lœ¹Ä#кâ-KH¸èj¥ i˜Õá7õÊÛñ™¢#K¯p+xzÛköB7 Ü°ì%ÁçVÚ.G‰Hù÷?åE
+_‚ê\Ôø.
+Ð+’Û‘ºBkÁ
+ï ŠÛ§'5
+gu7ÂPßî^EN… …Æ9É/ÃÜA5˜Lð“QJ>¦ã<§J“pqnH…:„°,’ iKÅ…øL§IÊd¸MUfå' ¹Sšªw‘îmN˜„Ìß`ÖÀo(œ8‰jmQÙæsœLUTmȳÐtHmRÉÀiDÐ;>”´à†»Ä,)YÒ*òôð4%è ¿ž4Š8ŽÑ¨ "gÎÖ¼” ظÂVWaÀ•™W|+¼ãK°õ*ͺÁï¨zΣIž/ª§ ×Ù–…;ðŒÙÜ—Å^IQ6™x=æv¼|À„Pvƒ±œG袣^ÔØ?ç Ä.+ÒÈ™re]8ëbµ²6\ Ùi¥R0DX#hIZ®¾R"6üeÄÄI5W%÷šÖ÷Ç3wíôO »7zWA>$+e¯Z ’:þaNRœÊL-—…/ZKŠõ܈×ò;¾¤9ª–†e6CѤyUU8__û›p bÀ#gá‡A˖Пo²‡,àÀA Ó@?&ñjXˆôs·“Q«©ÒôOÜ´ÇM¹*øž"\a¯k•3æŽÊÌ\
+œX+Hêðo=’x!PE]x _ÎÔï4ûr¨Dzz C6wM¥hÓÄã% ¤Å·²†Ê\,´‹Ç’îx9sÓSFpOÉ*2zÃݤæ# c +¿QM0É¢,C‰ÿ¯=''yQHÝÂøÀ%¥ðæâU(ØfµYìÒ@ÚŠÉ÷«!«cÙDWYpä8‰>ôgÜæw<D0ŠòÛ7Íù†c\J LƒA§·3³
+DÃïGÜ`; ”§3¿ v>…||ÍŠmÜtU–P#à€gJ¦Rþ¤SC–ÏY|ÛÝ·‰8úº:wÐ`à~¬m:›ÔZ(/$L0 °q<àÛ›†ÎØF¢]DzË"3ÞÃiïØç@@! Ź½úB”ãMÕÖŸøw«‡Òó¦>ø¬iÕ‘;¸,ô†«Jºvñ‚bu/½â«cR 2u°fý¶
+÷—ý¿"’ÓûÌ<p Zq™>™Ô©g$݈ zéñ?ظ‹®>öDnåÖ~Gá]Y/²Œ1,Ê}×7ÀÔ˜Ë[ÇgôQ–þÄ7kù•€+³› J ŽÂÆ’.‘hw=ÌJ’SG2pWÊ]Ý«ìc8ƒ›( •uÂðn¤þn§Î šêbR_±âý(¶X’½)×ýžDaÚûͳ‚»¦R Ú;>ÍTeaãíë ùœQ1} ªFQ÷A>Yk”Ô,8D5q3ÅG0ó̵ð‡¥î–±‰ÖìA¡*½Õ$žà] í¤wfز;Î…ú®(ýçÕ]CdY€n2íâë,9Ù§5tþäÃÚJ¤÷>VЀ¹»`Z«WðÀ¡Tü `«ò”6¹‘h¿*ÊfÆÇæ·ŒXwͳ5hÐ ~pò~±v‹Sµð «²·©6¶&©v’2ã:ÁÙiÝ8 ØÒZñÐ$›¿ˆÏâ륰âL!¸I>h ¢_<õ‰<3p¶¨{O#ÜLtSe,ÍÒMk¯Á~+¹+ü R˜’°sÍ]\ÌiC¹Ï¶>Gˆër²±EÓ¾“¤ÞÐhºÂ·æ>ÄÀÛàhÞ…i½\fÏXdEMSEK¸]ʵõïsV¢¡|e ÁŠªñ³ŸZ̉ˢƒâI³ìï×Iµ1E &Ï`˜ª«æþm]m
+ÓÔ¿U }‹…‡LD®
+Þ \ãþÀÔÄÒSËe9l W4ûôø{*Û¤$¯Ù[[Ug¯¡ˆ_Jcí×üC/o©‚™Ô·ôEdâëuŒÒŒï 9_nÑG0»§ì+µ,.ÁWaŠ~=ã¨ÔßÎá…o@žxU„nÚÆ•vúÁœãd¾;ßsÇ›
+6R)ë9 "j*®oê•ér5FÉÜf›\…ÅR&,p‘fÈ£œE<³®1’JZP®Ò1iæ(…˜ð»G«%‹ÙYcém3pÅzÄîWü7œÔE³KÈU°DO[øÒ_cf;ó ¢hè¾þlÛW.ž®cóPÝŽ<<d¡ß”͇¤ÀN™Œp8¹¡Âîùl÷âKT¬Ù'×`sÕÒ<üVû˜¨X¾‹o³ØÀå`É£-Úª“BD-WsRfÓ“šû×ižå›wó *þ¾ u·1½FÁ]-4ïõòÉ¿¥ñMr¹W¿ùäIëh×@Ü´Eݵ¿Ý—Vñ#•»(%¶¢m®jLshÿݯ۷n g‚ÛøC&¶ß2C<NÔ{µ¼tÈŸ?|ñ_}xæ
endstream
endobj
-111 0 obj <<
+106 0 obj <<
/Type /Page
-/Contents 112 0 R
-/Resources 110 0 R
+/Contents 107 0 R
+/Resources 105 0 R
/MediaBox [0 0 612 792]
-/Parent 109 0 R
+/Parent 104 0 R
>> endobj
-113 0 obj <<
-/D [111 0 R /XYZ 132.768 705.06 null]
+108 0 obj <<
+/D [106 0 R /XYZ 133.768 692.105 null]
>> endobj
-110 0 obj <<
-/Font << /F8 107 0 R /F55 108 0 R /F57 114 0 R >>
+10 0 obj <<
+/D [106 0 R /XYZ 133.768 198.69 null]
+>> endobj
+105 0 obj <<
+/Font << /F8 102 0 R /F58 109 0 R /F55 103 0 R /F43 99 0 R /F57 110 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-117 0 obj <<
-/Length 2220
+113 0 obj <<
+/Length 2493
/Filter /FlateDecode
>>
stream
-xÚÍYYoãÈ~Ÿ_!ä%0â°^‹`$“ã%‹¬ƒ}È-Ñ’Ö’(ˆ²=þ÷©«»)ªi‹Ý<ØnöUÕu~UÎfëY6ûË»Lþþñæ݇ÖÌ”M-ôìæn¦ŒIË¢šy™j“ÏnV³'z¾PJçÉs£“f®’åܨä~^úZ·ó…)óä 0~Ä-í G[øÕ>Íÿsó÷ «YÖ….D6[h•VYÅ—ßlp ÞP&GnæºLža°ƒŸî¶é/—›%®ßÏó"iÖ2¿„ù¤‰?ía®«äŒ§Ÿq¹H‘=žÝµ8Â_¼ä ƒžo8aOèIã
-»7>Áh{À—Êò]rÀsx}wè™VsXñ`ÕàZƒÏÇ+•Ö¹ˆ³? «î
- œ¯þ<àôác^$zªmAâ«•ˆï“VÙèÌPØ8R0O{ÿ„ 1[ SFP‚g'ÅVä;H'Ù-{ºÓVž¿æw›ŸÞ‰$aÒQhå»Á
-(¢*Oö([|úΉñ(j¿:Œ´¿aS)†çé¢Lóºt<Š½ùÀ½¶@“§
-l\ K×—/L¦ÁòKííE_;òý×џ²:wt¿{IÕ xˆ HÃœÎß®ëïç ›Wð® rüž´=X-½ºigLݸ 7
-5‹gŸ¶r`ÃßMßwó…fïÜ:6Ú¯ób¸tàc+¶œ_ŠÀȵâ ê”5 ŽE]|•¨¹5~Oz¬‚¨É`гE ‡5 Þc{Ú˜0:svñ¢íyb(|<Þ ¥¾=ó » §Eöøù‚tu]‚HŒ{èÐôÙnÇ…^v‹·hã+ ÿã¼²ÉÃ(:KD3&D4»`׬†
-8ûù!œú”)ëbMiLš½ ã=$þ–›[°áVà×#î“ùU0ã=ìÉ¿‘„´¶^B8^ò¸£¼øsgD^¸í–<¶¥÷P¾Ä½ˆaÑ s+î
-¢¡KKž7A4¸éEÑð5SQ[— .´l#®Tr r ®¢ôÂÝÀ6-¡¶s›üÜ:†Ä21‡'z
-a1>Â\Y¥Ee‡¼Äí(ä+ ‹,-v÷Dx{É|”!·”¿Š‹!K«í Œ
-¼lÅL cOù”噜Oq?þzÏûz4Œ[‰ç!™õõ•Dë¸cé \þO‘C?]ì!ƒtlÏ?.¾~™ô“ŽqÿB¶ÌÀ&ŒIÐîÿ]‰# l“3Å9ühúoêîÈ ½Ø/e¶vÿ¥@Ä•aà]‘äqP¥ Ìy¢›v‚+J`!ðÐ 'ÅU)ãÞ³¬h'U [QAs’ú—$ÆÓpŠUU¨TååWó‹ð:DU¸©Û .‚Eô¾á˜ÃÙX™TWæ2ra„ÙB3xP*$°FòK¶›ƒ/ÞêªÒ§7nhHÑ=ò|¥™}MS6Õ«ï[÷²€÷„ŸÆᤊk¯“ÂÙqŸÎE–ƒåDu¾ª
-3,
-\(Å $˜8Ç¿.
-J_ w^ù.•&ÛÞÕ>,ø
-;œ»€Ak~˜{ ì‡xøż÷…<$¯‹ä'Æ a›• Êã3ŽŸÙN(]F^lŠ´R&Tjôê«wj g^O’‡‘Ãæ$ƒãÉiüQ ¿j]ñf/*fø 3 fx[™ñ>Jw(ÖFÀ-‰Oä³k(¿» …RƒH~ u÷ÓF&¨O°áI’ú‘pGëÀx,=+[¤ªörü|-7 ½^9‚7”•ßö ©Sí³w5áÔ–ÞŸþçëB@ßñ['ÔÖ³à‘®7Üi¡ ã Žß“ÿÅ€žÅÂ3“êREY0 )p,ÑPA⺮/@ |ºòf½áÆ LV׆M³X¥à‘Ël8œ°ëÀ€+Y£’¿ ¢ ,]# ?˜•±žB‘Ö¦þz iqh'À Ó( ‘ª&‰KMÔ¿Ó¼4_\‚M,)ž÷Nó–ùÈ“Ÿñ)Ë
-U„ KÐeÜú¬ïc´ÔŒÛ Hç2_ˆºšÇK—[{ÇÑÝ`“Ëj1FiÚ·`,åØaž7¦Dùý4z]ª//e #p§—ÃÒÎUÔÚv;ŸG¸ö
-_àä²ó
-J'ýÝ3bCqð1@ò=¾oÙôvÂâ\ÔÈßçÔ‚±åŽ{$r›»á EÈ]É%ÇÅÞÿ@µ¾?±””Òˆ2…®‚Ÿ,F³¸ 9‘Š_ge*]SGÔŠ´J¦õWA)R‘>ºÁé=· CØ z‹Tj6Œ~[F‚SôΞ\EXæô¤æž2{Ï3}Xé¸o|щ.¢ùò
-{dÏm î\³iÓ"ô CÚF øò'4I¡½!µ„Úßó×IJ(ÊT_êù °
-p[Vv
-œ¥"èWBlž|qwxé™A`€OÍ` 9ˇ9¥ ³4B‚Úýþ–¾:#¼™†+‚~pßÖýûÀ$·-jÅK™"µõkÜkˆ5!ÝÖ¥Îe/¹#ƒê= ebÿ l+Q%ãJÝgŽdSÿ²0zT%Ws¯8÷r/ã %ô(^$jœº•Õfåú+!²ï vÈütý—
-»/TjRh¨Ÿš+R×S‚Š”&½þ ‰x¤Ž ã<Dß.‡½k·÷8Ñ•“Ì gcãyÊ@xêŒâöÙWÞèÚ 9þ=':\"”öjeU5×ÒeÚÊ\Q
-c.ÓY¥
-*,Y÷¥¸Æ뤊Êó*ù¾ç-
-ÿ!Sêÿ8"§2i]ÓÁqÊ£
-¸e¬×ò¤`EÝéž$A-:Í«âÔRAŽ¨ctÞ‹ga¿A¤=({q/‡ÂSè?aÄô˜†Mà“C¼U"~tœlï܉NK‡vEC¿ 8ˆéãV¶ö_ŽÒÕ @8BoHûïùäï&ÍIÑÚ+l¿wL¿&P™èû©"3þ»Ðæi–i×C øóÍ»ÿý½V’
+xÚÍZYã¸~Ÿ_aä%j`Ì)J¢A “ã)Èöb v‚@í£ÛÛnÛ±ìéñ¿O]¤(‹êÞ™L<ئxÖŪ¯JÎg÷³|ö§7ùÕï nß|÷¡¬gj*SÍn×3mªµUeLQÎn—³Ÿ³Fç7ÿ¸ýkX÷ÝÁ–†~šûþfnK—-otÖžð‹Ÿ;l ás†Ïâ$ã
+Gël
+íýQfBûDÏøÞÁçžd'¿ÑJÖ>odÁ?·]·¿™›:[@ßÆ“±ZòèI:²'î/C;^†”ËÖKæà òr*#žóÙ\kÕ”"¡¯³ |¶H<|,m=Û@ÖsÜ\;åòê«D]CQãs/ê…Hæ|džŠDrÆFÇByìîyñÓqÙy+ YRÀ’,>±Î`³Ž;báãòý®?©[¸±_÷«Eöøø‚tMS«ÆžÑ'1$kŽÓgs?ƒµ Âóüí¡7Îfç7o¤ƒ¤A’*‚‰c›Õ¼/#Ç ö~>÷«>æÚ
+,r“mv¨"R Ï!ñ¯x°½®`¾>á<é_öR„v¼¾‹x쯕PýM%dŒ
+Âö‚Çà:
+@Ÿ_#òÂiwtcWÄ4žiîj‡ƒ"6GœÛ‹†6¹¿èEƒ“^
+o³ó†tm³µVÎf[¹:pJ §Œ íËjîwx–=]Úì—•'H,£sx&V¶´-›@— ®vªr6¦m)6h§èC!h¬rU[ã÷IÐö’ùhÛ¨ÂÕÿº¾bHÒr¹±è–]y±"DÑMù˜—¹¬W8 ¿Þò¼
+ãíeuŠ¹ oIg Pª-Å$"¶Öÿ'îèàužb$
+·½íæÒãèÐË”ÌÉ 2Ta+ÃFoU¶0/Œ²Vø,nà
+˜2û‘¶D‰!1µÍNäç ñƒÅßý Ð~à‡Nì—"Ûêil½´
+\±Üñ1·ì W&-"É è–Œ6Ó¥ÒáFÑN[Á5ÐÓŸ'씫J÷‘eE3QVOQA{Ü4$>žšS¤êJ+
+†ÑZ|ZcT…“öO‚‹`ýÔ²Ïáh¬ e\1ô\èa6À
+\H&BÖèíÄÕl7[_‚Õ¹:„7h>P“¼{‚}“«Ü¾¦)« .0±òœõxOèi=NrxصÂÉS¯næU^‚å$u¡¥«€Z‘+Å
+Ä™ø‹?¤±
+ÕÎ/ÅÛ9º»@V•m:þmEð ;¬þžóìÁ|ð‡ŸQÌOž&ðd󲩲Ÿ; {„iV"(·Oؾ°P¸Lp\TÊéÀñ÷ .®G|hš ‹g‰ÃHa{”Æáè5þI˜_®ÄßU!ªãcl̸˜á+®çQ¸C±¶nI|ºª ž¡üvè
+%©ë Åغʞ ¤c”?p'Iý@¸cåÁx*<k[)Ý9~ Ë
+[Á<¦1„g¦]Æ۔ʄè’&¬l îÓßÓtõ‘ èöÌë„Ú:\+RÂñ¿.Ü|\•uOtÿNb@±ð¼P•NxtBr 4T¸išèƒGŸÞÜ?à™'ìtcæ^ÌRpÉ0Æ€×gyŽôWÉ:ûË.IÁ¢íú>ƒÒ΄òÀ›¢ùz i±i'À ³ÐpD~•5‰_j“÷[•uñ+‚Ko òç×¼e:ÊìdeÑ»B8Ð¥îÑeÚúléÇWŸnÊŠmð Ò|9ÔçDØ^øØÚyŠÖÑ$ ÕR„Rw(@[ұݲgïú$ŠïÇXè
+ 8S-8éG`O.ãÔÎgÔÚ¶Û¯pí_`ç‚ Š¥¿½ 6”ëwkXÕ€9Qù{6½x'µò{éƒZo¬½r¯k$²›ßa'IÈ?}Ê%ËÅÞG¹~X±ÒŠ2å\
+Ÿüõ3'Bñë¤L…k€µCiýYPŠd¤Ÿ|ãˆJueävz½%25«\a¾,¢ºþRtÞž|FX—ÄRûH‘½ãžs× ©‰#ö¦©x9Â^mÓpgL¦U•)ÇàËŸÐ$åìRKŸûúöªZ™ëÊÏ«X¨gJýŠ‹-K€/~ ½"r ðh ´'yð §.z„Yr!µÇþÖ!;#¼YVg*ý`¿\n˜w'Т¥’Q:•©”m^óà6Î!î é®|è\t;rÈÞË«H øÁ²e2>Õ½°'KL_¹d‰…Ϲ— {¹–±“úÊ‚ ÎÝÊh»ôõ%‰É6"~:ÿËãêã Y…žê§áŒÔ×” #¥Î ?@"©ã ù¸ Ñ7‹¸vígã¼%:8å<óÜÛ˜c<O O““ß>ŸxpŒnÕ!Å¿å@‡Cd€R^-!rWâZøH»¤ƒrŸ”B›ÓtV@{Ö¬{‚Rœãí%‹*K—½ïxJË?dJ¯ó&=Ž+TSWÓÎqê 'p«°AË“‚Ñœí$Ñj1ªtÕ ¨Å©F7©sÞÊÍÂzƒ¹’v”öâ\v…Ǿþ„ 'ª1ÅEà£G¼.“{t˜,ï¬E§»…G»¢¡ip`¾ ¤ôq'S»¯
+©ê¿ üA_ößòÊßLš“¦±o‡;¦¹ù ò^¾5:XÈŠ É—bãª<@¼Z Áä, ×èØúàÙ„4ÍôáÌ !a ÷ѾÜ~öÏe1ð† ï‰×–&æÙz忶êdﵤì G.ÆŸp5ˆÆÅ1ÿe; Çû\™fXÑI•Æ7)øºïd9‘´yÑc”¦‰±’¯öÎaœÏ ;¤bÍ/@œºq–-!ÒôoŒÌ ÌÈ©÷,ƒXË“\! ³[²ZJ§ ! õˆàzöEb$ßYtÿBÑ|2”»`ä‰j¢òæKêT+Žò‚H\\!/GHØ~A1D½”Ò£2|¬*«U]Ù¤çK…Ÿÿð‚#¶…P0¼Óiûæq#;~Ûžúw® Ü0¦·µëÁ¤ÄýÉœ&\ /c+ps=UŸ BïÕ×) Ðzîy –ì"öjŸéÆ©·n*z«0Š¬¡dXÕdàÞ@è‘T¸ÛûŠø; SK.î æÑíÞ^ø!‚2 ¡ÛTÕ <@/×i„©s;ý²¬†Ñ”=š…Ãù?+~‡º ^¹è Ü8v2T׸ôcÞåÖ•*s3”â…8>s Iwêȯ´/Üõ(vâ£È(Ç,=Š—\”Œ~ýÆhJ<( ½å*ø^¦0wÁ Ä™- غO½ªxtœíP7Ö‘q=õN£‡Y!ÁçCZ‡ ª*ñÏ Ê9çßuÅsþxûæß
+qP‡
endstream
endobj
-116 0 obj <<
+112 0 obj <<
/Type /Page
-/Contents 117 0 R
-/Resources 115 0 R
+/Contents 113 0 R
+/Resources 111 0 R
/MediaBox [0 0 612 792]
-/Parent 109 0 R
+/Parent 104 0 R
>> endobj
-118 0 obj <<
-/D [116 0 R /XYZ 132.768 705.06 null]
+114 0 obj <<
+/D [112 0 R /XYZ 133.768 692.105 null]
>> endobj
-10 0 obj <<
-/D [116 0 R /XYZ 133.768 667.198 null]
->> endobj
14 0 obj <<
-/D [116 0 R /XYZ 133.768 417.256 null]
+/D [112 0 R /XYZ 133.768 510.891 null]
>> endobj
-115 0 obj <<
-/Font << /F43 104 0 R /F8 107 0 R /F59 119 0 R /F55 108 0 R /F61 120 0 R >>
+111 0 obj <<
+/Font << /F57 110 0 R /F8 102 0 R /F55 103 0 R /F43 99 0 R /F61 115 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-123 0 obj <<
-/Length 1874
+118 0 obj <<
+/Length 1530
/Filter /FlateDecode
>>
stream
-xÚ¥XKÛ6¾çW‹ d f(’¢¨ ¤(Ð Ú½Iȶl'~ȵ½ÝnÐ ß™áP¢e½‰^Qäˆüfæ›Wæ9xóLòóÇÛg/^»A!
-«ìàv6Hyª6Ë…ÒÙàv:x›¼Z
-Ód5 •&ïdj6ðZù×r3õƒy= ©<ñ§ ð æNÆw0>x™ ë!¬ß㻂i|§á=NWí°v®£ Ê1ìoa*¼GÈp·E@¦’ùÇ% ÊdVÁ[‰"w4¿ç½gÃ÷·¿F©…1ðLE‘±Ö´_…ë/^Ã\d£\¤ÊýHlËÇ>T(MÆxüö‡vˆœI¡
- o°ªC¯ÁGÔ ~óáHkÌ1NMÂz«?ôÀrJ謻þqz¬™jÖr¹ÇCÐÊyÔ~bƒ(ft"¬<øI(ñÏ©ÆŸ¦á£ÈmZ{EžA½„ÑûC+}´¥wK愖ű_ö(»Þ²¹Ü–I‚ãÒ›îo4]åÏð€éheºï–^Úœ†³^øqŠ^'÷ÄäU;1a"¦ÉKDÞÄWxv\%#•
-•z…¾ Ž2¥Á§i²H„g¾“™„ÇŽù„®ÇØúÀ¢†Ç–©øŸ¥dÁÀk:-=ÇŒ†þxŠåepŠÃÐg ‚‚æ& ¶Ü³·V~&r¤®hBçËÔ:Am …ÍjH
-™I>¡ð„Ñ–žŒ Q¹DÇVŒõ®Õá°‹ÔË“Igïx?ÏÇÂ
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/phylobase -r 411
More information about the Phylobase-commits
mailing list