Import Debian changes 0.6.0~beta2-1

elki (0.6.0~beta2-1) unstable; urgency=low

  * New upstream beta release.
  * 3DPC extension is not yet included.

1 files changed, 36 insertions, 6 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/utilities/datastructures/histogram/AbstractObjStaticHistogram.java b/src/de/lmu/ifi/dbs/elki/utilities/datastructures/histogram/AbstractObjStaticHistogram.java
index c1882302..4a1649af 100644
--- a/src/de/lmu/ifi/dbs/elki/utilities/datastructures/histogram/AbstractObjStaticHistogram.java
+++ b/src/de/lmu/ifi/dbs/elki/utilities/datastructures/histogram/AbstractObjStaticHistogram.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.utilities.datastructures.histogram;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2012
+ Copyright (C) 2013
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -35,6 +35,16 @@ package de.lmu.ifi.dbs.elki.utilities.datastructures.histogram;
  */
 public abstract class AbstractObjStaticHistogram<T> extends AbstractStaticHistogram implements ObjHistogram<T> {
   /**
+   * Data store
+   */
+  Object[] data;
+
+  /**
+   * Special value storage: infinity, NaN
+   */
+  Object[] special = null;
+
+  /**
    * Constructor.
    * 
    * @param bins Number of bins
@@ -46,15 +56,13 @@ public abstract class AbstractObjStaticHistogram<T> extends AbstractStaticHistog
     if (bins >= 0) {
       // -1 will be used by FlexiHistogram to delay initialization.
       data = new Object[bins];
+      for (int i = 0; i < bins; i++) {
+        data[i] = makeObject();
+      }
     }
   }
 
   /**
-   * Data store
-   */
-  Object[] data;
-
-  /**
    * Access the value of a bin with new data.
    * 
    * @param coord Coordinate
@@ -62,6 +70,15 @@ public abstract class AbstractObjStaticHistogram<T> extends AbstractStaticHistog
    */
   @SuppressWarnings("unchecked")
   public T get(double coord) {
+    if (coord == Double.NEGATIVE_INFINITY) {
+      return getSpecial(0);
+    }
+    if (coord == Double.POSITIVE_INFINITY) {
+      return getSpecial(1);
+    }
+    if (Double.isNaN(coord)) {
+      return getSpecial(2);
+    }
     int bin = getBinNr(coord);
     if (bin < 0) {
       if (size - bin > data.length) {
@@ -103,6 +120,19 @@ public abstract class AbstractObjStaticHistogram<T> extends AbstractStaticHistog
   }
 
   /**
+   * Ensure that we have storage for special values (infinity, NaN)
+   * 
+   * @param idx Index to return.
+   */
+  @SuppressWarnings("unchecked")
+  protected T getSpecial(int idx) {
+    if (special == null) {
+      special = new Object[] { makeObject(), makeObject(), makeObject() };
+    }
+    return (T) special[idx];
+  }
+
+  /**
    * Class to make a new object for the data store.
    * 
    * @return New instance.