Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 93144 invoked from network); 23 Apr 2009 04:09:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Apr 2009 04:09:53 -0000 Received: (qmail 9434 invoked by uid 500); 23 Apr 2009 04:09:52 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 9334 invoked by uid 500); 23 Apr 2009 04:09:51 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 9325 invoked by uid 99); 23 Apr 2009 04:09:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2009 04:09:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Apr 2009 04:09:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 06C2B23889DE; Thu, 23 Apr 2009 04:09:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r767782 - /commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java Date: Thu, 23 Apr 2009 04:09:28 -0000 To: commits@commons.apache.org From: billbarker@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090423040929.06C2B23889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: billbarker Date: Thu Apr 23 04:09:27 2009 New Revision: 767782 URL: http://svn.apache.org/viewvc?rev=767782&view=rev Log: Fix equals and hashcode to do exact comparisons Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java?rev=767782&r1=767781&r2=767782&view=diff ============================================================================== --- commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java (original) +++ commons/proper/math/trunk/src/java/org/apache/commons/math/linear/SparseRealVector.java Thu Apr 23 04:09:27 2009 @@ -1224,7 +1224,11 @@ return getData(); } - /** {@inheritDoc} */ + /** {@inheritDoc} + *

Implementation Note: This works on exact values, and as a result + * it is possible for {@code a.subtract(b)} to be the zero vector, while + * {@code a.hashCode() != b.hashCode()}.

+ */ @Override public int hashCode() { final int prime = 31; @@ -1233,10 +1237,21 @@ temp = Double.doubleToLongBits(epsilon); result = prime * result + (int) (temp ^ (temp >>> 32)); result = prime * result + virtualSize; + Iterator iter = entries.iterator(); + while (iter.hasNext()) { + iter.advance(); + temp = Double.doubleToLongBits(iter.value()); + result = prime * result + (int) (temp ^ (temp >>32)); + } return result; } - /** {@inheritDoc} */ + /** + *

Implementation Note: This performs an exact comparison, and as a result + * it is possible for {@code a.subtract(b}} to be the zero vector, while + * {@code a.equals(b) == false}.

+ * {@inheritDoc} + */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -1259,16 +1274,16 @@ Iterator iter = entries.iterator(); while (iter.hasNext()) { iter.advance(); - double test = iter.value() - other.getEntry(iter.key()); - if (Math.abs(test) > epsilon) { + double test = other.getEntry(iter.key()); + if (Double.doubleToLongBits(test) != Double.doubleToLongBits(iter.value())) { return false; } } iter = other.getEntries().iterator(); while (iter.hasNext()) { iter.advance(); - double test = iter.value() - getEntry(iter.key()); - if (!isZero(test)) { + double test = iter.value(); + if (Double.doubleToLongBits(test) != Double.doubleToLongBits(iter.value())) { return false; } }