[Rivet-svn] r2073 - in trunk: . include/Rivet

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Nov 19 11:23:17 2009
New Revision: 2073

Log:
Fixing our double comparison. If you are currently using
r2029 or newer, please update to this revision (or newer).

Modified:
   trunk/ChangeLog
   trunk/include/Rivet/Cmp.hh

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Nov 18 22:15:33 2009	(r2072)
+++ trunk/ChangeLog	Thu Nov 19 11:23:17 2009	(r2073)
@@ -1,3 +1,7 @@
+2009-11-19  Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+	* Fixing our compare() for doubles.
+
 2009-11-17  Hendrik Hoeth <hendrik.hoeth at cern.ch>
 
 	* Zeroth version of STAR_2006_S6860818 analysis (identified strange

Modified: trunk/include/Rivet/Cmp.hh
==============================================================================
--- trunk/include/Rivet/Cmp.hh	Wed Nov 18 22:15:33 2009	(r2072)
+++ trunk/include/Rivet/Cmp.hh	Thu Nov 19 11:23:17 2009	(r2073)
@@ -224,7 +224,7 @@
     //@{
     /// The default constructor.
     Cmp(const double p1, const double p2) 
-      : _value(UNDEFINED), _numA(0.0), _numB(0.0)
+      : _value(UNDEFINED), _numA(p1), _numB(p2)
     { }
     
     /// The copy constructor.
@@ -267,7 +267,7 @@
       if (_value == UNDEFINED) {
         if (fuzzyEquals(_numA,_numB)) _value = EQUIVALENT;
         else if (_numA < _numB) _value = ORDERED;
-        else _value = ORDERED;
+        else _value = UNORDERED;
       }
     }