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, 12 insertions, 5 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleDistanceIntegerDBIDPair.java b/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleDistanceIntegerDBIDPair.java
index 8334d2e3..1f3b2a45 100644
--- a/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleDistanceIntegerDBIDPair.java
+++ b/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleDistanceIntegerDBIDPair.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.database.ids.integer;
  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
@@ -22,9 +22,10 @@ package de.lmu.ifi.dbs.elki.database.ids.integer;
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import de.lmu.ifi.dbs.elki.database.ids.DistanceDBIDPair;
-import de.lmu.ifi.dbs.elki.database.ids.DoubleDistanceDBIDPair;
+import de.lmu.ifi.dbs.elki.database.ids.distance.DistanceDBIDPair;
+import de.lmu.ifi.dbs.elki.database.ids.distance.DoubleDistanceDBIDPair;
 import de.lmu.ifi.dbs.elki.distance.distancevalue.DoubleDistance;
+import de.lmu.ifi.dbs.elki.utilities.Util;
 
 /**
  * Class storing a double distance a DBID.
@@ -90,14 +91,20 @@ class DoubleDistanceIntegerDBIDPair implements DoubleDistanceDBIDPair, IntegerDB
     }
     if (o instanceof DoubleDistanceIntegerDBIDPair) {
       DoubleDistanceIntegerDBIDPair p = (DoubleDistanceIntegerDBIDPair) o;
-      return (this.id == p.id) && (this.distance == p.distance);
+      return (this.id == p.id) && (Double.compare(this.distance, p.distance) == 0);
     }
     if (o instanceof DistanceIntegerDBIDPair) {
       DistanceIntegerDBIDPair<?> p = (DistanceIntegerDBIDPair<?>) o;
       if (p.distance instanceof DoubleDistance) {
-        return (this.id == p.id) && (this.distance == ((DoubleDistance) p.distance).doubleValue());
+        return (this.id == p.id) && (Double.compare(this.distance, ((DoubleDistance) p.distance).doubleValue()) == 0);
       }
     }
     return false;
   }
+
+  @Override
+  public int hashCode() {
+    long bits = Double.doubleToLongBits(distance);
+    return Util.mixHashCodes((int) (bits ^ (bits >>> 32)), id);
+  }
 }