[Vennerable-commits] r39 - in pkg/Vennerable: . R inst/doc tests

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Aug 2 13:05:58 CEST 2009


Author: js229
Date: 2009-08-02 13:05:56 +0200 (Sun, 02 Aug 2009)
New Revision: 39

Modified:
   pkg/Vennerable/DESCRIPTION
   pkg/Vennerable/R/02TissueDrawing.R
   pkg/Vennerable/R/03VennDrawing.R
   pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw
   pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
   pkg/Vennerable/inst/doc/Venn.Rnw
   pkg/Vennerable/tests/bug0521JuneAprilMay.R
Log:
fix bug 521 probably

Modified: pkg/Vennerable/DESCRIPTION
===================================================================
--- pkg/Vennerable/DESCRIPTION	2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/DESCRIPTION	2009-08-02 11:05:56 UTC (rev 39)
@@ -1,6 +1,6 @@
 Package: Vennerable
 Title: Venn and Euler area-proportional diagrams
-Version: 1.0 
+Version: 2.0 
 Author: Jonathan Swinton
 Description: A package for drawing various species of Venn diagrams.
 Maintainer: Jonathan Swinton <jonathan at swintons.net>

Modified: pkg/Vennerable/R/02TissueDrawing.R
===================================================================
--- pkg/Vennerable/R/02TissueDrawing.R	2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/R/02TissueDrawing.R	2009-08-02 11:05:56 UTC (rev 39)
@@ -979,9 +979,9 @@
 	centroid.xy <- matrix(c(cx,cy),ncol=2)
 }
 
-.PlotFace.TissueDrawing <- function(drawing,faceName,dx=0.05,gp=gpar()) {
+.PlotFace.TissueDrawing <- function(drawing,faceName,dx=0.05,gp=gpar(),doDarkMatter=FALSE) {
 #cat(faceName,"\n")
-	if (faceName=="DarkMatter") {
+	if (!doDarkMatter & faceName=="DarkMatter") {
 		return()
 	} 
 	all.xy <- .face.toxy(drawing,faceName,dx=dx)
@@ -1324,6 +1324,9 @@
 			# so further subdivision takes us back out of the Set
 			newFaceSigP <- inFaceSignature 
 			newFaceSigM <- paste(substr(inFaceSignature ,1,nSets-1),"0",sep="")
+	#		if (newFaceSigM==paste(rep("0",nSets),collapse="")) {
+	#			newFaceSigM <- "DarkMatter"
+	#		}
 		}
 	
 	}
@@ -2006,9 +2009,7 @@
 		# then negative ones
 		if (fedges[1]==inneg){ fedges <- fedges[c(2:length(fedges),1)] }
 		revName <- paste("-",newEdgeName,sep="")
-#if (fname=="10") {cat(sprintf("(%s): %s, %s -> %s\n",paste(fedges,collapse=","),inneg,outneg,revName))}
 		fedges <- spliceinstead(fedges,c(outneg,inneg),revName)
-#if (fname=="10") {cat(sprintf("(%s)\n",paste(fedges,collapse=",")))}
 		drawing at faceList[[fname]] <- fedges
 	}
 	drawing at nodeList[[inedge at to]] <- NULL
