[Vennerable-commits] r57 - in pkg/Vennerable: R inst/doc tests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Sep 18 19:14:10 CEST 2009
Author: js229
Date: 2009-09-18 19:14:09 +0200 (Fri, 18 Sep 2009)
New Revision: 57
Modified:
pkg/Vennerable/R/02TissueDrawing.R
pkg/Vennerable/inst/doc/Venn.pdf
pkg/Vennerable/inst/doc/VennDrawingTest.Rnw
pkg/Vennerable/inst/doc/VennDrawingTest.pdf
pkg/Vennerable/tests/bug0649no10.R
Log:
fix bug 649
Modified: pkg/Vennerable/R/02TissueDrawing.R
===================================================================
--- pkg/Vennerable/R/02TissueDrawing.R 2009-09-16 23:08:45 UTC (rev 56)
+++ pkg/Vennerable/R/02TissueDrawing.R 2009-09-18 17:14:09 UTC (rev 57)
@@ -380,10 +380,12 @@
sector.to.xy <- function(edge,dx=.05) {
r <- edge at radius;
hand <- edge at hand
- if (edge at from==edge at to ) {
- if (hand>0) { thetafrom <- 2*pi; thetato <- 0 } else { thetafrom <- 0; thetato <- 2*pi}
- thetadist <- 2 * pi
- } else {
+# if (edge at from==edge at to ) {
+# (if (thetafrom - thetato
+# thetato <- theta
+# if (hand>0) { thetafrom <- 2*pi; thetato <- 0 } else { thetafrom <- 0; thetato <- 2*pi}
+# thetadist <- 2 * pi
+# } else {
thetafrom <- edge at fromTheta;thetato <- edge at toTheta
# if hand > 0 we always go anti-clockwise, decreasing thetafrom
# so thetato must be less than thetafrom
@@ -395,7 +397,7 @@
if (thetato<thetafrom) { thetato <- thetato + 2* pi }
thetadist <- thetato - thetafrom
}
- }
+# }
arclength <- (thetadist) * r
nintervals <- arclength/dx
theta <- seq(from=thetafrom,to=thetato,length=nintervals)
Modified: pkg/Vennerable/inst/doc/Venn.pdf
===================================================================
--- pkg/Vennerable/inst/doc/Venn.pdf 2009-09-16 23:08:45 UTC (rev 56)
+++ pkg/Vennerable/inst/doc/Venn.pdf 2009-09-18 17:14:09 UTC (rev 57)
@@ -1334,8 +1334,8 @@
endobj
135 0 obj
<<
-/CreationDate (D:20090916235549)
-/ModDate (D:20090916235549)
+/CreationDate (D:20090917152213)
+/ModDate (D:20090917152213)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -2336,8 +2336,8 @@
endobj
192 0 obj
<<
-/CreationDate (D:20090916235600)
-/ModDate (D:20090916235600)
+/CreationDate (D:20090917152222)
+/ModDate (D:20090917152222)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -3861,8 +3861,8 @@
endobj
201 0 obj
<<
-/CreationDate (D:20090916235603)
-/ModDate (D:20090916235603)
+/CreationDate (D:20090917152224)
+/ModDate (D:20090917152224)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -22288,8 +22288,8 @@
endobj
222 0 obj
<<
-/CreationDate (D:20090916235609)
-/ModDate (D:20090916235609)
+/CreationDate (D:20090917152227)
+/ModDate (D:20090917152227)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -29654,8 +29654,8 @@
endobj
232 0 obj
<<
-/CreationDate (D:20090916235614)
-/ModDate (D:20090916235614)
+/CreationDate (D:20090917152231)
+/ModDate (D:20090917152231)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -48006,8 +48006,8 @@
endobj
241 0 obj
<<
-/CreationDate (D:20090916235617)
-/ModDate (D:20090916235617)
+/CreationDate (D:20090917152234)
+/ModDate (D:20090917152234)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -48701,8 +48701,8 @@
endobj
255 0 obj
<<
-/CreationDate (D:20090916235621)
-/ModDate (D:20090916235621)
+/CreationDate (D:20090917152236)
+/ModDate (D:20090917152236)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -50071,8 +50071,8 @@
endobj
269 0 obj
<<
-/CreationDate (D:20090916235632)
-/ModDate (D:20090916235632)
+/CreationDate (D:20090917152243)
+/ModDate (D:20090917152243)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -55407,8 +55407,8 @@
endobj
287 0 obj
<<
-/CreationDate (D:20090916235658)
-/ModDate (D:20090916235658)
+/CreationDate (D:20090917152301)
+/ModDate (D:20090917152301)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -56398,8 +56398,8 @@
endobj
299 0 obj
<<
-/CreationDate (D:20090916235729)
-/ModDate (D:20090916235729)
+/CreationDate (D:20090917152327)
+/ModDate (D:20090917152327)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -66951,8 +66951,8 @@
endobj
310 0 obj
<<
-/CreationDate (D:20090916235822)
-/ModDate (D:20090916235822)
+/CreationDate (D:20090917152409)
+/ModDate (D:20090917152409)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -74524,8 +74524,8 @@
endobj
317 0 obj
<<
-/CreationDate (D:20090916235930)
-/ModDate (D:20090916235930)
+/CreationDate (D:20090917152518)
+/ModDate (D:20090917152518)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -81291,8 +81291,8 @@
endobj
327 0 obj
<<
-/CreationDate (D:20090917000005)
-/ModDate (D:20090917000005)
+/CreationDate (D:20090917152556)
+/ModDate (D:20090917152556)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -81464,8 +81464,8 @@
endobj
336 0 obj
<<
-/CreationDate (D:20090917000007)
-/ModDate (D:20090917000007)
+/CreationDate (D:20090917152558)
+/ModDate (D:20090917152558)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -104968,8 +104968,8 @@
endobj
348 0 obj
<<
-/CreationDate (D:20090917000010)
-/ModDate (D:20090917000010)
+/CreationDate (D:20090917152602)
+/ModDate (D:20090917152602)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -105222,8 +105222,8 @@
endobj
365 0 obj
<<
-/CreationDate (D:20090917000015)
-/ModDate (D:20090917000015)
+/CreationDate (D:20090917152608)
+/ModDate (D:20090917152608)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -105470,8 +105470,8 @@
endobj
374 0 obj
<<
-/CreationDate (D:20090917000017)
-/ModDate (D:20090917000017)
+/CreationDate (D:20090917152611)
+/ModDate (D:20090917152611)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -105676,8 +105676,8 @@
endobj
384 0 obj
<<
-/CreationDate (D:20090917000019)
-/ModDate (D:20090917000019)
+/CreationDate (D:20090917152614)
+/ModDate (D:20090917152614)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -105930,8 +105930,8 @@
endobj
397 0 obj
<<
-/CreationDate (D:20090917000023)
-/ModDate (D:20090917000023)
+/CreationDate (D:20090917152618)
+/ModDate (D:20090917152618)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -106425,8 +106425,8 @@
endobj
407 0 obj
<<
-/CreationDate (D:20090917000030)
-/ModDate (D:20090917000030)
+/CreationDate (D:20090917152626)
+/ModDate (D:20090917152626)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -106932,8 +106932,8 @@
endobj
416 0 obj
<<
-/CreationDate (D:20090917000043)
-/ModDate (D:20090917000043)
+/CreationDate (D:20090917152642)
+/ModDate (D:20090917152642)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -108584,8 +108584,8 @@
endobj
428 0 obj
<<
-/CreationDate (D:20090917000053)
-/ModDate (D:20090917000053)
+/CreationDate (D:20090917152655)
+/ModDate (D:20090917152655)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -109735,8 +109735,8 @@
endobj
438 0 obj
<<
-/CreationDate (D:20090917000057)
-/ModDate (D:20090917000057)
+/CreationDate (D:20090917152659)
+/ModDate (D:20090917152659)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -109994,8 +109994,8 @@
endobj
447 0 obj
<<
-/CreationDate (D:20090917000100)
-/ModDate (D:20090917000100)
+/CreationDate (D:20090917152703)
+/ModDate (D:20090917152703)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -110216,8 +110216,8 @@
endobj
451 0 obj
<<
-/CreationDate (D:20090917000104)
-/ModDate (D:20090917000104)
+/CreationDate (D:20090917152707)
+/ModDate (D:20090917152707)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -112264,8 +112264,8 @@
endobj
462 0 obj
<<
-/CreationDate (D:20090917000110)
-/ModDate (D:20090917000110)
+/CreationDate (D:20090917152716)
+/ModDate (D:20090917152716)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -112928,8 +112928,8 @@
endobj
471 0 obj
<<
-/CreationDate (D:20090917000116)
-/ModDate (D:20090917000116)
+/CreationDate (D:20090917152723)
+/ModDate (D:20090917152723)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -113239,8 +113239,8 @@
endobj
482 0 obj
<<
-/CreationDate (D:20090917000119)
-/ModDate (D:20090917000119)
+/CreationDate (D:20090917152728)
+/ModDate (D:20090917152728)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -113537,8 +113537,8 @@
endobj
492 0 obj
<<
-/CreationDate (D:20090917000123)
-/ModDate (D:20090917000123)
+/CreationDate (D:20090917152733)
+/ModDate (D:20090917152733)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -113916,8 +113916,8 @@
endobj
503 0 obj
<<
-/CreationDate (D:20090917000129)
-/ModDate (D:20090917000129)
+/CreationDate (D:20090917152741)
+/ModDate (D:20090917152741)
/Title (R Graphics Output)
/Producer (R 2.9.0)
/Creator (R)
@@ -115349,8 +115349,8 @@
>> endobj
568 0 obj <<
/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.3)/Keywords()
-/CreationDate (D:20090917000143+01'00')
-/ModDate (D:20090917000143+01'00')
+/CreationDate (D:20090917152810+01'00')
+/ModDate (D:20090917152810+01'00')
/Trapped /False
/PTEX.Fullbanner (This is MiKTeX-pdfTeX 2.6.2693 (1.40.3))
>> endobj
@@ -115929,7 +115929,7 @@
<< /Size 569
/Root 567 0 R
/Info 568 0 R
-/ID [<221CACB2DDB50BA5B3E071D9D8C71FC3> <221CACB2DDB50BA5B3E071D9D8C71FC3>] >>
+/ID [<0BA572EDFE3388B800737A49020F246C> <0BA572EDFE3388B800737A49020F246C>] >>
startxref
1989120
%%EOF
Modified: pkg/Vennerable/inst/doc/VennDrawingTest.Rnw
===================================================================
--- pkg/Vennerable/inst/doc/VennDrawingTest.Rnw 2009-09-16 23:08:45 UTC (rev 56)
+++ pkg/Vennerable/inst/doc/VennDrawingTest.Rnw 2009-09-18 17:14:09 UTC (rev 57)
@@ -285,9 +285,9 @@
grid.text(label=txt)
popViewport()
pushViewport(viewport(layout.pos.row=1))
- PlotVennGeometry(C2,show=list(
+ PlotVennGeometry(C2,show=list(
Sets=!doFaces,
- SetLabels=FALSE,dark.matter=FALSE,Faces=doFaces))
+ SetLabels=FALSE,DarkMatter=FALSE,Faces=doFaces))
downViewport("Vennvp")
PlotNodes(C2)
UpViewports()
@@ -350,7 +350,7 @@
\begin{figure}[H]\begin{center}
<<p2no10threef,fig=TRUE>>=
p2four (V2.no10,doFaces=TRUE)
-C2 <- compute.C2(V=V2.no10, doWeights = FALSE, doEuler = TRUE)
+#C2 <- compute.C2(V=V2.no10, doWeights = FALSE, doEuler = TRUE)
@
\caption{As before for a different set of weights}
\end{center}\end{figure}
Modified: pkg/Vennerable/inst/doc/VennDrawingTest.pdf
===================================================================
(Binary files differ)
Modified: pkg/Vennerable/tests/bug0649no10.R
===================================================================
--- pkg/Vennerable/tests/bug0649no10.R 2009-09-16 23:08:45 UTC (rev 56)
+++ pkg/Vennerable/tests/bug0649no10.R 2009-09-18 17:14:09 UTC (rev 57)
@@ -8,6 +8,7 @@
#debug(joinEdgesInDrawing)
C2 <- compute.Venn(V2.no10,doWeights=FALSE,doEuler=TRUE,type="circles")
+plot(C2)
V2.no01 <- V2
Weights(V2.no01)["01"] <- 0
More information about the Vennerable-commits
mailing list