version 1.1-0

sanjayparekh-hmcts · Oct 28, 2009 · 6387c14 · 6387c14
1 parent 9f12c47
commit 6387c14
Show file tree

Hide file tree

Showing 6 changed files with 608 additions and 557 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,13 @@
 Package: venneuler
-Version: 1.0-4
+Version: 1.1-0
 Title: Venn and Euler Diagrams
 Author: Lee Wilkinson <[email protected]>
 Maintainer: Simon Urbanek <[email protected]>
 Depends: rJava
 Description: Calculates and displays Venn and Euler Diagrams
+SystemRequirement: Java 1.5 or higher
 License: MPL-1.1
 URL: http://www.rforge.net/venneuler/,
         http://www.cs.uic.edu/~wilkinson/
 Repository: CRAN
-Date/Publication: 2010-12-21 17:06:44
+Date/Publication: 2011-08-10 05:50:44
diff --git a/MD5 b/MD5
@@ -0,0 +1,17 @@
+0fc17697f02622afdfea287139f8c0eb *DESCRIPTION
+b409cf4a5659c034c5ac6c839f1aa5ea *NAMESPACE
+bae6110882904bb3b4f721487ffbe502 *NEWS
+835ebee0928f0238592697865180c8aa *R/venneuler.R
+17422a3bc93df08d04e2d18380998896 *R/zzz.R
+5813693cbb492402f55c4217de3f8a35 *inst/java/venneuler.jar
+eb0ddf17f17153577e06345e679d34f6 *man/venneuler.Rd
+dd6d391d407d89bc5ee31d5663b6e826 *src-java/Makefile
+fd2aeb47bd5506d5263e81b7dcde5aed *src-java/edu/uic/ncdm/venn/Eigen.java
+91589e5b07228982ef89c7233f3477ba *src-java/edu/uic/ncdm/venn/Venn.java
+38579266d4ca455bac8c43e172132d07 *src-java/edu/uic/ncdm/venn/VennAnalytic.java
+a9e2e35d6bd461437ab1d34794d57c04 *src-java/edu/uic/ncdm/venn/VennDiagram.java
+1542d2e0c6e3ef73acb1f60af38575d3 *src-java/edu/uic/ncdm/venn/data/FilePicker.java
+72e3f0725664298ca723649f89ac00c3 *src-java/edu/uic/ncdm/venn/data/FileReader.java
+c737dab157a9eda33302f6aa512d3ad0 *src-java/edu/uic/ncdm/venn/data/VennData.java
+d2c94af240a4afa508688eadbaa96169 *src-java/edu/uic/ncdm/venn/display/VennCanvas.java
+94fbf40cb92f44ca6deebae2a7542f8f *src-java/edu/uic/ncdm/venn/display/VennFrame.java
diff --git a/NEWS b/NEWS
@@ -1,5 +1,16 @@
- NEWS/ChangeLog for scagnostics
---------------------------------
+ NEWS/ChangeLog for venneuler
+------------------------------
+
+1.1-0	2011-08-09
+    o	improvements to speed and better solutions in cases where
+	there are large differences in sizes of the circles
+
+    o	Java code has been updated to use generics and thus requires
+	Java 1.5 or higher (use 1.0 series with Java 1.4)
+
+
+1.0-5	2011-05-04
+    o	bugfix
 
 1.0-4	2010-12-20
     o	improved metric to address some extreme cases

diff --git a/inst/java/venneuler.jar b/inst/java/venneuler.jar
diff --git a/src-java/Makefile b/src-java/Makefile
@@ -1,9 +1,9 @@
 JAVAC=javac
 JAR=jar
 JAVADOC=javadoc
-JDKVER=1.4
+JDKVER=1.5
 JFLAGS=-source $(JDKVER) -target $(JDKVER)
-JAPIURL=http://java.sun.com/j2se/1.4.2/docs/api
+JAPIURL=http://download.oracle.com/javase/1.5.0/docs/api/
 
 DOCSDIR=javaDoc