@@ -2016,7 +2017,10 @@
 }
 
 .merge.faces.invisibly.split <- function(diagram) {
-	fsigs <- data.frame(cbind(Name=unlist(.faceNames(diagram)),Signature=unlist(.faceSignatures(diagram))),stringsAsFactors=FALSE);rownames(fsigs)<- 1:nrow(fsigs)
+	fsigs <- data.frame(cbind(Name=unlist(.faceNames(diagram)),Signature=unlist(.faceSignatures(diagram))),stringsAsFactors=FALSE);
+	rownames(fsigs)<- 1:nrow(fsigs)
+	nSets <- unique(nchar(setdiff(fsigs$Signature,"DarkMatter")))
+	fsigs$Signature[fsigs$Signature==paste(rep("0",nSets),collapse="")] <- "DarkMatter"
 	w <- lapply(split(fsigs$Name,fsigs$Signature),length)
 	w <- w[w>1]
 	if (length(w)>0) {
@@ -2034,7 +2038,6 @@
 			firstVisibleIx <- min(which(faceVisible1))
 			firstVisibleFrom <- faceEdges1[[firstVisibleIx ]]@from
 			diagram<- .startFaceAtPoint(diagram,wnames[1],firstVisibleFrom )
-			#diagram<- .startFaceAtPoint(diagram,wnames[2],firstVisibleFrom )
 			faceEdges1 <- .face.to.faceEdges(diagram,wnames[1])
 			faceVisible1 <- sapply(faceEdges1,function(x)x at visible)	
 			faceEdges2 <- .face.to.faceEdges(diagram,wnames[2])

Modified: pkg/Vennerable/R/03VennDrawing.R
===================================================================
--- pkg/Vennerable/R/03VennDrawing.R	2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/R/03VennDrawing.R	2009-08-02 11:05:56 UTC (rev 39)
@@ -193,7 +193,7 @@
 
 PlotVennGeometry <- function(C3,gpList,show=list(FaceText="weight")) {
 	show.default <- list(universe=TRUE,Sets=TRUE,SetLabels=TRUE,
-		dark.matter=FALSE,
+		DarkMatter=FALSE,
 		Faces=TRUE,
 		FaceText="weight")
 	unshown <- names(show)[! names(show) %in% names(show.default)]
@@ -216,6 +216,9 @@
 	if(show.default$universe) {
 		PlotUniverse(C3)
 	}
+	if(show.default$DarkMatter) {
+		PlotDarkMatter(C3)
+	}
 	if (show.default$Faces) {
 		PlotFaces(C3,gp=gp[["Face"]])
 	}
@@ -229,7 +232,7 @@
 	if (length(show.default$FaceText)>0) {
 		PlotIntersectionText(C3,element.plot=show.default$FaceText,
 			gp=gp[["FaceText"]],
-			show.dark.matter=show.default$dark.matter)	
+			show.dark.matter=show.default$DarkMatter)	
 	}
 
 	UpViewports()	
@@ -337,6 +340,10 @@
 	pushViewport(viewport(name="Vennvp",layout.pos.row=1,layout.pos.col=1,xscale=xrange,yscale=yrange))
 	}
 
+PlotDarkMatter <- function(VD) {
+	ur <- UniverseRange(VD)
+	grey <- brewer.pal(8,"Greys")[2]
+	grid.polygon(x=ur[c(1,1,2,2),1],y=ur[c(1,2,2,1),2],gp=gpar(fill=grey))
+	.PlotFace.TissueDrawing(VD,"DarkMatter",gp=gpar(fill="white"),doDarkMatter=TRUE)
+	}
 
-
-

Modified: pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw
===================================================================
--- pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw	2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/inst/doc/TissueDrawingTest.Rnw	2009-08-02 11:05:56 UTC (rev 39)
@@ -49,7 +49,14 @@
 
 <<loadmore,echo=FALSE>>=
 options(width=80)
-shoar <- function(VDI) {lapply(VDI at edgeList,function(lh){xy <- .edge.to.xy(lh); grid.lines(xy[,1],xy[,2],default.units="native",arrow=arrow())})}
+shoar <- function(VDI) {
+	res <- lapply(VDI at edgeList,function(lh){
+		xy <- .edge.to.xy(lh);
+	      grid.lines(xy[,1],xy[,2],default.units="native",arrow=arrow())
+		}
+	)
+	invisible(res)
+}
 @
 
 \tableofcontents
@@ -805,7 +812,7 @@
 @
  \end{center}\end{figure}
 
-\section{One tangent point}
+\subsection{One tangent point}
 <<circ33a>>=
 r <- c( 1.261566 ,0.977205, 1.492705)
 x <- c(0.000000,  1.350138 ,-1.086542)
@@ -824,28 +831,28 @@
 makevp.eqsc(c(-3,3),c(-3,3))
 grid.xaxis()
 grid.yaxis()
-PlotFaces(TM3)
-PlotSetBoundaries(VDC1);PlotSetBoundaries(VDC2);
-PlotNodes(VDC1);PlotNodes(VDC2);
-.PlotFaceNames.TissueDrawing (TM3)
-PlotNodes(TM3)
-
+PlotFaces(TM)
+PlotSetBoundaries(VDC1);PlotSetBoundaries(VDC2);PlotSetBoundaries(VDC3);
+#PlotNodes(VDC1);PlotNodes(VDC2);PlotNodes(VDC3);
+.PlotFaceNames.TissueDrawing (TM)
+PlotNodes(TM)
+shoar(TM)
 @
  \end{center}\end{figure}
 
 
-\section{Three circles}
+\subsection{Three circles one tangent}
 <<circ33b>>=
 r <- c(  1.492705, 0.977205, 1.128379)
 x <- c(0.000000,  1.384666, -1.028597 )
  y <- c(1.49270533, -0.55257134, -0.02662434 )
 	centres <- matrix(c(x,y),ncol=2,byrow=FALSE)
-	VDC1 <- newTissueFromCircle(centres[1,],radius=r[1],Set=1,nodes=6); 
-	VDC2 <- newTissueFromCircle(centres[2,],radius=r[2],Set=2,nodes=2); 
-	TM <- addSetToDrawing (drawing1=VDC1,drawing2=VDC2,set2Name="Set2")
-	VDC3 <- newTissueFromCircle(centres[3,],radius=r[3],Set=3); 
-	TM3 <- addSetToDrawing (drawing1=TM,drawing2=VDC3,set2Name="Set3")
-	TV3 <- .merge.faces.invisibly.split(TM3)
+	VDC1b <- newTissueFromCircle(centres[1,],radius=r[1],Set=1,nodes=6); 
+	VDC2b <- newTissueFromCircle(centres[2,],radius=r[2],Set=2,nodes=2); 
+	TMb <- addSetToDrawing (drawing1=VDC1b,drawing2=VDC2b,set2Name="Set2")
+	VDC3b <- newTissueFromCircle(centres[3,],radius=r[3],Set=3); 
+	TM3b <- addSetToDrawing (drawing1=TMb,drawing2=VDC3b,set2Name="Set3")
+	TV3b <- .merge.faces.invisibly.split(TM3b)
 @
 \begin{figure}[H]\begin{center}
 
@@ -853,15 +860,10 @@
 grid.newpage();pushViewport(plotViewport(c(1,1,1,1)))
 makevp.eqsc(c(-3,3),c(-3,3))
 grid.xaxis();grid.yaxis()
-PlotFaces(TV3)
-PlotSetBoundaries(TV3)
-#PlotSetBoundaries(VDC3)
-#shoar(TM3)
+PlotFaces(TV3b)
+PlotSetBoundaries(TV3b)
+PlotNodes(TV3b)
 
-#PlotNodes(VDC1);PlotNodes(VDC2);
-#.PlotFaceNames.TissueDrawing (TM3)
-PlotNodes(TM3)
-
 @
  \end{center}\end{figure}
 

Modified: pkg/Vennerable/inst/doc/TissueDrawingTest.pdf
===================================================================
--- pkg/Vennerable/inst/doc/TissueDrawingTest.pdf	2009-08-01 23:34:10 UTC (rev 38)
+++ pkg/Vennerable/inst/doc/TissueDrawingTest.pdf	2009-08-02 11:05:56 UTC (rev 39)
@@ -91,43 +91,43 @@
 (Canonical)
 endobj
 65 0 obj
-<< /S /GoTo /D (section.12) >>
+<< /S /GoTo /D (subsection.11.2) >>
 endobj
 68 0 obj
 (One tangent point)
 endobj
 69 0 obj
-<< /S /GoTo /D (section.13) >>
+<< /S /GoTo /D (subsection.11.3) >>
 endobj
 72 0 obj
-(Three circles)
+(Three circles one tangent)
 endobj
 73 0 obj
-<< /S /GoTo /D (section.14) >>
+<< /S /GoTo /D (section.12) >>
 endobj
 76 0 obj
 (Triangles)
 endobj
 77 0 obj
-<< /S /GoTo /D (section.15) >>
+<< /S /GoTo /D (section.13) >>
 endobj
 80 0 obj
 (Three squares)
 endobj
 81 0 obj
-<< /S /GoTo /D (section.16) >>
+<< /S /GoTo /D (section.14) >>
 endobj
 84 0 obj
 (Noncontigous subsets)
 endobj
 85 0 obj
-<< /S /GoTo /D (section.17) >>
+<< /S /GoTo /D (section.15) >>
 endobj
 88 0 obj
 (Ellipses)
 endobj
 89 0 obj
-<< /S /GoTo /D (section.18) >>
+<< /S /GoTo /D (section.16) >>
 endobj
 92 0 obj
 (This document)
@@ -136,22 +136,20 @@
 << /S /GoTo /D [94 0 R  /Fit ] >>
 endobj
 118 0 obj <<
-/Length 802       
+/Length 846       
 /Filter /FlateDecode
 >>
 stream
-xÚÝVÉnÛ0½ç+t¤€š%‡û±MR Ú"ôRô ÛŒ­Æ‘\KNÛ¿ïP¤äœkr±dbæÍòÞõ±¸zÿI³Œ
-\ɬxÈ@J*Ê´–¬ÎŠeöƒ¹P¤jÛ½¿Ù•9WäOU¯òŸÅ]6³‚
-¥³pê¸Ì
-#~±®«E¹Ég Yú®¬6müSÖËø²ólµóm[5u<[¬ýâ±
-à15ÄU
-Bj¨•
-CYjÄPwM]vë2ùÞc^…Ì8…ÞXQ¥“1Œ¨–:,0€*êŒÍ$2Ú`j¡9P©D6;Ø}دöm÷.ÆÆ\rFºw›q‰¹*‹Ž‚ª¡›×MÝùºkG‡Ù€
-ÚDKžÏ8cŒk}¿ñË•¿÷‹®ÙÅ“fþÿá;×\Ñ—Îf(û¥È¹éì©<ƒ§‰ûpHKsRbY¡3© }–è»ÙTÛÖ#ÉÆ
-Bó™Â où¡«f‚ÆÙШcD¢ásÚ<v}ÛTA§ƒXgÌjF8;a5
-™Lp_ÊÇ«Œ¶zÚn×Ëc†vùæéÄzQõ§‹àK 4áz* J¯Gû¡cÜn.‰E%ŒQ,_‡yoÂ
-x?~·)·Û1YÌ+Ɔ¿&Uðð„‘³Óòa˜•¿å£æ!>ç90²Oå+°Xº€×;±pq>’¾ô ¯p$½æ È°éºa}á¼ø]fhÔPj`÷'çAQÇ3„’ÆmrJÒ&…,—Ë{ß¹Òœ¬ÄÀm³ù·jê€i¥&ÇÄ^Â,OÐÎj&¥FTÃD07î”\2ò\µÕ|Õ°B”±Ž6u1àbé¹ê“,땏‹Èriˆ˜lçÉcÝççýyºÁ_+ì™°/\	ø@庬›ôÉ ¥zÓ7G?c‹.Ž‡èù­N
-ï"[G7¾J0È››äM¼”7É'ýå #É®ÂèÑÅ2t—0é¢&C¶¿÷e<èÅé” ROŠSG¼(øÁT­š}º%Ûý¼õ½R!\ÒL†7ÑýðQÖ 'rR—ÚQ¡ñkQÊG„`xu[\ý‚ˆR
+xÚÝWMoÛ0½÷Wø(‹&Q–Ž[Û+°íPc—aÇQ¯©ÙN»ýûQ–ì|Ì@{m/µ#ä#ù¬~Ì/ÞÒ,á®d’ß% %•V%ZK
+F'ù*ùAòT(RuÝÞ]µEÊyªêuú3¿IFP¡t² N-7£yƈ+7uUÛtŠ‘•ë‹jÛ…E½
+/­ó`ëÖu]ÕÔá¬Ü¸ò¾óà!5ÄU
+|j¨‘
+Cj,„P7M]ô›"úÞb^=ùÌ8…ÁXQ¥£1L¨†Z,Ѓ*j3“H*d°ÁÔfBs R‰dq°û°_ï»þ]ˆŒÙè&îôà¶àsUU#›—MÝ»ºï&‹Ù€ö
+:–<]pÆÉ7.ú~åVkwëʾiÃI³ü…¿ðk.C…ŠoG6–}†’§ÜLíZyV9ñpHK³RbYž™X
+Ð!Kô¿Þn«]ç°É™„¦…Aßò<«z¦‹‘¨ã6ˆØ†Ïµ§yb}×T~NÃwÙŸq¡±'M;&#Ú—â~‚*£«vÛØêÕqƒïZßøæá嬆ÓÒ{ €&\ÍT1àådï´Œ[Âõs³¢"Æ4+_Çuo¼<ú?®Ý»Ý”,æbˆŒ¿¦¡àþɳ‘ÂÓòa\•?Å¡GÍ]x.S`dËW`°t¯w;æÙõˆó¥Çùòúç5EF¡ëGõÂuqmçWhš¡H`ÿ”r?QÇ+„#bln¤³²X­n]Ÿ§Hs¢ˆ'€»fûwÝÔÓHZs˜æ9ÌâílïçvRjÄ 9ÌN’’JF«®ZŽC5*ˆÊŒ% ç¾œ…^
+IõÚ2\ffE‡óè±òsî<]ï¯r&Ä%ß=(¢\uoZª7ýáV#P4i„žø€ÀÇ·:ÒÛ‡Þ}.Ð ðm° ç”ßE`GíhÌâˆùÿ
+¯©lýR]ä0ni&I[aµÃpåD6»ØbvM»ßû"Z%ˆä³k.ƒ?~¤K¼«VëfYïöËÎ
+*ÿ0"g%ïƒûá>&N¤˜µÖc²U²jÊýCx-‘³×m©ÐxÁ( 0Ž7¼¸Î/þØ¿Üd
 endstream
 endobj
 94 0 obj <<
@@ -160,7 +158,7 @@
 /Resources 117 0 R
 /MediaBox [0 0 595.276 841.89]
 /Parent 124 0 R
-/Annots [ 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R ]
+/Annots [ 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R ]
 >> endobj
 95 0 obj <<
 /Type /Annot
@@ -270,45 +268,52 @@
 110 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 230.126 217.683 241.005]
+/Rect [138.75 239.954 235.048 250.858]
 /Subtype /Link
-/A << /S /GoTo /D (section.12) >>
+/A << /S /GoTo /D (subsection.11.2) >>
 >> endobj
 111 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 210.111 195.436 219.088]
+/Rect [138.75 227.999 264.079 238.903]
 /Subtype /Link
-/A << /S /GoTo /D (section.13) >>
+/A << /S /GoTo /D (subsection.11.3) >>
 >> endobj
 112 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 186.291 180.413 197.17]
