Preparing a new release.

lemire · Mar 14, 2013 · fb25975 · fb25975
1 parent 4029506
commit fb25975
Show file tree

Hide file tree

Showing 23 changed files with 62 additions and 27 deletions.
diff --git a/README b/README
@@ -1,10 +1,13 @@
 JavaEWAH
-(c) 2009-2012
+(c) 2009-2013
 Daniel Lemire (http://lemire.me/en/), 
 Cliff Moon (https://github.com/cliffmoon), 
 David McIntosh (https://github.com/mctofu),
 Robert Becho (https://github.com/RBecho),
-and Colby Ranger (https://github.com/crangeratgoogle)
+Colby Ranger (https://github.com/crangeratgoogle)
+and Veronika Zenz (https://github.com/veronikazenz)
+
+
 
 This code is licensed under Apache License, Version 2.0 (ASL2.0).
 
@@ -38,6 +41,13 @@ Daniel Lemire, Owen Kaser, Kamel Aouiche, Sorting improves word-aligned bitmap i
  http://arxiv.org/abs/0901.3751
 
  (The PDF file is freely available on the arXiv site.)
+
+== Benchmark ==
+
+For a simple comparison between this library and other libraries such as
+WAH, ConciseSet, BitSet and other options, please see
+
+https://github.com/lemire/simplebitmapbenchmark
 
 == Unit testing ==
 
@@ -66,7 +76,7 @@ You can also specify the dependency in the Maven "pom.xml" file:
     <dependency>
 	<groupId>com.googlecode.javaewah</groupId>
 	<artifactId>JavaEWAH</artifactId>
-	<version>0.6.9</version>
+	<version>0.6.10</version>
     </dependency>
 </dependencies>
 

diff --git a/src/main/java/com/googlecode/javaewah/BitCounter.java b/src/main/java/com/googlecode/javaewah/BitCounter.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**

diff --git a/src/main/java/com/googlecode/javaewah/BitmapStorage.java b/src/main/java/com/googlecode/javaewah/BitmapStorage.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/BufferedRunningLengthWord.java b/src/main/java/com/googlecode/javaewah/BufferedRunningLengthWord.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/EWAHCompressedBitmap.java b/src/main/java/com/googlecode/javaewah/EWAHCompressedBitmap.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho and and Google Inc.
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/EWAHIterator.java b/src/main/java/com/googlecode/javaewah/EWAHIterator.java
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/IntIterator.java b/src/main/java/com/googlecode/javaewah/IntIterator.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/IteratingBufferedRunningLengthWord.java b/src/main/java/com/googlecode/javaewah/IteratingBufferedRunningLengthWord.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**

diff --git a/src/main/java/com/googlecode/javaewah/NonEmptyVirtualStorage.java b/src/main/java/com/googlecode/javaewah/NonEmptyVirtualStorage.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**
@@ -10,7 +10,7 @@
  * set bit.
  * 
  * @since 0.4.2
- * @author Daniel Lemire
+ * @author Daniel Lemire and Veronika Zenz
  * 
  */
 public class NonEmptyVirtualStorage implements BitmapStorage {

diff --git a/src/main/java/com/googlecode/javaewah/RunningLengthWord.java b/src/main/java/com/googlecode/javaewah/RunningLengthWord.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah/benchmark/ClusteredDataGenerator.java b/src/main/java/com/googlecode/javaewah/benchmark/ClusteredDataGenerator.java
@@ -1,5 +1,12 @@
 package com.googlecode.javaewah.benchmark;
 
+
+/*
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
+ * Licensed under APL 2.0.
+ */
+
+
 /**
  * This class will generate uniformly distributed lists of random integers.
  * 

diff --git a/src/main/java/com/googlecode/javaewah/benchmark/UniformDataGenerator.java b/src/main/java/com/googlecode/javaewah/benchmark/UniformDataGenerator.java
@@ -1,9 +1,17 @@
 package com.googlecode.javaewah.benchmark;
 
+
+/*
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
+ * Licensed under APL 2.0.
+ */
+
+
 import java.util.Iterator;
 import java.util.Random;
 import java.util.TreeSet;
 
+
 /**
  * This class will generate "clustered" lists of random integers. That is, the
  * integers tend not to be randomly distributed.

diff --git a/src/main/java/com/googlecode/javaewah/benchmark/benchmark.java b/src/main/java/com/googlecode/javaewah/benchmark/benchmark.java
@@ -1,14 +1,24 @@
 package com.googlecode.javaewah.benchmark;
 
+/*
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
+ * Licensed under APL 2.0.
+ */
+
+
 import java.text.DecimalFormat;
 import java.util.List;
-
 import com.googlecode.javaewah.EWAHCompressedBitmap;
 import com.googlecode.javaewah.FastAggregation;
 import com.googlecode.javaewah.IntIterator;
 
-
-public class benchmark {
+/**
+ * This class is used to benchmark the performance 
+ * EWAH.
+ * 
+ * @author Daniel Lemire
+ */
+public class Benchmark {
 
   public static void main(String args[]) {
     test(100, 16, 1);

diff --git a/src/main/java/com/googlecode/javaewah32/BitCounter32.java b/src/main/java/com/googlecode/javaewah32/BitCounter32.java
@@ -3,7 +3,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**

diff --git a/src/main/java/com/googlecode/javaewah32/BitmapStorage32.java b/src/main/java/com/googlecode/javaewah32/BitmapStorage32.java
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah32/BufferedRunningLengthWord32.java b/src/main/java/com/googlecode/javaewah32/BufferedRunningLengthWord32.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah32;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah32/EWAHCompressedBitmap32.java b/src/main/java/com/googlecode/javaewah32/EWAHCompressedBitmap32.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah32;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, and Google Inc.
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah32/EWAHIterator32.java b/src/main/java/com/googlecode/javaewah32/EWAHIterator32.java
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/main/java/com/googlecode/javaewah32/IteratingBufferedRunningLengthWord32.java b/src/main/java/com/googlecode/javaewah32/IteratingBufferedRunningLengthWord32.java
@@ -3,7 +3,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**

diff --git a/src/main/java/com/googlecode/javaewah32/NonEmptyVirtualStorage32.java b/src/main/java/com/googlecode/javaewah32/NonEmptyVirtualStorage32.java
@@ -3,7 +3,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 /**
@@ -12,7 +12,7 @@
  * there will be at least on set bit.
  * 
  * @since 0.5.0
- * @author Daniel Lemire
+ * @author Daniel Lemire and Veronika Zenz
  *
  */
 public class NonEmptyVirtualStorage32 implements BitmapStorage32 {

diff --git a/src/main/java/com/googlecode/javaewah32/RunningLengthWord32.java b/src/main/java/com/googlecode/javaewah32/RunningLengthWord32.java
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Robert Becho
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/test/java/com/googlecode/javaewah/EWAHCompressedBitmapTest.java b/src/test/java/com/googlecode/javaewah/EWAHCompressedBitmapTest.java
@@ -2,7 +2,7 @@
 
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Google Inc.
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */
 

diff --git a/src/test/java/com/googlecode/javaewah32/EWAHCompressedBitmap32Test.java b/src/test/java/com/googlecode/javaewah32/EWAHCompressedBitmap32Test.java
@@ -1,7 +1,7 @@
 package com.googlecode.javaewah32;
 
 /*
- * Copyright 2009-2012, Daniel Lemire, Cliff Moon, David McIntosh and Google Inc.
+ * Copyright 2009-2013, Daniel Lemire, Cliff Moon, David McIntosh, Robert Becho, Google Inc. and Veronika Zenz
  * Licensed under APL 2.0.
  */