Changeset 1534

Timestamp:

Sep 25, 2008, 8:24:28 PM (14 years ago)

Author:

Peter

Message:

fixed some bugs in DataWeight?

Location:

trunk

Files:

• test/data_weight_test.cc (modified) (1 diff)
• yat/utility/DataWeight.cc (modified) (2 diffs)

trunk/test/data_weight_test.cc

@@ -36 +36 @@
   DataWeight x;
   x.data()=3.14;
-  suite.add(x.data()==3.14);
-  suite.add(x.weight()==1.0);
+  suite.add(suite.equal(x.data(),3.14));
+  suite.add(suite.equal(x.weight(),1.0));
   DataWeight y(3.14);
   y = DataWeight(3.14, 0.1);
-  suite.add(x==y);
-  suite.add(! (x!=y) );
-  suite.add(! (x<y) );
-  suite.add(! (x>y) );
-  suite.add(x<=y);
-  suite.add(x>=y);
+  suite.add(suite.equal(x.data(), y.data()));
+  if (!suite.add(x==y))
+    suite.err() << "operator==\n";
+  if (!suite.add(! (x!=y) ))
+    suite.err() << "operator!=\n";
+  if (!suite.add(! (x<y) ))
+    suite.err() << "operator<\n";
+  if (!suite.add(! (x>y) ))
+    suite.err() << "operator>\n";
+  if (!suite.add(x<=y))
+    suite.err() << "operator<=\n";
+  if (!suite.add(x>=y))
+    suite.err() << "operator>=\n";
+
   DataWeight z(y);
 
-  suite.return_value();
+  return suite.return_value();
 }

trunk/yat/utility/DataWeight.cc

@@ -79 +79 @@
   bool operator<=(const DataWeight& lhs, const DataWeight& rhs)
   {
-    return rhs > lhs;
+    return !(lhs > rhs);
   }
 
@@ -85 +85 @@
   bool operator>=(const DataWeight& lhs, const DataWeight& rhs)
   {
-    return rhs < lhs;
+    return !(lhs < rhs);
   }