+/Rect [123.806 206.216 180.413 217.095]
 /Subtype /Link
-/A << /S /GoTo /D (section.14) >>
+/A << /S /GoTo /D (section.12) >>
 >> endobj
 113 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 164.373 200.986 175.252]
+/Rect [123.806 184.298 200.986 195.177]
 /Subtype /Link
-/A << /S /GoTo /D (section.15) >>
+/A << /S /GoTo /D (section.13) >>
 >> endobj
 114 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 142.455 231.8 153.334]
+/Rect [123.806 162.38 231.8 173.259]
 /Subtype /Link
-/A << /S /GoTo /D (section.16) >>
+/A << /S /GoTo /D (section.14) >>
 >> endobj
 115 0 obj <<
 /Type /Annot
 /Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 120.537 173.409 131.416]
+/Rect [123.806 140.462 173.409 151.342]
 /Subtype /Link
-/A << /S /GoTo /D (section.17) >>
+/A << /S /GoTo /D (section.15) >>
 >> endobj
+116 0 obj <<
+/Type /Annot
+/Border[0 0 1]/H/I/C[1 0 0]
+/Rect [123.806 120.448 204.124 129.424]
+/Subtype /Link
+/A << /S /GoTo /D (section.16) >>
+>> endobj
 119 0 obj <<
 /D [94 0 R /XYZ 124.802 740.998 null]
 >> endobj
@@ -322,46 +327,49 @@
 /Font << /F60 121 0 R /F63 122 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-127 0 obj <<
-/Length 111       
+128 0 obj <<
+/Length 265       
 /Filter /FlateDecode
 >>
 stream
