[Vennerable-commits] r77 - in pkg/Vennerable: . R man

[noreply at r-forge.r-project.org]

Author: js229
Date: 2011-05-25 23:06:43 +0200 (Wed, 25 May 2011)
New Revision: 77

Modified:
   pkg/Vennerable/DESCRIPTION
   pkg/Vennerable/R/00Venn.R
   pkg/Vennerable/R/Euler.R
   pkg/Vennerable/man/Vennerable-internal.Rd
Log:
Fix switch bug that stopped Vennerable working from R 2.10 onwards

Modified: pkg/Vennerable/DESCRIPTION
===================================================================
--- pkg/Vennerable/DESCRIPTION	2011-05-25 16:39:37 UTC (rev 76)
+++ pkg/Vennerable/DESCRIPTION	2011-05-25 21:06:43 UTC (rev 77)
@@ -1,9 +1,9 @@
 Package: Vennerable
 Title: Venn and Euler area-proportional diagrams
-Version: 2.0 
+Version: 2.1 
 Author: Jonathan Swinton
 Description: A package for drawing various species of Venn diagrams.
 Maintainer: Jonathan Swinton <jonathan at swintons.net>
 LazyLoad: yes
-Depends: graph, RBGL, grid, lattice, RColorBrewer, reshape, methods
+Depends: graph, RBGL, grid, lattice, RColorBrewer, reshape, methods, gtools, xtable
 License: GPL

Modified: pkg/Vennerable/R/00Venn.R
===================================================================
--- pkg/Vennerable/R/00Venn.R	2011-05-25 16:39:37 UTC (rev 76)
+++ pkg/Vennerable/R/00Venn.R	2011-05-25 21:06:43 UTC (rev 77)
@@ -179,23 +179,23 @@
 		}
 	}        
 	C3 <-switch(type,
-		AWFE=,AWFEscale=,battle=,cog=,compute.AWFE(V,type=type),
+		AWFE=,AWFEscale=,battle=,cog=compute.AWFE(V,type=type),
 		ChowRuskey=,compute.CR(V,doWeights),
-		circles=,
+		circles=
 			if (nSets==2) { compute.C2(V,doWeights,doEuler) 
 			}else if (nSets==3) {compute.C3(V,doWeights)
 			} else { stop(sprintf("Type %s not implemented for %d sets",type,nSets))
 			} ,
-		squares=,
+		squares=
 		  	if (nSets==2) { compute.S2(V,doWeights,doEuler) 
 			}else if (nSets==3) {compute.S3(V,doWeights)
 			}else if (nSets==4) {compute.S4(V,doWeights)
 		} else { stop(sprintf("Type %s not implemented for %d sets",type,nSets))
 			} ,
-		triangles=, if (nSets==3) { compute.T3(V,doWeights) 
+		triangles= if (nSets==3) { compute.T3(V,doWeights) 
 			} else { stop(sprintf("Type %s not implemented for %d sets",type,nSets))
 			} ,
-		ellipses=, if (nSets==4) { compute.E4(V,doWeights) 
+		ellipses= if (nSets==4) { compute.E4(V,doWeights) 
 			} else { stop(sprintf("Type %s not implemented for %d sets",type,nSets))
 			} 
 	)	

Modified: pkg/Vennerable/R/Euler.R
===================================================================
--- pkg/Vennerable/R/Euler.R	2011-05-25 16:39:37 UTC (rev 76)
+++ pkg/Vennerable/R/Euler.R	2011-05-25 21:06:43 UTC (rev 77)
@@ -12,7 +12,9 @@
 	V <- Venn(numberOfSets=numberOfSets)
 	vs <- data.frame(Indicator(V))
 	vs$Signature <- apply(data.matrix(vs),1,paste,collapse="")
-	vs <- subset(vs,Signature!=dark.matter.signature(V))
+	#vs <- subset(vs,Signature!=dark.matter.signature(V)) # causes note in RCMD check
+	vs <- vs[vs$Signature!=dark.matter.signature(V),]
+	
 	E2 <- Euler.from.Signature (vs$Signature)
 	E2 <- E2[order(E2$ESignature),]
 

Modified: pkg/Vennerable/man/Vennerable-internal.Rd
===================================================================
--- pkg/Vennerable/man/Vennerable-internal.Rd	2011-05-25 16:39:37 UTC (rev 76)
+++ pkg/Vennerable/man/Vennerable-internal.Rd	2011-05-25 21:06:43 UTC (rev 77)
@@ -142,8 +142,10 @@
 \alias{VisibleRange}
 \alias{zeropos}
 \alias{zerotheta}
+\alias{EulerClasses}
+\alias{Euler.from.Signature}
 \title{
-Internal functions for Vennerable, plus the ones I haven't documented yet
+Internal functions for Vennerable, plus some user-visible ones I haven't documented yet
 }
 \description{
 As well as a number of internal helper functions, Vennerable includes code for doing polygon-polygon clipping in some (buggy) generality which may be documented if there is demand.