/*
Copyright (c) 2014, Colorado State University
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.

This software is provided by the copyright holders and contributors "as is" and
any express or implied warranties, including, but not limited to, the implied
warranties of merchantability and fitness for a particular purpose are
disclaimed. In no event shall the copyright holder or contributors be liable for
any direct, indirect, incidental, special, exemplary, or consequential damages
(including, but not limited to, procurement of substitute goods or services;
loss of use, data, or profits; or business interruption) however caused and on
any theory of liability, whether in contract, strict liability, or tort
(including negligence or otherwise) arising in any way out of the use of this
software, even if advised of the possibility of such damage.
*/

package galileo.bmp;

import com.googlecode.javaewah.EWAHCompressedBitmap;

/**
 * A thin wrapper around {@link com.googlecode.javaewah.EWAHCompressedBitmap}
 * to enable us to decouple from a particular bitmap implementation in the
 * future if need be.
 *
 * @author malensek
 */
public class Bitmap {

    private EWAHCompressedBitmap bmp;

    public Bitmap() {
        this.bmp = new EWAHCompressedBitmap();
    }

    private Bitmap(EWAHCompressedBitmap bmp) {
        this.bmp = bmp;
    }

    /**
     * Sets the specified bit(s) in the BitArray.
     *
     * @param bits list of bits to set (as in, set to 1).
     *
     * @throws BitArrayException if the bits could not be set.
     */
    public void set(int... bits)
    throws BitmapException {
        for (int i : bits) {
            if (bmp.set(i) == false) {
                throw new BitmapException("Could not set bit at " + i);
            }
        }
    }

    /**
     * Performs a logical AND operation between two Bitmap instances.
     */
    public Bitmap and(Bitmap otherBitmap)
    throws BitmapException {
        return new Bitmap(this.bmp.and(otherBitmap.bmp));
    }

    /**
     * Performs a logical OR operation between two Bitmap instances.
     */
    public Bitmap or(Bitmap otherBitmap)
    throws BitmapException {
        return new Bitmap(this.bmp.or(otherBitmap.bmp));
    }
}

@@ -1338,482 +1338,103 @@
 p;%0A%0A
-import com.googlecode.javaewah.EWAHCompressedBitmap;%0A%0A/**%0A * A thin wrapper around %7B@link com.googlecode.javaewah.EWAHCompressedBitmap%7D%0A * to enable us to decouple from a particular bitmap implementation in the%0A * future if need be.%0A *%0A * @author malensek%0A */%0Apublic class Bitmap %7B%0A%0A    private EWAHCompressedBitmap bmp;%0A%0A    public Bitmap() %7B%0A        this.bmp = new EWAHCompressedBitmap();%0A    %7D%0A%0A    private Bitmap(EWAHCompressedBitmap bmp) %7B%0A        this.bmp = bmp;%0A    %7D
+/**%0A * An interface for bitmap indexes.%0A *%0A * @author malensek%0A */%0Apublic interface Bitmap%3CT%3E %7B
 %0A%0A  
@@ -1479,24 +1479,21 @@
  in the 
-BitArray
+index
 .%0A     *
@@ -1580,13 +1580,11 @@
  Bit
-Array
+map
 Exce
@@ -1659,20 +1659,16 @@
 .. bits)
-%0A   
  throws 
@@ -1686,516 +1686,50 @@
 tion
- %7B%0A        for (int i : bits) %7B%0A            if (bmp.set(i) == false) %7B%0A                throw new BitmapException(%22Could not set bit at %22 + i);%0A            %7D%0A        %7D%0A    %7D%0A%0A    /**%0A     * Performs a logical AND operation between two Bitmap instances.%0A     */%0A    public Bitmap and(Bitmap otherBitmap)%0A    throws BitmapException %7B%0A        return new Bitmap(this.bmp.and(otherBitmap.bmp));%0A    %7D%0A%0A    /**%0A     * Performs a logical OR operation between two Bitmap instances.%0A     */%0A    public Bitmap or
+;%0A%0A    public boolean intersects
 (Bitmap
+%3CT%3E
  oth
@@ -1737,20 +1737,16 @@
 rBitmap)
-%0A   
  throws 
@@ -1764,72 +1764,8 @@
 tion
- %7B%0A        return new Bitmap(this.bmp.or(otherBitmap.bmp));%0A    %7D
+;
 %0A%7D%0A

Create bitmap interface