[Vennerable-commits] r55 - in pkg/Vennerable: R inst/doc tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Sep 17 01:04:02 CEST 2009
Author: js229
Date: 2009-09-17 01:03:59 +0200 (Thu, 17 Sep 2009)
New Revision: 55
Modified:
pkg/Vennerable/R/02TissueDrawing.R
pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
pkg/Vennerable/inst/doc/Venn.pdf
pkg/Vennerable/inst/doc/VennDrawingTest.pdf
pkg/Vennerable/tests/bug0000no11.R
Log:
fixup removal of unneeded nodes and vignettes compile now
Modified: pkg/Vennerable/R/02TissueDrawing.R
===================================================================
--- pkg/Vennerable/R/02TissueDrawing.R 2009-09-12 23:26:23 UTC (rev 54)
+++ pkg/Vennerable/R/02TissueDrawing.R 2009-09-16 23:03:59 UTC (rev 55)
@@ -2135,45 +2135,20 @@
remove.nonintersectionpoints <- function(drawing) {
# a non intersection point is a named point (usually from when the face was a single edge)
- # at which there are no intersections with any other sets
- for (fname in .faceNames(drawing)) {
- edgesbySet <- list()
- for (setname in names(drawing at setList)) {
- edgesbySet[[setname]] <- names(.face.to.faceEdges(drawing,setname,type="set"))
+ # at which there are no intersections with any other sets/invisible edges
+ # ie it is at the end of exactly one edge
+ #browser()
+ # rely on having only the edges in the drawing in the edgelist, and only have one of each orientation
+ toNodes <- lapply(drawing at edgeList,function(x)x at to)
+ fromNodes <- lapply(drawing at edgeList,function(x)x at from)
+ toNode.count <- table(as.character(toNodes))
+ fromNode.count <- table(as.character(fromNodes))
+ noni.nodes <- intersect(names(toNode.count)[toNode.count==1],names(fromNode.count)[fromNode.count==1])
+ for (node in noni.nodes) {
+ inedgeName <- names(toNodes)[toNodes==node]
+ outedgeName<- names(fromNodes)[fromNodes==node]
+ drawing <- joinEdgesInDrawing(drawing,inedgeName ,outedgeName)
}
- edgedf <- do.call(rbind,lapply(names(edgesbySet),function(setname){data.frame(edgeName=edgesbySet[[setname]],Set=setname,stringsAsFactors=FALSE)}))
-
-#cat(fname,"\n")
- fedges <- (.faceEdgeNames(drawing,fname,unsigned=TRUE))
- if (length(fedges)<2) { # only one edge in face so cant have any nonintersection points
- next
- }
- nedges <- (.faceEdgeNames(drawing,fname,unsigned=FALSE))
- sedges <- sapply(fedges,function(x){
- res <- edgedf[edgedf$edgeName==x,"Set"]
- if (length(res)==0) { res <- "Invisible"}
- res
- })
- edf <- data.frame(edgeName=fedges,edgeSigned=nedges,Set=sedges,stringsAsFactors=FALSE)
- edf <- rbind(edf,edf[1,])
- edf$dup <- FALSE
- for (ix in 1:nrow(edf)) {
- if (ix==nrow(edf)){jx <- 1} else {jx <- ix+1}
- if (edf$Set[ix]==edf$Set[jx]) {
- edf$dup[ix] <- TRUE
- }
- }
- dupix <- which(edf$dup[-length(edf$dup)])
-#print(edf)
- # will fail if successive nonintersection points
-#browser()
- for (dupi in dupix) {
- inedgeName <- edf$edgeSigned[dupi]
- outedgeName <- edf$edgeSigned[dupi+1]
- Set <- edf$Set[dupi]
- drawing <- joinEdgesInDrawing(drawing,inedgeName ,outedgeName,Set)
- }
- }
drawing
}
@@ -2186,8 +2161,7 @@
edge
}
-joinEdgesInDrawing <- function(drawing,inedgeName ,outedgeName,Set) {
-#cat(sprintf("Joining %s and %s in Set %s\n",inedgeName,outedgeName,Set))
+joinEdgesInDrawing <- function(drawing,inedgeName ,outedgeName) {
inrev <- substr(inedgeName,1,1)=="-"
outrev <- substr(outedgeName,1,1)=="-"
if (inrev !=outrev) {stop("Cant cope with joining edges of opposite polarity")}
@@ -2206,6 +2180,14 @@
newEdge <- joinEdges(inedge,outedge)
+
+ inEdgeSplit <- strsplit(inedgeName ,split="|",fixed=TRUE)[[1]];
+ if (length(inEdgeSplit)>=3) {
+ Set <- inEdgeSplit[3]
+ } else {
+ Set <- "X"
+ }
+#cat(sprintf("Joining %s and %s in Set %s\n",inedgeName,outedgeName,Set))
newEdgeName <- paste(inedge at from,outedge at to,gsub("[A-Za-z]","",Set),sep="|")
drawing at edgeList[[ inpos]] <- NULL
Modified: pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
===================================================================
--- pkg/Vennerable/inst/doc/TissueDrawingTest.pdf 2009-09-12 23:26:23 UTC (rev 54)
+++ pkg/Vennerable/inst/doc/TissueDrawingTest.pdf 2009-09-16 23:03:59 UTC (rev 55)
@@ -184,19 +184,19 @@
<< /S /GoTo /D [126 0 R /Fit ] >>
endobj
153 0 obj <<
-/Length 898
+/Length 897
/Filter /FlateDecode
>>
stream
xÚÝWÉnÛ0½ç+t¤å.òØf4íÁB/EÌØJlÉä¸ýûrLJ¶ zJr±sÞ¼Ù©¯éÙç+E"`F¥Òû
R3¢týBiÌ%*fc/ê,¦mrÿNo¢æKMÅênyBÍegËxÂ$A3ÛfŲñY9ó7µ°ym¦¨Jÿ._Øü±pOÍáJÉaXé\i¬
-ó®nª2kY°:^òÌ°&@Lb©ÂjÊ{\`½H`.üªv1æ,&ûuS»níêÎÖ± ègÀ1ÁGÖªõ
-#=DzËëyU¶¶lÞÂ8VLqÌf* Ìã % ta½£v6rlCìÕÝÍ[wO¹¡hèÒÑ1Â1{\¼Cϧ¬ªÐ
-ãt<Þô
A¦v4Ãeãá~+JÛ£U"y?ÑñhyöÒ
è£[ÙvQÍ°Vï"¼ÿIÄÑ,MºÎ?)&ê*fe9TÊ}*Wó°ú«*JÐ?/lEóà[ÿtïnTFÄñ §1Õ½¶n{Üý83£zå8~/ËbÝ DóVèÓÕׯ¾e¸.!Í}Ö×PÊã]
-ôÞ¢tPÕ Ï*ÀÝf=Væ/M±Z/Cg¾¯¡òÕj°:/vos°p;2S&cmçýz`h5êW6KÒ7Ë÷nó ½àÇÖËl½îÉ:^ÞOè{ê
-
-Wj꨺ð»½àòO¶¯Quï¯w1#hÂL»Ð9{¿ã±K#/ÎGhhÝõÆB¿PvG¶/7/¶n`ú
- l·1
:!×ÒNki\f³ÙÔ¶ilª8 \WË¿óªL-¸@lTm)ñ 8
-Ðl&
rL:£ÞÙu §¢)ê$D&Ú ¦G·ÞÌʹõB¤©;p2&:î4ë-;~ÖÓ{%]θ|IT ÊyVVáü®üÐ;Çn4| 8äãGÒÛúÚìn$êD¸ÏBkǰߥ¦Ü¬l]äî/¡7sr"fácþ²®ð{ýõ77hð5^HcÁ¨ûT5ÈN௳ËôìÊ°}
+ó®nª2kY°:^òÌ°&@Lb©Âjªz\`½H`.üªv1æ,&ûuS»níêÎÖ± ègÀ1ÁGÖªõ
+#=DzËëyU¶¶lÞÂ8VLqÌf* Ìã % ta½£v6rlCìÕÝÍ[wO¹¡÷!ì!#°ÇÅ;dùyêÀªzÍ©@8HÇãM_djHã0\6î·¢´Í0Z%÷h/]>ºmÕ¬kõ.ÂûDÍÒ¤ëüCba¢®b&QCõ9¡<Ù§òp5«o@°ª¢ýóÂV4î¹õO÷qéFeHrSÝkë¶ÇÝ33
+©W³èÇùr¹,Ö
+I4ÿ`
>]}ýÚêËPëÒÜg}
+¥<Þ¥@àÑ JU
+ò¬ÜmöØceþÒ«õ2ÔzvXáû*_«ób÷6·#3
h2ÖFIpxÞ¯P¨~e³$}³|ï6ß
+Úû ~l½ÌÖë¬ãå}𾧮 p¥f ª¿Û.ÿdûU÷þz36!|É´³÷;»D0òâ|Ö]Ái,ô+ew$h;ùróbëf¨ï¡ÀvSè¨Ãr-íÔ±±6Áe6MmÆ¡j Àuµü;¯JÀÔÄFÕÙ íhðÇfR(ÁÔ¨3ê]p |*â®kªNBd¢
+bzÔyëɬ[/Dºc'c¢Cy°XìøY{Lìt9ãò%IP$ht(çYY
ó»òCï»Ñð)zvâ eHoëks°_¸\|,¨Yà>i¬ :Ã~_xr³²u»¿NÞtÌÉ
ù˺.ÂWìmö×ßÜl TÂ?Öxar"£îSÕ`";y¿Î.Ó³øy}
endstream
endobj
126 0 obj <<
@@ -1032,8 +1032,8 @@
endobj
182 0 obj
<<
-/CreationDate (D:20090912234612)
-/ModDate (D:20090912234612)
+/CreationDate (D:20090916235142)
+/ModDate (D:20090916235142)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -1278,8 +1278,8 @@
endobj
193 0 obj
<<
-/CreationDate (D:20090912234613)
-/ModDate (D:20090912234613)
+/CreationDate (D:20090916235143)
+/ModDate (D:20090916235143)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -3440,8 +3440,8 @@
endobj
218 0 obj
<<
-/CreationDate (D:20090912234615)
-/ModDate (D:20090912234615)
+/CreationDate (D:20090916235145)
+/ModDate (D:20090916235145)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -4090,8 +4090,8 @@
endobj
226 0 obj
<<
-/CreationDate (D:20090912234617)
-/ModDate (D:20090912234617)
+/CreationDate (D:20090916235148)
+/ModDate (D:20090916235148)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -5154,8 +5154,8 @@
endobj
236 0 obj
<<
-/CreationDate (D:20090912234644)
-/ModDate (D:20090912234644)
+/CreationDate (D:20090916235214)
+/ModDate (D:20090916235214)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -7274,8 +7274,8 @@
endobj
255 0 obj
<<
-/CreationDate (D:20090912234646)
-/ModDate (D:20090912234646)
+/CreationDate (D:20090916235216)
+/ModDate (D:20090916235216)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -9730,8 +9730,8 @@
endobj
268 0 obj
<<
-/CreationDate (D:20090912234648)
-/ModDate (D:20090912234648)
+/CreationDate (D:20090916235217)
+/ModDate (D:20090916235217)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -12215,8 +12215,8 @@
endobj
282 0 obj
<<
-/CreationDate (D:20090912234650)
-/ModDate (D:20090912234650)
+/CreationDate (D:20090916235219)
+/ModDate (D:20090916235219)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -13272,8 +13272,8 @@
endobj
290 0 obj
<<
-/CreationDate (D:20090912234651)
-/ModDate (D:20090912234651)
+/CreationDate (D:20090916235220)
+/ModDate (D:20090916235220)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -14215,8 +14215,8 @@
endobj
300 0 obj
<<
-/CreationDate (D:20090912234655)
-/ModDate (D:20090912234655)
+/CreationDate (D:20090916235223)
+/ModDate (D:20090916235223)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -15216,8 +15216,8 @@
endobj
317 0 obj
<<
-/CreationDate (D:20090912234656)
-/ModDate (D:20090912234656)
+/CreationDate (D:20090916235224)
+/ModDate (D:20090916235224)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -16302,8 +16302,8 @@
endobj
330 0 obj
<<
-/CreationDate (D:20090912234658)
-/ModDate (D:20090912234658)
+/CreationDate (D:20090916235225)
+/ModDate (D:20090916235225)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -16521,8 +16521,8 @@
endobj
340 0 obj
<<
-/CreationDate (D:20090912234700)
-/ModDate (D:20090912234700)
+/CreationDate (D:20090916235226)
+/ModDate (D:20090916235226)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -16731,8 +16731,8 @@
endobj
349 0 obj
<<
-/CreationDate (D:20090912234701)
-/ModDate (D:20090912234701)
+/CreationDate (D:20090916235227)
+/ModDate (D:20090916235227)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -17473,8 +17473,8 @@
endobj
359 0 obj
<<
-/CreationDate (D:20090912234702)
-/ModDate (D:20090912234702)
+/CreationDate (D:20090916235228)
+/ModDate (D:20090916235228)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -18299,8 +18299,8 @@
endobj
368 0 obj
<<
-/CreationDate (D:20090912234703)
-/ModDate (D:20090912234703)
+/CreationDate (D:20090916235230)
+/ModDate (D:20090916235230)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -19749,8 +19749,8 @@
endobj
377 0 obj
<<
-/CreationDate (D:20090912234705)
-/ModDate (D:20090912234705)
+/CreationDate (D:20090916235231)
+/ModDate (D:20090916235231)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -20701,8 +20701,8 @@
endobj
386 0 obj
<<
-/CreationDate (D:20090912234706)
-/ModDate (D:20090912234706)
+/CreationDate (D:20090916235233)
+/ModDate (D:20090916235233)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -21747,8 +21747,8 @@
endobj
396 0 obj
<<
-/CreationDate (D:20090912234707)
-/ModDate (D:20090912234707)
+/CreationDate (D:20090916235234)
+/ModDate (D:20090916235234)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -22800,8 +22800,8 @@
endobj
405 0 obj
<<
-/CreationDate (D:20090912234708)
-/ModDate (D:20090912234708)
+/CreationDate (D:20090916235235)
+/ModDate (D:20090916235235)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -23176,8 +23176,8 @@
endobj
413 0 obj
<<
-/CreationDate (D:20090912234710)
-/ModDate (D:20090912234710)
+/CreationDate (D:20090916235236)
+/ModDate (D:20090916235236)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -23406,8 +23406,8 @@
endobj
422 0 obj
<<
-/CreationDate (D:20090912234711)
-/ModDate (D:20090912234711)
+/CreationDate (D:20090916235237)
+/ModDate (D:20090916235237)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -23606,8 +23606,8 @@
endobj
431 0 obj
<<
-/CreationDate (D:20090912234712)
-/ModDate (D:20090912234712)
+/CreationDate (D:20090916235238)
+/ModDate (D:20090916235238)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -24396,8 +24396,8 @@
endobj
440 0 obj
<<
-/CreationDate (D:20090912234714)
-/ModDate (D:20090912234714)
+/CreationDate (D:20090916235241)
+/ModDate (D:20090916235241)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -26143,8 +26143,8 @@
endobj
450 0 obj
<<
-/CreationDate (D:20090912234717)
-/ModDate (D:20090912234717)
+/CreationDate (D:20090916235243)
+/ModDate (D:20090916235243)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -26618,8 +26618,8 @@
endobj
460 0 obj
<<
-/CreationDate (D:20090912234718)
-/ModDate (D:20090912234718)
+/CreationDate (D:20090916235244)
+/ModDate (D:20090916235244)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -28412,8 +28412,8 @@
endobj
469 0 obj
<<
-/CreationDate (D:20090912234720)
-/ModDate (D:20090912234720)
+/CreationDate (D:20090916235246)
+/ModDate (D:20090916235246)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -28735,8 +28735,8 @@
endobj
486 0 obj
<<
-/CreationDate (D:20090912234723)
-/ModDate (D:20090912234723)
+/CreationDate (D:20090916235250)
+/ModDate (D:20090916235250)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -29005,8 +29005,8 @@
endobj
501 0 obj
<<
-/CreationDate (D:20090912234726)
-/ModDate (D:20090912234726)
+/CreationDate (D:20090916235253)
+/ModDate (D:20090916235253)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -29329,8 +29329,8 @@
endobj
511 0 obj
<<
-/CreationDate (D:20090912234729)
-/ModDate (D:20090912234729)
+/CreationDate (D:20090916235259)
+/ModDate (D:20090916235259)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -29537,8 +29537,8 @@
endobj
520 0 obj
<<
-/CreationDate (D:20090912234733)
-/ModDate (D:20090912234733)
+/CreationDate (D:20090916235301)
+/ModDate (D:20090916235301)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -30435,8 +30435,8 @@
endobj
530 0 obj
<<
-/CreationDate (D:20090912234756)
-/ModDate (D:20090912234756)
+/CreationDate (D:20090916235317)
+/ModDate (D:20090916235317)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -31327,8 +31327,8 @@
endobj
546 0 obj
<<
-/CreationDate (D:20090912234816)
-/ModDate (D:20090912234816)
+/CreationDate (D:20090916235335)
+/ModDate (D:20090916235335)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -31695,8 +31695,8 @@
endobj
559 0 obj
<<
-/CreationDate (D:20090912234830)
-/ModDate (D:20090912234830)
+/CreationDate (D:20090916235349)
+/ModDate (D:20090916235349)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -31740,10 +31740,12 @@
/Filter /FlateDecode
>>
stream
-xÚU]OÛ0}ï¯ðc"-¯¿ÍØ´ÑIc<dÄÐlmÂ@Å¿ßM~ ¢²nU+%v®ï=çøúh2z{ªI
ÔLn pI-ãÄ0M;2ÉÈU.N1M¦y'\±(+oæ¾hâëÉÙèd2ú=Âð+í$ÜÌGW×døí0*%.rNvÔØvÝG0,§Üém Ô)Õcu%1â¨Ó\w » ¢ÖòPÐáC3-«¹sABíe_.ZàÏ7>+´¦E q¼È¦,^æ!;eÅ?ä1À¡Ár/A7¡wãPD
gyÍ_xdÅóÿ綢y3¹ÙA@ÃÆBEy]?øã*AEÈøÝ$6,òuC/EÈT±ðä¹ÿÀÃøÀbßÂðg͹¯th»5 ²{½ÁàUÑ4PÓδ¼¼÷
¯ÒÆ/%+¶H³VÚlæ ¢Ý´4T.ÚÈv jè£é*jgEd#lìï?ÿá«X²èÍZÄ-êì\×<£ÝÏØ
-j.BQ}Uç[õÙC+}^I"ÐJíÉw¦X8*2#ØÂ÷Îyñ¨³;Ý%CcÔDKØ{×½ÏÝ ¾;ÙZ
-½Äø[ôØÈ7¾°'# Gãh³ÆNÞi,ú;uïÆEýüI¶±W¥UVÓ kø¬ÃÃ㢾[¶±w©÷³:¬ï:/b6S&Îó¢kÝíÃÇqSVOÏã/c Àj0}§tÕ*Î*äÌQä2Ú6Y»Üáí6í<XTNíÂ?÷¿ò¢¿¾yÌÕÚfÍSÿTùºîOòQ:kòyYù~|VO³´ÈÖ]vPr£I"
-¬z'+¾´å
lýp
+xÚU]OÛ0}ï¯ðc"-¯¿ÍØ´ÑIc<dÄÐlmÂ@Å¿ßM~ ¢²nU+ù#×Ç÷slMFoOµ ©É-.©e¦)pG&¹ÀÅ 0Æ¢É4¯ã+eåÍÃÜM|=9LF¿G@þ`
¤Rùèê¿F
³dÑEÎÐÛ®ñèóå;½
+Ã:¥z£®$Fuë®"ÁpRÔZ
+:|h¦eõ2w.0H¨½ìË%PüùÆge6Ó´$yÑÅË<$r§¬ø<84¸@î
B#¨ã&Tòîrȳз¡mþÂ#+ÿ?·ÍÉ}ÌâD 6*ÊëúÁWi*BÆï&±a¯zQ,B¦
+BËs þ÷c~ ÜçßÂðg͹]ºE´]ÐLY
+½Þ`ðªh¨igZ^ÞûÂWiã[¤ÙC
++m6s ÝnÚE*md»FA5ôQÍtµÆ³"I²6ö÷ÿðU,Yôf-âuv®k@£ÝÏxÕ\[£úªÎ·ê³Vú¼D :ÊB÷;S,Álá{ç<øVÔÙÞ!Â1Bj¢
¥ ì½ëÞgÏ^ÁûN¶VC¯¡å1þ}6òůìÉHÂÑ8Ú¬±
¯æ!EÚ¾ÆG]¢Óز¨?É1ÞUiÕ4À¾ëðð8
èáÞ-ÛØ»ÅÔûYÖw7/b6S&Îó¢» »Û㦬Ç_Æ Õaú8O;èªU>UÈ£ZÉe.´½dír¯Û´s,ò`Q9HdP¶ÿPÞÿÊþqøRä1Wk5OaþSåëº?ÉGé¬ÉçeåûñyZ=ÍÒ"[tÙF at 1Ê&4(²ê¬øÒ ÝÜý
endstream
endobj
565 0 obj <<
@@ -33070,8 +33072,8 @@
>> endobj
629 0 obj <<
/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.3)/Keywords()
-/CreationDate (D:20090913000908+01'00')
-/ModDate (D:20090913000908+01'00')
+/CreationDate (D:20090916235556+01'00')
+/ModDate (D:20090916235556+01'00')
/Trapped /False
/PTEX.Fullbanner (This is MiKTeX-pdfTeX 2.6.2693 (1.40.3))
>> endobj
@@ -33083,635 +33085,635 @@
0000000004 00000 f
0000000000 00000 f
0000000015 00000 n
-0000020588 00000 n
-0000650383 00000 n
+0000020587 00000 n
+0000650382 00000 n
0000000060 00000 n
0000000100 00000 n
-0000020648 00000 n
-0000650311 00000 n
+0000020647 00000 n
+0000650310 00000 n
0000000150 00000 n
0000000192 00000 n
-0000025184 00000 n
-0000650225 00000 n
+0000025183 00000 n
+0000650224 00000 n
0000000243 00000 n
0000000284 00000 n
-0000025245 00000 n
-0000650152 00000 n
+0000025244 00000 n
+0000650151 00000 n
0000000335 00000 n
0000000366 00000 n
-0000025306 00000 n
-0000650065 00000 n
+0000025305 00000 n
+0000650064 00000 n
0000000412 00000 n
0000000436 00000 n
-0000025429 00000 n
-0000649977 00000 n
+0000025428 00000 n
+0000649976 00000 n
0000000482 00000 n
0000000523 00000 n
-0000028723 00000 n
-0000649852 00000 n
+0000028722 00000 n
+0000649851 00000 n
0000000569 00000 n
0000000612 00000 n
-0000065387 00000 n
-0000649791 00000 n
+0000065386 00000 n
+0000649790 00000 n
0000000663 00000 n
0000000690 00000 n
-0000096432 00000 n
-0000649703 00000 n
+0000096431 00000 n
+0000649702 00000 n
0000000736 00000 n
0000000781 00000 n
-0000219530 00000 n
-0000649615 00000 n
+0000219529 00000 n
+0000649614 00000 n
0000000827 00000 n
0000000883 00000 n
-0000237538 00000 n
-0000649490 00000 n
+0000237537 00000 n
+0000649489 00000 n
0000000929 00000 n
0000000955 00000 n
-0000253013 00000 n
-0000649416 00000 n
+0000253012 00000 n
+0000649415 00000 n
0000001006 00000 n
0000001048 00000 n
-0000254219 00000 n
-0000649342 00000 n
+0000254218 00000 n
+0000649341 00000 n
0000001099 00000 n
0000001136 00000 n
-0000270723 00000 n
-0000649254 00000 n
+0000270722 00000 n
+0000649253 00000 n
0000001182 00000 n
0000001240 00000 n
-0000290292 00000 n
-0000649166 00000 n
+0000290291 00000 n
+0000649165 00000 n
0000001286 00000 n
0000001333 00000 n
-0000298945 00000 n
-0000649078 00000 n
+0000298944 00000 n
+0000649077 00000 n
0000001380 00000 n
0000001437 00000 n
-0000326450 00000 n
-0000648990 00000 n
+0000326449 00000 n
+0000648989 00000 n
0000001484 00000 n
0000001518 00000 n
-0000367588 00000 n
-0000648902 00000 n
+0000367587 00000 n
+0000648901 00000 n
0000001565 00000 n
0000001592 00000 n
-0000419548 00000 n
-0000648777 00000 n
+0000419547 00000 n
+0000648776 00000 n
0000001639 00000 n
0000001671 00000 n
-0000419608 00000 n
-0000648703 00000 n
+0000419607 00000 n
+0000648702 00000 n
0000001723 00000 n
0000001751 00000 n
-0000433711 00000 n
-0000648616 00000 n
+0000433710 00000 n
+0000648615 00000 n
0000001803 00000 n
0000001839 00000 n
-0000463129 00000 n
-0000648529 00000 n
+0000463128 00000 n
+0000648528 00000 n
0000001891 00000 n
0000001938 00000 n
-0000471583 00000 n
-0000648455 00000 n
+0000471582 00000 n
+0000648454 00000 n
0000001990 00000 n
0000002023 00000 n
-0000502019 00000 n
-0000648365 00000 n
+0000502018 00000 n
+0000648364 00000 n
0000002070 00000 n
0000002099 00000 n
-0000515492 00000 n
-0000648273 00000 n
+0000515491 00000 n
+0000648272 00000 n
0000002147 00000 n
0000002180 00000 n
-0000521706 00000 n
-0000648180 00000 n
+0000521705 00000 n
+0000648179 00000 n
0000002228 00000 n
0000002268 00000 n
-0000525729 00000 n
-0000648087 00000 n
+0000525728 00000 n
+0000648086 00000 n
0000002316 00000 n
0000002344 00000 n
-0000557525 00000 n
-0000647955 00000 n
+0000557524 00000 n
+0000647954 00000 n
0000002392 00000 n
0000002423 00000 n
-0000563535 00000 n
-0000647890 00000 n
+0000563534 00000 n
+0000647889 00000 n
0000002476 00000 n
0000002503 00000 n
-0000564944 00000 n
-0000647811 00000 n
+0000564943 00000 n
+0000647810 00000 n
0000002551 00000 n
0000002584 00000 n
-0000003615 00000 n
-0000003930 00000 n
-0000004082 00000 n
-0000004238 00000 n
-0000004393 00000 n
-0000004549 00000 n
-0000004701 00000 n
-0000004853 00000 n
-0000005005 00000 n
-0000005161 00000 n
-0000005312 00000 n
-0000005464 00000 n
-0000005615 00000 n
-0000005770 00000 n
-0000005925 00000 n
-0000006077 00000 n
-0000006229 00000 n
-0000006382 00000 n
-0000006535 00000 n
-0000006688 00000 n
-0000006841 00000 n
-0000006998 00000 n
-0000007155 00000 n
-0000007312 00000 n
-0000008290 00000 n
-0000008442 00000 n
-0000007655 00000 n
+0000003614 00000 n
+0000003929 00000 n
+0000004081 00000 n
+0000004237 00000 n
+0000004392 00000 n
+0000004548 00000 n
+0000004700 00000 n
+0000004852 00000 n
+0000005004 00000 n
+0000005160 00000 n
+0000005311 00000 n
+0000005463 00000 n
+0000005614 00000 n
+0000005769 00000 n
+0000005924 00000 n
+0000006076 00000 n
+0000006228 00000 n
+0000006381 00000 n
+0000006534 00000 n
+0000006687 00000 n
+0000006840 00000 n
+0000006997 00000 n
+0000007154 00000 n
+0000007311 00000 n
+0000008289 00000 n
+0000008441 00000 n
+0000007654 00000 n
0000002636 00000 n
-0000007469 00000 n
-0000007531 00000 n
-0000646065 00000 n
-0000645891 00000 n
-0000007593 00000 n
-0000646416 00000 n
-0000008595 00000 n
-0000008746 00000 n
-0000008899 00000 n
-0000009052 00000 n
-0000009209 00000 n
-0000009424 00000 n
-0000008103 00000 n
-0000007740 00000 n
-0000009362 00000 n
-0000020376 00000 n
-0000011159 00000 n
-0000020771 00000 n
-0000011020 00000 n
-0000009509 00000 n
-0000020526 00000 n
-0000645586 00000 n
-0000646238 00000 n
-0000645156 00000 n
-0000645730 00000 n
-0000645444 00000 n
-0000645013 00000 n
-0000020709 00000 n
-0000020015 00000 n
-0000020159 00000 n
-0000020259 00000 n
-0000020281 00000 n
-0000022205 00000 n
-0000025490 00000 n
-0000022086 00000 n
-0000020961 00000 n
-0000025122 00000 n
-0000025367 00000 n
-0000645298 00000 n
-0000024761 00000 n
-0000024905 00000 n
-0000025005 00000 n
-0000025027 00000 n
-0000027001 00000 n
-0000026820 00000 n
-0000025642 00000 n
-0000026939 00000 n
-0000028784 00000 n
-0000028542 00000 n
-0000027099 00000 n
-0000028661 00000 n
-0000565427 00000 n
-0000031043 00000 n
-0000030008 00000 n
-0000029827 00000 n
-0000028908 00000 n
-0000029946 00000 n
-0000646533 00000 n
-0000066409 00000 n
-0000065448 00000 n
-0000030924 00000 n
-0000030106 00000 n
-0000065265 00000 n
-0000065327 00000 n
-0000064903 00000 n
-0000065047 00000 n
-0000065147 00000 n
-0000065170 00000 n
-0000076821 00000 n
-0000066290 00000 n
-0000065587 00000 n
-0000076759 00000 n
-0000076398 00000 n
-0000076542 00000 n
-0000076642 00000 n
-0000076664 00000 n
-0000077915 00000 n
-0000095108 00000 n
-0000077796 00000 n
-0000076934 00000 n
-0000094987 00000 n
-0000095049 00000 n
-0000094625 00000 n
-0000094769 00000 n
-0000094869 00000 n
-0000094892 00000 n
-0000096493 00000 n
-0000096251 00000 n
-0000095234 00000 n
-0000096370 00000 n
-0000098706 00000 n
-0000097499 00000 n
-0000097318 00000 n
-0000096604 00000 n
-0000097437 00000 n
-0000133103 00000 n
-0000098587 00000 n
-0000097584 00000 n
-0000132979 00000 n
-0000133041 00000 n
-0000646650 00000 n
-0000132617 00000 n
-0000132761 00000 n
-0000132861 00000 n
-0000132884 00000 n
-0000134443 00000 n
-0000134262 00000 n
-0000133229 00000 n
-0000134381 00000 n
-0000135473 00000 n
-0000176084 00000 n
-0000135354 00000 n
-0000134554 00000 n
-0000176022 00000 n
-0000175660 00000 n
-0000175804 00000 n
-0000175904 00000 n
-0000175927 00000 n
-0000178242 00000 n
-0000177268 00000 n
-0000177087 00000 n
-0000176210 00000 n
-0000177206 00000 n
-0000220621 00000 n
-0000219591 00000 n
-0000178123 00000 n
-0000177366 00000 n
-0000219468 00000 n
-0000219106 00000 n
-0000219250 00000 n
-0000219350 00000 n
-0000219373 00000 n
-0000237599 00000 n
-0000220502 00000 n
-0000219730 00000 n
-0000237476 00000 n
-0000237114 00000 n
-0000237258 00000 n
-0000237358 00000 n
-0000237381 00000 n
-0000238648 00000 n
-0000253074 00000 n
-0000238529 00000 n
-0000237725 00000 n
-0000252951 00000 n
-0000646767 00000 n
-0000252589 00000 n
-0000252733 00000 n
-0000252833 00000 n
-0000252856 00000 n
-0000254280 00000 n
-0000254038 00000 n
-0000253214 00000 n
-0000254157 00000 n
-0000256303 00000 n
-0000255219 00000 n
-0000255038 00000 n
-0000254420 00000 n
-0000255157 00000 n
-0000270784 00000 n
-0000256184 00000 n
-0000255317 00000 n
-0000270661 00000 n
-0000270299 00000 n
-0000270443 00000 n
-0000270543 00000 n
-0000270566 00000 n
-0000272869 00000 n
-0000272001 00000 n
-0000271820 00000 n
-0000270924 00000 n
-0000271939 00000 n
-0000290353 00000 n
-0000272750 00000 n
-0000272099 00000 n
-0000290230 00000 n
-0000289868 00000 n
-0000290012 00000 n
-0000290112 00000 n
-0000290135 00000 n
-0000291465 00000 n
-0000294753 00000 n
-0000291346 00000 n
-0000290493 00000 n
-0000294691 00000 n
-0000646884 00000 n
-0000294330 00000 n
-0000294474 00000 n
-0000294574 00000 n
-0000294596 00000 n
-0000295816 00000 n
-0000299006 00000 n
-0000295697 00000 n
-0000294880 00000 n
-0000298883 00000 n
-0000298522 00000 n
-0000298666 00000 n
-0000298766 00000 n
-0000298788 00000 n
-0000299835 00000 n
-0000312953 00000 n
-0000311965 00000 n
-0000299716 00000 n
-0000299146 00000 n
-0000311903 00000 n
-0000311541 00000 n
-0000311685 00000 n
-0000311785 00000 n
-0000311808 00000 n
-0000327718 00000 n
-0000326511 00000 n
-0000312834 00000 n
-0000312092 00000 n
-0000326388 00000 n
-0000326026 00000 n
-0000326170 00000 n
-0000326270 00000 n
-0000326293 00000 n
-0000352356 00000 n
-0000351403 00000 n
-0000327599 00000 n
-0000326651 00000 n
-0000351341 00000 n
-0000350979 00000 n
-0000351123 00000 n
-0000351223 00000 n
-0000351246 00000 n
-0000368576 00000 n
-0000367649 00000 n
-0000352237 00000 n
-0000351530 00000 n
-0000367526 00000 n
-0000367164 00000 n
-0000367308 00000 n
-0000367408 00000 n
-0000367431 00000 n
-0000386969 00000 n
-0000385953 00000 n
-0000368457 00000 n
-0000367789 00000 n
-0000385891 00000 n
-0000647001 00000 n
-0000385529 00000 n
-0000385673 00000 n
-0000385773 00000 n
-0000385796 00000 n
-0000405496 00000 n
-0000404483 00000 n
-0000386850 00000 n
-0000386080 00000 n
-0000404421 00000 n
-0000404059 00000 n
-0000404203 00000 n
-0000404303 00000 n
-0000404326 00000 n
-0000411292 00000 n
-0000405377 00000 n
-0000404610 00000 n
-0000411230 00000 n
-0000410869 00000 n
-0000411013 00000 n
-0000411113 00000 n
-0000411135 00000 n
-0000412297 00000 n
-0000415629 00000 n
-0000412178 00000 n
-0000411406 00000 n
-0000415567 00000 n
-0000415206 00000 n
-0000415350 00000 n
-0000415450 00000 n
-0000415472 00000 n
-0000416635 00000 n
-0000419669 00000 n
-0000416516 00000 n
-0000415743 00000 n
-0000419486 00000 n
-0000419125 00000 n
-0000419269 00000 n
-0000419369 00000 n
-0000419391 00000 n
-0000420755 00000 n
-0000433772 00000 n
-0000420636 00000 n
-0000419796 00000 n
-0000433649 00000 n
-0000433287 00000 n
-0000433431 00000 n
-0000433531 00000 n
-0000433554 00000 n
-0000434828 00000 n
-0000463189 00000 n
-0000434709 00000 n
-0000433899 00000 n
-0000463067 00000 n
-0000647118 00000 n
-0000462705 00000 n
-0000462849 00000 n
-0000462949 00000 n
-0000462972 00000 n
-0000464359 00000 n
-0000471644 00000 n
-0000464240 00000 n
-0000463316 00000 n
-0000471459 00000 n
-0000471521 00000 n
-0000471098 00000 n
-0000471242 00000 n
-0000471342 00000 n
-0000471364 00000 n
-0000472733 00000 n
-0000502080 00000 n
-0000472614 00000 n
-0000471771 00000 n
-0000501957 00000 n
-0000501595 00000 n
-0000501739 00000 n
-0000501839 00000 n
-0000501862 00000 n
-0000503284 00000 n
-0000503103 00000 n
-0000502207 00000 n
-0000503222 00000 n
-0000505526 00000 n
-0000504638 00000 n
-0000504457 00000 n
-0000503369 00000 n
-0000504576 00000 n
-0000509495 00000 n
-0000505407 00000 n
-0000504723 00000 n
-0000509433 00000 n
-0000509072 00000 n
-0000509216 00000 n
-0000509316 00000 n
-0000509338 00000 n
-0000512036 00000 n
-0000510957 00000 n
-0000510776 00000 n
-0000509609 00000 n
-0000510895 00000 n
-0000647235 00000 n
-0000516644 00000 n
-0000515554 00000 n
-0000511917 00000 n
-0000511042 00000 n
-0000515430 00000 n
-0000515069 00000 n
-0000515213 00000 n
-0000515313 00000 n
-0000515335 00000 n
-0000522794 00000 n
-0000521768 00000 n
-0000516525 00000 n
-0000515681 00000 n
-0000521582 00000 n
-0000521644 00000 n
-0000521221 00000 n
-0000521365 00000 n
-0000521465 00000 n
-0000521487 00000 n
-0000525791 00000 n
-0000522675 00000 n
-0000521895 00000 n
-0000525606 00000 n
-0000525668 00000 n
-0000525245 00000 n
-0000525389 00000 n
-0000525489 00000 n
-0000525511 00000 n
-0000526773 00000 n
-0000541171 00000 n
-0000526654 00000 n
-0000525918 00000 n
-0000541047 00000 n
-0000541109 00000 n
-0000540685 00000 n
-0000540829 00000 n
-0000540929 00000 n
-0000540952 00000 n
-0000542701 00000 n
-0000541951 00000 n
-0000541770 00000 n
-0000541285 00000 n
-0000541889 00000 n
-0000558773 00000 n
-0000557093 00000 n
-0000542582 00000 n
-0000542036 00000 n
-0000556969 00000 n
-0000557031 00000 n
-0000647352 00000 n
-0000556607 00000 n
-0000556751 00000 n
-0000556851 00000 n
-0000556874 00000 n
-0000557587 00000 n
-0000557344 00000 n
-0000557207 00000 n
-0000557463 00000 n
-0000563658 00000 n
-0000558654 00000 n
-0000557659 00000 n
-0000563473 00000 n
-0000563597 00000 n
-0000563112 00000 n
-0000563256 00000 n
-0000563356 00000 n
-0000563378 00000 n
-0000564722 00000 n
-0000565130 00000 n
-0000564583 00000 n
-0000563785 00000 n
-0000564882 00000 n
-0000565006 00000 n
-0000565068 00000 n
-0000565228 00000 n
-0000565675 00000 n
-0000565701 00000 n
-0000565762 00000 n
-0000565798 00000 n
-0000566189 00000 n
-0000566214 00000 n
-0000566356 00000 n
-0000566383 00000 n
-0000644700 00000 n
-0000566408 00000 n
-0000566683 00000 n
-0000567066 00000 n
-0000567390 00000 n
-0000567861 00000 n
-0000569537 00000 n
-0000569765 00000 n
-0000571447 00000 n
-0000571671 00000 n
-0000585279 00000 n
-0000585821 00000 n
-0000587432 00000 n
-0000587684 00000 n
-0000598946 00000 n
-0000599379 00000 n
-0000601568 00000 n
-0000601811 00000 n
-0000616207 00000 n
-0000616578 00000 n
-0000633711 00000 n
-0000634172 00000 n
-0000644411 00000 n
-0000647453 00000 n
-0000647571 00000 n
-0000647665 00000 n
-0000647735 00000 n
-0000650492 00000 n
-0000650683 00000 n
-0000650861 00000 n
-0000651032 00000 n
-0000651202 00000 n
-0000651370 00000 n
-0000651538 00000 n
-0000651708 00000 n
-0000651877 00000 n
-0000652047 00000 n
-0000652216 00000 n
-0000652388 00000 n
-0000652575 00000 n
-0000652768 00000 n
-0000652948 00000 n
-0000653155 00000 n
-0000653381 00000 n
-0000653481 00000 n
-0000653591 00000 n
-0000653703 00000 n
-0000653814 00000 n
-0000653908 00000 n
-0000653946 00000 n
-0000654074 00000 n
+0000007468 00000 n
+0000007530 00000 n
+0000646064 00000 n
+0000645890 00000 n
+0000007592 00000 n
+0000646415 00000 n
+0000008594 00000 n
+0000008745 00000 n
+0000008898 00000 n
+0000009051 00000 n
+0000009208 00000 n
+0000009423 00000 n
+0000008102 00000 n
+0000007739 00000 n
+0000009361 00000 n
+0000020375 00000 n
+0000011158 00000 n
+0000020770 00000 n
+0000011019 00000 n
+0000009508 00000 n
+0000020525 00000 n
+0000645585 00000 n
+0000646237 00000 n
+0000645155 00000 n
+0000645729 00000 n
+0000645443 00000 n
+0000645012 00000 n
+0000020708 00000 n
+0000020014 00000 n
+0000020158 00000 n
+0000020258 00000 n
+0000020280 00000 n
+0000022204 00000 n
+0000025489 00000 n
+0000022085 00000 n
+0000020960 00000 n
+0000025121 00000 n
+0000025366 00000 n
+0000645297 00000 n
+0000024760 00000 n
+0000024904 00000 n
+0000025004 00000 n
+0000025026 00000 n
+0000027000 00000 n
+0000026819 00000 n
+0000025641 00000 n
+0000026938 00000 n
+0000028783 00000 n
+0000028541 00000 n
+0000027098 00000 n
+0000028660 00000 n
+0000565426 00000 n
+0000031042 00000 n
+0000030007 00000 n
+0000029826 00000 n
+0000028907 00000 n
+0000029945 00000 n
+0000646532 00000 n
+0000066408 00000 n
+0000065447 00000 n
+0000030923 00000 n
+0000030105 00000 n
+0000065264 00000 n
+0000065326 00000 n
+0000064902 00000 n
+0000065046 00000 n
+0000065146 00000 n
+0000065169 00000 n
+0000076820 00000 n
+0000066289 00000 n
+0000065586 00000 n
+0000076758 00000 n
+0000076397 00000 n
+0000076541 00000 n
+0000076641 00000 n
+0000076663 00000 n
+0000077914 00000 n
+0000095107 00000 n
+0000077795 00000 n
+0000076933 00000 n
+0000094986 00000 n
+0000095048 00000 n
+0000094624 00000 n
+0000094768 00000 n
+0000094868 00000 n
+0000094891 00000 n
+0000096492 00000 n
+0000096250 00000 n
+0000095233 00000 n
+0000096369 00000 n
+0000098705 00000 n
+0000097498 00000 n
+0000097317 00000 n
+0000096603 00000 n
+0000097436 00000 n
+0000133102 00000 n
+0000098586 00000 n
+0000097583 00000 n
+0000132978 00000 n
+0000133040 00000 n
+0000646649 00000 n
+0000132616 00000 n
+0000132760 00000 n
+0000132860 00000 n
+0000132883 00000 n
+0000134442 00000 n
+0000134261 00000 n
+0000133228 00000 n
+0000134380 00000 n
+0000135472 00000 n
+0000176083 00000 n
+0000135353 00000 n
+0000134553 00000 n
+0000176021 00000 n
+0000175659 00000 n
+0000175803 00000 n
+0000175903 00000 n
+0000175926 00000 n
+0000178241 00000 n
+0000177267 00000 n
+0000177086 00000 n
+0000176209 00000 n
+0000177205 00000 n
+0000220620 00000 n
+0000219590 00000 n
+0000178122 00000 n
+0000177365 00000 n
+0000219467 00000 n
+0000219105 00000 n
+0000219249 00000 n
+0000219349 00000 n
+0000219372 00000 n
+0000237598 00000 n
+0000220501 00000 n
+0000219729 00000 n
+0000237475 00000 n
+0000237113 00000 n
+0000237257 00000 n
+0000237357 00000 n
+0000237380 00000 n
+0000238647 00000 n
+0000253073 00000 n
+0000238528 00000 n
+0000237724 00000 n
+0000252950 00000 n
+0000646766 00000 n
+0000252588 00000 n
+0000252732 00000 n
+0000252832 00000 n
+0000252855 00000 n
+0000254279 00000 n
+0000254037 00000 n
+0000253213 00000 n
+0000254156 00000 n
+0000256302 00000 n
+0000255218 00000 n
+0000255037 00000 n
+0000254419 00000 n
+0000255156 00000 n
+0000270783 00000 n
+0000256183 00000 n
+0000255316 00000 n
+0000270660 00000 n
+0000270298 00000 n
+0000270442 00000 n
+0000270542 00000 n
+0000270565 00000 n
+0000272868 00000 n
+0000272000 00000 n
+0000271819 00000 n
+0000270923 00000 n
+0000271938 00000 n
+0000290352 00000 n
+0000272749 00000 n
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/vennerable -r 55
More information about the Vennerable-commits
mailing list