-xÚMÌ¡1€a¿§¨ÜÄJÛѲZèºË)r' ¼?\0È?ùóí#mŽÖÀÑMâ
-,[ì$°#C‡˜`ÈÜKU¢óò,U”òô8¿o—ûk-k=+—1N_‹þ-sl¦PÍù‡Éz¦C¤ƒ¤
+xÚMPÁNÄ ¼÷+8B",P`—£F=x•xQÝ–-èZL!6þ½PÚÄÓ¼÷†7̼;ÓU˜ ­P˜`\åàHa\3€WÈf”RhœE˜K
+_îí0ÚgÛ§0×I8ä½›§¬H&ZqU)Àœ®ŽUê6?×-Œûj®}¬ØíbŽ_vJu.ÅÎ÷~î¯öá–
+8Ø7Jùd‡Ê+¦±ì©6ßÁO)n)Œ69»}½ø䶍5Z‘þÙ‚ÏmUb0F´”5Fr]ªÁ»
+³]®›†ÕKžÄ׃µê¯¡ÿ\|´d•eJ“VI€å‰¡¶{óÂ5¦ùâ3m/
 endstream
 endobj
-126 0 obj <<
+127 0 obj <<
 /Type /Page
-/Contents 127 0 R
-/Resources 125 0 R
+/Contents 128 0 R
+/Resources 126 0 R
 /MediaBox [0 0 595.276 841.89]
 /Parent 124 0 R
-/Annots [ 116 0 R ]
 >> endobj
-116 0 obj <<
-/Type /Annot
-/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [123.806 705.013 204.124 713.989]
-/Subtype /Link
-/A << /S /GoTo /D (section.18) >>
+129 0 obj <<
+/D [127 0 R /XYZ 124.802 740.998 null]
 >> endobj
-128 0 obj <<
-/D [126 0 R /XYZ 124.802 740.998 null]
+6 0 obj <<
+/D [127 0 R /XYZ 124.802 716.092 null]
 >> endobj
-125 0 obj <<
+126 0 obj <<
 /Font << /F63 122 0 R /F60 121 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
 132 0 obj <<
-/Length 265       
+/Length 789       
 /Filter /FlateDecode
 >>
 stream
-xÚMPMOÄ ¼÷Wp„DX¾w9jÔƒW‰õÐmÙ‚®Åbã¿—–6ñ4ï½á
-3ïÎ6‡G- “DH́½ Æ%9QŽTÆ
-°=x…aF)…Ö;„¹¢ðåÞõƒ{v]ŽSÄóGéл}*Šb4׋ ˜sÂõ±JÝ–çFÀ´¯–:¤ŠíN!¦àðåÆ\ñ² Üù.LÝÕÝ ,¨„½{£”®¯Üù·bž+žjóØӶãà²wÛ×sÈ~ÛX£-òqD’ŸÅD±J[B-1#F©#û6×àm…)>cߎýê¥LÒ¿ëÑ¥Zu×Ø}Î!9²Ê2mˆÐ
-`ubDêíÞbášÛüâ<m0
+xÚíW]OÛ0}ﯰxJ5ì|¶Ó:M&mBÓ&*öÀx¨Òª…¦4eÀ¿Ÿk'¶š0ñÀÃT]Åu®Ï½>öuŽ§ƒ£ÏñˆŒ½qìÇdzM˜z#ê“„Ž=–$d:'—ÎÇ¡ù³2§ä6ç–q;ã¶àVqÛH—¼éÊfa¼eÎ/QþXqcÒc"·¼g§5=6·÷Ü|n‡
+‘d
+Ë—ãXã»C_0Ÿùq5ýJ(qóÆQ$³ñnèú1÷c!- HiŠT.5>™•6Ì\d‘EÝð×€ÜR܆=åvƒ)7"
+öªyX¢‰QÄ<$é	í
+|TÛD­)ï—s.aµ2dû
+v¸/Má+’o>lÿUÃ.1;Ä%?p;·}çx¦Zˆë&œWQiÝsƒ\-	Es2•«;ÙR1÷hlîQLÛp¿þ’2éë]whpÒåU­ñw-Ý=é [u݁ÙÆ<@ƒÞ'R»x<MÔk=ç^#ìû¢Ú/¦!vð¸à.'M­xFÈÀ<@ê•
+ùÉ ¢r÷ mïÜ@â6éãÙX®•9R¦‡´×¼Ùì´uU+Bf÷3è¨å®6VXÝ=‡¥¦ºw¶¯Õԥ׊ÒÖoðøþß!Ì´•ÏöøIšÙ“ãÇòL¦t͸sAýQ“D¿õkC{úg´ïÖ²~³$«!5û¬U¶£!³ê‰]*U	}ÙЖ“BÛÁV$j’KsEµzÚâá›*A×Hý=¦Tw{L½@_µS[–ÚírõfæQ3C\ª‚< »oÍUïy‚3çžV­Õ–N–êç%þÁßÆ‚ïýÉÅñ¨æZ±nq»ß*Ú½rږΧÓãÓS‹¶ß…a#NÅg$½Ü
+¨q
+½-^ª‘è8úrËÈI9øÁê•«P]
+öX|›RýÛ4{IŽ<Žd~Gt{õ#ꤳ¥lÌŠª”­jU,6²yq’Íóì<K7åºeQè…|67J¼˜I¼@EüÒx@?
 endstream
 endobj
 131 0 obj <<
@@ -371,50 +379,20 @@
 /MediaBox [0 0 595.276 841.89]
 /Parent 124 0 R
 >> endobj
-133 0 obj <<
-/D [131 0 R /XYZ 124.802 740.998 null]
->> endobj
-6 0 obj <<
-/D [131 0 R /XYZ 124.802 716.092 null]
->> endobj
-130 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R >>
-/ProcSet [ /PDF /Text ]
->> endobj
-136 0 obj <<
-/Length 790       
-/Filter /FlateDecode
->>
-stream
-xÚíW]OÛ0}ﯰxJ5bâ4í´N‚I›Ð´‰Š=t<TiÕBSš2àßϵÛ
-M:ñÀÃT]Åu®Ï½>öuN'½“ÏѐŒè(ò#2¹!ÌèÐóIì(‹c2™“©ó±ï†þÀYö™Sp›sK¹]p[p+¹m¤ËÞte37Þ2ç—zü±âƤÇX>îxÏNkzª0nï¹ùÜŽk"	Èä–/DZÚw%†0Ÿùãzò•xÄeŒŽÂPfã]ßõ#6êÆB<@Ò©\j|R+©™¹È"Ûáo ¹¥¸
-{ÂíSnDìU£X¢‰QÄ(’ôŒö>ªm¢V”÷K†9SØQ¥Ù¾†ïKSkøŠä›ÛÕ°sAÌq‰ÁÜÎÁ-Cß%ž‰âºçUTZõÜ"WKABGÑœLåêN¶TÌ=™{TÓ4ܯ†²SÆ]½+à
-ŽÛ¼* 5þΡ¥¡'d«®{0Û˜è ó‰Ô,ª‰z gâÜ«…b_”ûÅ”#ÄWÜ嬮/˜GH¢R"?)@Tîµí™èPÜÆ]<[Ë´²3GÊôVàšÕ›ÝkG]UŠÙ½Â:j±«¤@wÇa‰©®ãík5u鵆¢´õ<þ€Åÿ{„™4òÙ?q={¼süX¾¡ÉÔÛC3j]Ç'PÒ$ÑmýšÐžÿí»µ¬ß,ÉjHõ>kE•…°éhH­zb—JUB;šr’k;ØŠDM25WT«§
-¾é¡tƒÔ?`JuxÀÔô•;µe©Ý.Poj53Ä¥*È£²ûÖ\õŽ'8s>áiÕZméd©~Yâÿüm,øÞϐL:`¦Uë·û­r¤Ý+ç mé¬w>é1>½Gaáö»p@ؐSñIîz÷=Fƒ(„‹Þ/ÕHtœ|¹cä¬èýà?õÊU¨®{*¾M=ýÛt0¢q©e~ö‡Þö2ꇞ“Ì–²1ËËB¶ÊU¾ØÈæÕY:ÏÒË4ÙëRd”…
-ølnÓˆI¼@Eüҁ@@
-endstream
-endobj
-135 0 obj <<
-/Type /Page
-/Contents 136 0 R
-/Resources 134 0 R
-/MediaBox [0 0 595.276 841.89]
-/Parent 124 0 R
->> endobj
-129 0 obj <<
+125 0 obj <<
 /Type /XObject
 /Subtype /Form
 /FormType 1
 /PTEX.FileName (TDT-defVDedgeSector.pdf)
 /PTEX.PageNumber 1
-/PTEX.InfoDict 139 0 R
+/PTEX.InfoDict 135 0 R
 /BBox [0 0 432 432]
 /Resources <<
 /ProcSet [ /PDF /Text ]
-/Font << /F2 140 0 R>>
+/Font << /F2 136 0 R>>
 /ExtGState <<
 >>>>
-/Length 141 0 R
+/Length 137 0 R
 >>
 stream
 q
@@ -967,80 +945,83 @@
 Q
 endstream
 endobj
-139 0 obj
+135 0 obj
 <<
-/CreationDate (D:20090802001254)
-/ModDate (D:20090802001254)
+/CreationDate (D:20090802104835)
+/ModDate (D:20090802104835)
 /Title (R Graphics Output)
 /Producer (R 2.9.0)
 /Creator (R)
 >>
 endobj
-140 0 obj
+136 0 obj
 <<
 /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica
-/Encoding 142 0 R
+/Encoding 138 0 R
 >>
 endobj
-141 0 obj
+137 0 obj
 9031
 endobj
-142 0 obj
+138 0 obj
 <<
 /Type /Encoding
 /BaseEncoding /WinAnsiEncoding
 /Differences [ 45/minus]
 >>
 endobj
-137 0 obj <<
-/D [135 0 R /XYZ 124.802 740.998 null]
+133 0 obj <<
+/D [131 0 R /XYZ 124.802 740.998 null]
 >> endobj
-134 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R >>
-/XObject << /Im1 129 0 R >>
+130 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R >>
+/XObject << /Im1 125 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-145 0 obj <<
-/Length 1471      
+141 0 obj <<
+/Length 1468      
 /Filter /FlateDecode
 >>
 stream
-xÚíZKoã6¾çW9ÙhÄò!QRQ/Ú"»‡bÛË{ÙhÖVb·‰ÚJ Ûÿ^ŠI$MŠ’í:{ȁ0M‘Ãy~ŽôÓäìÛwœ
-HˆXÈé`r3 4D	¦ƒsDh:˜ÌŸ†tŒñp2ÏFDgD’áb³yÌ.××ÛÅò¶^}þ#›æ£«ÉÏ‚,¤(å”Tñ  Q—ôÞ-Ö›¼\²ŠyVLWËMþ8Íkªù<»/{7ëô6Óõu>#Ø+Ñ÷"1b,*÷z3
-"ʆGdx)m)ÚJ´™h™hïE[ˆ¶-/§/ºAÙ½Óž’áo8ÂâçA4RΗ?÷bä&­aÑS³€ˆöhT´‹rEÁȘ¹ÓhÑriæ>È¥=ö£°“4„ž¤fJ#ÐÌ7B•œ¤½¹`}¸˜6Ý ” ¤ðñNŒÈ‹4`ç
-Øt
-,­€­ø-þß×ÏL[³ÁC*
-Xµl$qmrÑPQ÷‚áj¦"­ÛAP9óŸ6ë¹xùaGh›°ÍÓ=·°ë±m!iªAD­@	Kk(úTö	šIýJ6•¾¯I}Ã9ÌÏ¥ó›lÚ…)…,BãúÕNU_§Z{[7]Õ~Õ&Ëž-•€ÍZ‚ª»¼€^ºzCEî
-ÚÉõdÓÃRÙ±‚Põ¤É@~—$ja´ààߵˮ¢±Ó#ÛÖ\#ÿâáÔÕmÎëC¾ìîÓ×EÞè‡ÀW/6=ªØw’1ž‹·¢½ÞnaìC»ãÅKë‘9èj)™P©÷±î0á¸ëlOZæñ”±ÏŸj¾×ðw”VW‰>ðð›ë+ëœyÙMÜ/«·¾q@3aªwÏõ½Bõr³Ð’ܾá+ªb¯_öë×+‚YsuíhÞ÷ŠWgà†ÖÄ_åՁ‡Êe̘Èô‰eØìwWœúÌW¼B2Ò}º`Òg€J[[mâ¤Å|ÜY%ʆêQ%’Å©X-„¢$LÅörÛß-õ«QZO¨ŒüE£/rl—6ã(
-Yi‚QUÆ/r@ºŽ‰ÝgzŸÞ@ÖÔ4Qˆ“^š¦Š¦ÉW®ij×490jlqÄ™i"‹.b”zÔÌ|þL]Z¦'Òòú¤	§Ýe)QJÒƒ]–îí²
-2K›Ò—XŒOxcÈ¡MtHb”²hofÐgÇSu±~á
-2Ö‹[fqŒ#rû¿¥4L?*„Ø(¶;Ž;Û!ÇËv,ùÉÅNRLO‘µxsO54n@ÀéK&/²?+­qNú‚»b˜s÷õìhJ‚–éò´áEȉi/ÑÉA¢ïD\GÙ©;~Œ—çÆJ=ëñª$e¢w=øñIb?
-Î°§ä}CSÅAs:é¾€)JD~aM»Ïµú¹aèD2q	SÀן¢ý¢€j¸³vU"T3´mé	aæŸÞî-—WlžÒ7Jâ8ÈŒSÄidÞ¥QL8~Xh—t–žVX€iJ‹“ö kóÑ£A0;ZB²#¾Ô‘ÈŒƒÇÞZ™î|€°¹…,´‚¥G½@jÚ5°õ ™ø³^4¾†»Ž‘ÒvO»L íøµÉS÷AžZßùz1jO)ýÚV0ê¢ÇÒªyÛj²Š7Oڐ!^ªòV¹ßÜê^ÞáÓ²qÿ‹ìEsCôT$Ç}똞3ÐsRûœmšß{.'ã¾W'ñŽP0>¨xëËÙ¿¯=f
-)Ÿ§ÁQí&@_@&Hà¸ÜúcË~
-mɼU™99Kx’]¦W‰r0r´™n™ãÓMÁxœZâwW̐ XV(Y-å¨Ôƒg ø¬	XÛËō÷ý¯þºLW5GŠåÝ9Q@¢XûŽTùij²pÖée`ÀHȆ¿Šþ@µ)[/^ŠÓ¨Jú´s	OãQ‘¦ $-FÅij·“³ÿ VK‹
+xÚíZK“â6¾Ï¯ æ¬èág*l%©Ù=¤6¹,µ—ÍT…Ï@20a¦²ùï‘í¶-	=l °‡9¨²Ôêç§VÛ?¯¾}²ñóCÚßõõQŒi/Â!"4ég½O}:ðƸ?ž§¼3 q±ÙlÓ›õd·XޗëϤÓlp;þ™“Ž%!
+sª¸çQŠh•ôÞ-Ö›¬\²ŠYZLWËM¶f5Õlž>–½»õ
+z›éz’MçöŠå½H„ʽÞ¼€²þÇéßð†x[ò¶âmÆ[ÊÛ{Þ¼mxËÊéßó®Wv¤§¤ÿ0ÿy⍔3FåÏ#™À¤5,znÞ¾ãò6,WäŒL™‰-בfîS±´Ã~öc
+®§B3%hæ®Ê$¹`]¸˜6]” ¤ðñVŒ?iÀΰéXZ[wð›ÿ¬Ÿ©¶ÎgmÁC*
+Xµl$1m2l¨ˆ{Áp5SÖì… h1ó›õL¼ü°'´NØæé[èõXŽZHª*BQ+PÂRŠ.•}‚¦R¿-šÈNx¨IŽ}ý9ÌÏ
+çWÙÔS
+™‡Æô«ª¾Lµö¶vºªýÊ&Ëž-…€M-AÕÞ. —¶ÞP‘»…vv=éô°v¬ T<iRßÄ¥‰,ŒæükAP½ì"›1=ÐmJä/NmÝæº>ä˾â>]]ä||õbÓ“ŠýP0¦Ãó|ñŽ··ÀÛ=Œ}°;þI¼´™ƒ®–"b>Ö
+&µíHËž2rùSÍ÷þÎÀâÛÂê"‘Üþ~39ce­3/½‰»åcõÖ ˆ Æ¢2Låáö¹¾S¨Nnæk’ÛW |BQìõEÐ·]¿^AðxL›«kKó¾¼:7Ô&þ"¯<.cÊD&O,Ãæ°k¼àÔe¾üàÅ’ì{Ð=²( “>TÚÚIÇó…Æ*Qj0T‡*QQœŠÄB!>Šý„o_lû»¦~å£$®žW6þ"`Ñ—blŸ4Qà3e‚Ťš1ºÈëÞ#!ç5bzŸé|zYUÓØG>Ž»hš
+š&_»¦©^ÓäÈT¨±Q"¨j#6b”ºôL\.MMŠ¦çRôú¬9§Þk)ãÊ"ɱ^KöÚS«²ð%&(Œã½x÷#œÉ¡Utˆ#”°àPfÐg§Òs
+>4ëÂ*Ó¸ÄÉXýß’&TP„}½Ó˜3rºLG“›÷bzŽŒÅ™wŠaqN/˜¸Hü´¤†¤3ª†¹V|[Nö`ijL¯Pdž>?	#ÚEtr”è‡	Nm᣼ï¸VÖʏS#	ãݨõ‘Ï ý)ht…ïè
+¢€œ-
+šƒIvLPL
+	÷µ²V>5LÜ Âäàõ'o¿šê¬M5Ñ¶-ÌÜÓí>a¹¶º@Cñ”ؼª§ÁeÌS+Ú—÷IˆÒ3¢ñQᇹvI[aé™…U˜&<q‹©=èl>z:fgÒ„%(["LK^žqð‹ƒ³N£¦; pî!­€i+G•P› [Oˆ¿Èã	Üs”¤¶}Ú¥BhË/MžÛòl}ßëD©¥tk[@©‰žJ«.ìµÕco´7 C
+¼Tõãpù—½¼Åge£î—ØasAtT#G]k˜ŽSÐqVºœn’ß;.'£®W#ñ–P0:¨8kË9Ù¿•/=f)—§)ÁQíÆQ(_?ƈy±õGË~
+í‚=x£23rP<.á©è2¹B”9¡ÍpK
+ŸmrÆ£D¿ûbúE!“dÕ JPW^ àÓ&`u/7Îw¿ò«²â¸ª9,oΊ<DÒ7¤Â睕…ÓV/=F|Öÿ•÷ªMÙ"éâQœUÞ'}”K„°Až¨ 8-úùÄ«·ã«ÿ  žŠ
 endstream
 endobj
-144 0 obj <<
+140 0 obj <<
 /Type /Page
-/Contents 145 0 R
-/Resources 143 0 R
+/Contents 141 0 R
+/Resources 139 0 R
 /MediaBox [0 0 595.276 841.89]
 /Parent 124 0 R
 >> endobj
-146 0 obj <<
-/D [144 0 R /XYZ 124.802 740.998 null]
+142 0 obj <<
+/D [140 0 R /XYZ 124.802 740.998 null]
 >> endobj
 10 0 obj <<
-/D [144 0 R /XYZ 124.802 716.092 null]
+/D [140 0 R /XYZ 124.802 716.092 null]
 >> endobj
-143 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R /F68 138 0 R /F70 147 0 R /F71 148 0 R >>
+139 0 obj <<
+/Font << /F63 122 0 R /F60 121 0 R /F68 134 0 R /F70 143 0 R /F71 144 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-152 0 obj <<
+148 0 obj <<
 /Length 619       
 /Filter /FlateDecode
 >>
@@ -1050,24 +1031,24 @@
 ñqKã
 êÒºÚº{‚ï¼F˜ŸÐ;?N„MFÂj“½°ý•6q6PLkè¼è‚sáRh‰EŒêkŸ"]*-Á?e*q´ø"pÎW@ɸ¬ú®¯‘¶¢ºñëwr£\puãjJ@¿©î²ïç¾MÓY(ÙÍ «}ûÒÛOÄ;½·úã-Ø×?iNêï:©Ó¯æHvO)Wwˆoˆ×4¾'\ùžo³ŸöÎŽLp‰R¼ì:ŒÄCdPLj¼_p1JPoU­L0Þ_:[2¤È|@æcdJê–Ìw*`zŽ£ºm†³²Œl+×°›!†
 Í—t(|'¬(S›o~ÿŠHÀ€è`t˜ÔBbÄéXçG÷™p:©Ïu\‡¸Ý%™ÚOqâ“Ú†úKpÛä¾£ð·gMÙ[²ÏgÒg®øÎQå¼?í_ží9ÐÚºXåûe¿/	GÝù9Ôl×÷ñ;)è–þZONŽ«îÞísîý¹ô4ß#>ºpúdñðîª
-“Z¡ºdF‚w¢-svÖÌ cCO
+“Z¡ºdF‚w¢,svÖÌ c:O
 endstream
 endobj
-151 0 obj <<
+147 0 obj <<
 /Type /Page
-/Contents 152 0 R
-/Resources 150 0 R
+/Contents 148 0 R
+/Resources 146 0 R
 /MediaBox [0 0 595.276 841.89]
 /Parent 124 0 R
 >> endobj
-153 0 obj <<
-/D [151 0 R /XYZ 124.802 740.998 null]
+149 0 obj <<
+/D [147 0 R /XYZ 124.802 740.998 null]
 >> endobj
-150 0 obj <<
-/Font << /F71 148 0 R /F68 138 0 R /F60 121 0 R >>
+146 0 obj <<
+/Font << /F71 144 0 R /F68 134 0 R /F60 121 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-157 0 obj <<
+153 0 obj <<
 /Length 736       
 /Filter /FlateDecode
 >>
@@ -1076,30 +1057,30 @@
 FÐQ+ŒÜ¨½¹À­öòcñ 2w*‡óªL~ü9_Êðóøƒyظ~À2ãÉ|,ˆîaÑrâëŽ3¥§9uO˜úÚÅÅ÷7…vøo´o'׺A¤[¨!õ7¾šBô^EüH½~…ö'9Áh6L—D|½†kÔ“#ÎÖáŒ,%Œ0·‚qœÀö¹CâýìaFmÏñÜ…tÑu¹y<‰†ù—='«jö~Ç-ëˆji°W’¨N~ ^q˜t€åmò¬kRÓâ.5Ø{Ór5>W¥h›.nó2S;¡é¸F.D—®è¥k<>oUw÷iÜ
 µØ6Õ^i"n¢6ÞõõCQ-å}–ëØŽïkÑ‹tÄmfZŒRj¬‹"¯E*ð¨^A5
 Ü&<;Z2Š«®HzuaÜ¥GS&J}Ì۝ÒDÆyTô=(ó-¥¼LTU°lªJÖÕV™º¨ióXÀóäœw&§Fת½¤*ߘ,0Z­Ú]Ú¨­¨L¦ù¾­êT––)ô
-ï b#ìi]‡nûœôV|<ªýü­•úAÒŠTuRµ',ð©¤ø0ì½DQC_ þÚÁV’®Œðñ£ÑÍèæ«ñ¿!®1Ôd18§#'Š”¤ØrâѾ…Öyl	ïþü1iˆCw¼€omü+ˆ´ö™¦Eж3¶çÈHÙ˜+ÖZ´ùÆgãæ›áÄß¼p —ùaåÉÙäv%—X³üIökJ5V/Ÿ*ó–6±ø.˜Êß?Òá_¿Sò’
+ï b#ìi]‡nûœôV|<ªýü­•úAÒŠTuRµ',ð©¤ø0ì½DQC_ þÚÁV’®Œðñ£ÑÍèæ«ñ¿!®1Ôd18§#'Š”¤ØrâѾ…Öyl	ïþü1iˆCw¼€omü+ˆ´ö™¦Eж3¶çÈHÙ˜+ÖZ´ùÆgãæ›áÄß¼p —ùaåÉÙäv%—X³üIökJ5V/Ÿ*ó–6±ø.˜Êß;Òá_¿Jò‘
 endstream
 endobj
-156 0 obj <<
+152 0 obj <<
 /Type /Page
-/Contents 157 0 R
-/Resources 155 0 R
+/Contents 153 0 R
+/Resources 151 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 124 0 R
 >> endobj
-149 0 obj <<
+145 0 obj <<
 /Type /XObject
 /Subtype /Form
 /FormType 1
 /PTEX.FileName (TDT-shoVD4.pdf)
 /PTEX.PageNumber 1
-/PTEX.InfoDict 161 0 R
+/PTEX.InfoDict 156 0 R
 /BBox [0 0 432 432]
 /Resources <<
 /ProcSet [ /PDF /Text ]
-/Font << /F2 162 0 R>>
+/Font << /F2 157 0 R>>
 /ExtGState <<
 >>>>
-/Length 163 0 R
+/Length 158 0 R
 >>
 stream
 q
@@ -3086,49 +3067,49 @@
 Q
 endstream
 endobj
-161 0 obj
+156 0 obj
 <<
-/CreationDate (D:20090802001255)
-/ModDate (D:20090802001255)
+/CreationDate (D:20090802104837)
+/ModDate (D:20090802104837)
 /Title (R Graphics Output)
 /Producer (R 2.9.0)
 /Creator (R)
 >>
 endobj
-162 0 obj
+157 0 obj
 <<
 /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica
-/Encoding 164 0 R
+/Encoding 159 0 R
 >>
 endobj
-163 0 obj
+158 0 obj
 33588
 endobj
-164 0 obj
+159 0 obj
 <<
 /Type /Encoding
 /BaseEncoding /WinAnsiEncoding
 /Differences [ 45/minus]
 >>
 endobj
-158 0 obj <<
-/D [156 0 R /XYZ 124.802 740.998 null]
+154 0 obj <<
+/D [152 0 R /XYZ 124.802 740.998 null]
 >> endobj
-159 0 obj <<
-/D [156 0 R /XYZ 217.52 328.76 null]
+155 0 obj <<
+/D [152 0 R /XYZ 217.52 328.76 null]
 >> endobj
 14 0 obj <<
-/D [156 0 R /XYZ 124.802 290.115 null]
+/D [152 0 R /XYZ 124.802 290.115 null]
 >> endobj
-155 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R /F63 122 0 R /F71 148 0 R >>
-/XObject << /Im2 149 0 R >>
+151 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R /F63 122 0 R /F71 144 0 R >>
+/XObject << /Im2 145 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-167 0 obj <<
+162 0 obj <<
 /Length 622       
 /Filter /FlateDecode
 >>
@@ -3136,30 +3117,30 @@
 xÚÍUßoÚ0~Ï_añ*qm‡8‰´î­HÛôjÑ^º>P Œ¶Àÿý.Îe¾ü¦U5!ô	Ǿû|þî|ÇÎåD‡,â‘VšÅ?˜T#
 Åq,NØmÿýÀõ•×_dÿð H ð0ü<¦€Î}¾Èþäà.þÄs¥ä‘ïXS¯=`X¾á”uƒ;ï,k:½Â¥Ýén3;”€aCóÐ_ük>Êø‰qüÆ88~?á1gµñ¸ ewWv[œ9ɶ#ĺ0ìÎoOÎ]ÛñÕl_J) Óå#Li¶¯ëu+ãWdJÇcœßc'¸Û3)¤š‡öäÙðŠÎXô[a=&cUÌêÆR’ëÎ1ÈžõM‡÷¸ÉM²å•/®Ò22Â9Gz/-÷²ºŸqœtç˹Ž	´‚I&ý´ÕxÌSšÐŒfkçÉ\{Ú:6‹¹'N\~\{ìÃƹ_¾äæ¬.¡7¶;)FÕÆ´4Å`>ß™kg†K=l'áPñ–è´nî}¬x+ôö[öžV¼ôÒ-^óÆsF-^é5ÏR«²DÿJ×5g謱¬pÊô+Ò[v-ý¥*ê¡ñª3
 Ù¿E¤)¼3(³Ñ÷0&QnÉ
-àåKïÊ™Wˆì"ÛâJT¾¨(,¬ª¢òh¸H¸Dòažì‚ÅÔ~ÚIû‘ìê*DÜ+*÷‰¶Úª³ÒÖ^ãÛõíÔVý7m½³ÒÖ%ú­Htêõµ\Ór9ë³à#x½GgZËÔàE(ªBÀ{*è{ª#o5¼º>á('Ì_ü¿³OŸÉ
+àåKïÊ™Wˆì"ÛâJT¾¨(,¬ª¢òh¸H¸Dòažì‚ÅÔ~ÚIû‘ìê*DÜ+*÷‰¶Úª³ÒÖ^ãÛõíÔVý7m½³ÒÖ%ú­Htêõµ\Ór9ë³à#x½GgZËÔàE(ªBÀ{*è{ª#o5¼º>á('È_ü¿³FŸÈ
 endstream
 endobj
-166 0 obj <<
+161 0 obj <<
 /Type /Page
-/Contents 167 0 R
-/Resources 165 0 R
+/Contents 162 0 R
+/Resources 160 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
 >> endobj
-154 0 obj <<
+150 0 obj <<
 /Type /XObject
 /Subtype /Form
 /FormType 1
 /PTEX.FileName (TDT-shoVE1.pdf)
 /PTEX.PageNumber 1
-/PTEX.InfoDict 169 0 R
+/PTEX.InfoDict 165 0 R
 /BBox [0 0 432 432]
 /Resources <<
 /ProcSet [ /PDF /Text ]
-/Font << /F2 170 0 R>>
+/Font << /F2 166 0 R>>
 /ExtGState <<
 >>>>
-/Length 171 0 R
+/Length 167 0 R
 >>
 stream
 q
@@ -3731,43 +3712,43 @@
 Q
 endstream
 endobj
-169 0 obj
+165 0 obj
 <<
-/CreationDate (D:20090802001258)
-/ModDate (D:20090802001258)
+/CreationDate (D:20090802104839)
+/ModDate (D:20090802104839)
 /Title (R Graphics Output)
 /Producer (R 2.9.0)
 /Creator (R)
 >>
 endobj
-170 0 obj
+166 0 obj
 <<
 /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica
-/Encoding 172 0 R
+/Encoding 168 0 R
 >>
 endobj
-171 0 obj
+167 0 obj
 9715
 endobj
-172 0 obj
+168 0 obj
 <<
 /Type /Encoding
 /BaseEncoding /WinAnsiEncoding
 /Differences [ 45/minus]
 >>
 endobj
-168 0 obj <<
-/D [166 0 R /XYZ 124.802 740.998 null]
+163 0 obj <<
+/D [161 0 R /XYZ 124.802 740.998 null]
 >> endobj
-165 0 obj <<
-/Font << /F68 138 0 R /F60 121 0 R >>
-/XObject << /Im3 154 0 R >>
+160 0 obj <<
+/Font << /F68 134 0 R /F60 121 0 R >>
+/XObject << /Im3 150 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-176 0 obj <<
+172 0 obj <<
 /Length 781       
 /Filter /FlateDecode
 >>
@@ -3778,30 +3759,30 @@
 ¡\¡ÖwâSû<þ„r(Å‘ïK‡ï¥ZÌUN$û–³ŽdO9{Ìéˆr:4d‰ZlÏZ•H
 ¤2¡bGÆéˆSΩÒÛqZrÚpZÈð	¨ž¨tÛñ±&¾F¥ÐUâÏà`-Öu¤n at R€ö\¹·"+ûL°:YÉ:€ÃÙ¬ˆ²<±:Ôr_S֏«ûOqíÀ¡ÓÝàoàê½$®n?®Þÿ‚«÷§¸®˜«ÜAx+@'…÷:Ôß@ÐÓ<Î&T¢•ÿTº?}ħ²nÆcwBœ‰W˜²{õ©xÜC)4ÊFèw at _€7ðD`¼AMl¥¨„Ê(i¡˜JÕ¥Šó
 4Ð(LûŽá‡Zoà©Ö†cÕ÷¿D¬¦}c{Mæ!¸Uyä,ä÷jd4äÊ\7n*#Ë^Ÿ¥…yŽÚü’®à¹æt
-t«xÞ*«5F,?q[¢XªŽk?«ÕÁI¸ ~Bw†÷[H3éŒGoª³†àV[{Â^ýp»êy)ÜÃzñH‡­=<ÛÚ—Vyg{Mþè€ë鵶U}¼Oa½„®®Ç^®5V×…€9ðÚ©ÈÕÞôhj(3³Â™PÔónÊ›‰`|KUì%8)Aeðêñ­m΄–Ý­4w—Ú`y«æ*±yi«‹"Öš©Ð’|æ]8:ŽG”‡IEԏ0¸üéa7pQ²ÝŽÜÀ÷„ŠÎa½?®=t”¾ò_-rj«Žfv*þÉýŸÌ$äZ!¢.ÞpÍ–‹2ç_,Ì'{m;.%Ö‡lSló2Ù.7)‰m×·–EQΏrž½oíQvùcžlùr•gkÉI~±M®E…(õqFÈñ&d"G54¿ L*àB
+t«xÞ*«5F,?q[¢XªŽk?«ÕÁI¸ ~Bw†÷[H3éŒGoª³†àV[{Â^ýp»êy)ÜÃzñH‡­=<ÛÚ—Vyg{Mþè€ë鵶U}¼Oa½„®®Ç^®5V×…€9ðÚ©ÈÕÞôhj(3³Â™PÔónÊ›‰`|KUì%8)Aeðêñ­m΄–Ý­4w—Ú`y«æ*±yi«‹"Öš©Ð’|æ]8:ŽG”‡IEԏ0¸üéa7pQ²ÝŽÜÀ÷„ŠÎa½?®=t”¾ò_-rj«Žfv*þÉýŸÌ$äZ!¢.ÞpÍ–‹2ç_,Ì'{m;.%Ö‡lSló2Ù.7)‰m×·–EQΏrž½oíQvùcžlùr•gkÉI~±M®E…(õqFÈñ&d"‡54¿ L!àA
 endstream
 endobj
-175 0 obj <<
+171 0 obj <<
 /Type /Page
-/Contents 176 0 R
-/Resources 174 0 R
+/Contents 172 0 R
+/Resources 170 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
 >> endobj
-173 0 obj <<
+169 0 obj <<
 /Type /XObject
 /Subtype /Form
 /FormType 1
 /PTEX.FileName (TDT-shoVE4.pdf)
 /PTEX.PageNumber 1
-/PTEX.InfoDict 179 0 R
+/PTEX.InfoDict 175 0 R
 /BBox [0 0 432 432]
 /Resources <<
 /ProcSet [ /PDF /Text ]
-/Font << /F2 180 0 R>>
+/Font << /F2 176 0 R>>
 /ExtGState <<
 >>>>
-/Length 181 0 R
+/Length 177 0 R
 >>
 stream
 q
@@ -4798,81 +4779,78 @@
 Q
 endstream
 endobj
-179 0 obj
+175 0 obj
 <<
-/CreationDate (D:20090802001321)
-/ModDate (D:20090802001321)
+/CreationDate (D:20090802104902)
+/ModDate (D:20090802104902)
 /Title (R Graphics Output)
 /Producer (R 2.9.0)
 /Creator (R)
 >>
 endobj
-180 0 obj
+176 0 obj
 <<
 /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica
-/Encoding 182 0 R
+/Encoding 178 0 R
 >>
 endobj
-181 0 obj
+177 0 obj
 16438
 endobj
-182 0 obj
+178 0 obj
 <<
 /Type /Encoding
 /BaseEncoding /WinAnsiEncoding
 /Differences [ 45/minus]
 >>
 endobj
-177 0 obj <<
-/D [175 0 R /XYZ 124.802 740.998 null]
+173 0 obj <<
+/D [171 0 R /XYZ 124.802 740.998 null]
 >> endobj
-178 0 obj <<
-/D [175 0 R /XYZ 217.52 144.4 null]
+174 0 obj <<
+/D [171 0 R /XYZ 217.52 144.4 null]
 >> endobj
-174 0 obj <<
-/Font << /F68 138 0 R /F71 148 0 R /F60 121 0 R >>
-/XObject << /Im4 173 0 R >>
+170 0 obj <<
+/Font << /F68 134 0 R /F71 144 0 R /F60 121 0 R >>
+/XObject << /Im4 169 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-185 0 obj <<
+181 0 obj <<
 /Length 936       
 /Filter /FlateDecode
 >>
 stream
-xÚíXßoÓ0~ß_í©•–Ì¿ˆ1ihLB¢“€‡ªÍJÇH«%&ñÇãØ—ØIìv­ØxááäKs>w÷ùb÷ÅäàøBг„2A¢Éu„	KRD"‰D‚IMæѧÇ!4zUÜä³jY,Æ1áh´^-‹ª4ú´˜%Ÿ/òrüeòZyFQ–d‚ˆÚ1ŠbB"¤qùqœ*[3¥ÊËÊhKïÆYÚu†ÕáÆÙé8æ„ŽÖc<bF=QjlÔïJ*©”Ü)Y*ù¥ä3âH
-3«J%GfR¬TbÞ`ûkö+%·æ§çfhmV'ƒ‰?•€©Æ–+)-xëÇrènXëR½?÷fc	«ßÀÊ3ÈÌ{@×¼¯,¢9$n
-à“E'Í’ª&.`wˆÝ‰MLu
-ƒŽA':ÎNþs at 1ì:íd1œ§D™ü d·àlîð%‡ üá·²é¶+_HÜ£¿Z§fýË
-‹öò;5Ö*¬ô£V©JÀ_¿’€Ì!‘&¹Þ½æ"0l+ÉT]¥3íà¯4´‹J?ÆLb®õ{(~n‹½ö°²4¯g^álm˜ùÒTèèêêÇ
-$—.Ñ\ªm‡¹lˆØÒ‰tïüCoC­4¦˜bF5ùÏÀk«)áªÍ¡Œ¼
-í	±ðð?€çËy¬ìi( !/4á‡FA§~húëÆdÛ‡€¦YÇTÙº;öv¦ä~3ρ´QOU]l´SÕ½°‘}±¹Œcž’’Á§öqKê@cÞ„…ÆþæfØ 
-óDÜÅwe½Ò°t×ñYºUmFb1i
-ÌHÔj-SΣ1îQ§¶%'ˆôð^C3µÓ¡ym±Î•ÎNSA7´X<z66Ý&ÜH<ø1×+d4•f›Â]Ô“räxgBâ
-;Âzgs‹ßvÜ"@PDo|¶—Yþ~âñ~µ¬¿•ß”¼uNÍqçβ"ì;\=°Ù5K,`ãgSkFÕDv.¡=.i}&geÊ3çy3ýZc<0²I#¯ñ°ð­1
-±d‡:>ÌT·5”0æiVS8?6Öõ™±ßš³¤½™B¥ÊžÝPL¿ô@P	)Æ[[ÉN]õSÕÀ²»ÇÃ÷¿§j4ÉN[úA‡óµ9¼í}ŽÁQïrûäa¾í"ÌŸò"ì^óö¾æ†8¼÷5—ÿ¿æ>Ù5·ó"I%‹bÊŽá-¬»ûÁËÉÁ×u#Ã
+xÚíXÝoÓ0ß_ñÔJKæï$bL“@€¨Æ$à¡j³Ò1Òi©øøã¹Ø—ØIìv­ØxááäKs>ÿîîç‹Ý瓃£sÅ#*.‹&We"É‹R¢Êòh2>Žø8¦„ÑËòº˜­—åb3IF·«e¹®Œ>-çF)æ‹¢ž¼Ï$Ê“\1U;&QÌXÂTj\~g`k¦¬‹jm´¥wã,ë:£ðĤqv2Ž%ã£Û1	£ƒõ¨S5ÈÈä'È'"	3«¦ ‡fR*3o¨ýµDûȍùé™Z[ÀªÑÑ$—]tw8ñH‰˜jlHeA˜ Ð[?–'ŽÁ“
+k]Àû3o6–¸ú5®<Ã̼CtÍûµE4ÇÄM|c²èd YSUàÄ®ó¶±;±‰©NáoÔ)êLÇÙɁ(†€]§,†ó”€ÉwDvƒÎæ_
+Ê~›!›n»âÑyJ{ô‡õifÖ¿Ø°h/¿S3l©ÂJ?j•›¡BükäW9&Ò$×»×\ä†
+c4I¡«t¦]!ü•æ€v±Ö±H©Ôú/,~a‹}ëaee^Ï0¼ÒÙÚ8ó¦©ÔÑÕՏH.\¢¹„mGeÚ±¥ëÞ'øûÞ†ZiL1§‚kòŸ¢×W=‘ÐæH.G^Š†ö„YxôÀóe=Tö4ÐˆšòCã¨s?4ýuiÛk‡€¦YÇ\©´uwŒííä3ρ´qOU]l¼SÕ½°±}±¹Œž’²Á§öaKê@Þ„…&þæfØ ÊD)ÚÅwi½Ô°t×ñYºUmFb1k
+ÌÈÔj-SΣ1HÝ£NmËMëá½Âf:k¦CóÚR+/šeŠoh±tôtlºM¸‘xðS4®WÈy–n˜mVwQOʉã]¨”nØÖ»œ[Üø¶#Á"zã³½Ì"ð÷÷3¬eý­ü
+òÆ9u4ǝ;ËŠ°ïpõxÀf×,‰€ŸMu¬9‡HÚ
+¸Âö¸0¤õ™8œM3™;Ï›é×ӁñMÚ˜x‡…oIˆ%;Ôñ~¦º­‘DO³šâù±±®ÏŒý¦Ðœ%íåÈÈ+Uõì†bú¥$De”nm%;mtè§ÐÀò»Çý÷¿§j<ÉN[ú^‡ó[sxÛû"#‚ÃÞåöÑ/ÂrÛEX>æEؽæí}Í
+qxïk®üÍ}´knç-ªò„+Å\&’âÿZymxðbrð´#™
 endstream
 endobj
-184 0 obj <<
+180 0 obj <<
 /Type /Page
-/Contents 185 0 R
-/Resources 183 0 R
+/Contents 181 0 R
+/Resources 179 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
 >> endobj
-186 0 obj <<
-/D [184 0 R /XYZ 124.802 740.998 null]
+182 0 obj <<
+/D [180 0 R /XYZ 124.802 740.998 null]
 >> endobj
 18 0 obj <<
-/D [184 0 R /XYZ 124.802 716.092 null]
+/D [180 0 R /XYZ 124.802 716.092 null]
 >> endobj
-183 0 obj <<
-/Font << /F63 122 0 R /F60 121 0 R /F68 138 0 R /F71 148 0 R >>
+179 0 obj <<
+/Font << /F63 122 0 R /F60 121 0 R /F68 134 0 R /F71 144 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-190 0 obj <<
+186 0 obj <<
 /Length 633       
 /Filter /FlateDecode
 >>
@@ -4881,55 +4859,61 @@
 Û¿qÚŸø÷°MØ^xd\¾'¿¹á·–Õ×î}Q+`ÖÈ¢`­ÖRï\8û‡Ž¡ªA[À}ï1lûáµ^âÝKg·8þŒÏò¹óœj	J–ŸÜø
 z­ñ¦WÎtUÞj7ïIò}zÐÛR	=ˆôÄÉô<…Ô8IÍÐÔ$Ž%M­_æÊf¹}H2¼
 –Æ؝»·8Bù×Â<6Id5å&Y}7ñTn©â‘ÒDqê%RšPSDØRjê9‹aµTmš¨ÓDmú¥ê4)MÔiJO?g¡šÃÞÄÝx¾)RÈ´&¶O‘×òž2_þî:qÎó* ψ|Üw9 +yÃ8WCïkü.,vµìÃ@bÁ«Ò+ZÙØ*„ò|´6”AدG…5léD, Á}m(àòÀéÈ€þžÞyôߏîMÑ;Ý †ï7‰A`‘y¿øU‰èÎN¨ãsÝÿ,øáì#ÎÐV¡®¶êÉûÎgOf0S£¤2˜©jÒƒh·Òý ³Ãoðcv„OAÝÛF·Éü°Dw`ȁù̏Q;0ßSÒô\?êÛ(gJÍqîGD3gãÆÂÐØÀ¢Í1S›nßB&(ôÕb =¹M*U‘¹ôXz|!.u
-Ý4 §µ…³+ÃGMëZ½Ð–q‰úÿÒ³wÝì?ŸG³Ò
+Ý4 §µ…³+ÃGMëZ½Ð–q‰ú/ÁÙ»nöŸ>³Ñ
 endstream
 endobj
-189 0 obj <<
+185 0 obj <<
 /Type /Page
-/Contents 190 0 R
-/Resources 188 0 R
+/Contents 186 0 R
+/Resources 184 0 R
 /MediaBox [0 0 595.276 841.89]
-/Parent 160 0 R
+/Parent 164 0 R
 >> endobj
-191 0 obj <<
-/D [189 0 R /XYZ 124.802 740.998 null]
+187 0 obj <<
+/D [185 0 R /XYZ 124.802 740.998 null]
 >> endobj
-188 0 obj <<
-/Font << /F71 148 0 R /F60 121 0 R >>
+184 0 obj <<
+/Font << /F71 144 0 R /F60 121 0 R >>
 /ProcSet [ /PDF /Text ]
 >> endobj
-194 0 obj <<
-/Length 922       
+190 0 obj <<
+/Length 921       
 /Filter /FlateDecode
 >>
 stream
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/vennerable -r 39


More information about the Vennerable-commits mailing list