Changeset 4fc9c7e in tol

Timestamp:

Jul 2, 2012, 9:31:39 PM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3da496d

Parents:

946360a

Message:

fixes #1576, el hash de fechas se compara con tolerancia 1.0e-7

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4904 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/bbasic

Files:

• dte.cpp (modified) (1 diff)
• tol_bdate.h (modified) (1 diff)

tol/bbasic/dte.cpp

@@ -213 +213 @@
 }
 
+//#define TRACE_COMPARE
+BInt BDate::Compare(const BDate* dte1, const BDate* dte2) {
+#ifdef TRACE_COMPARE
+  std::cout << "Compare: " <<  std::endl;
+  std::cout << "Hash(dte1) = " <<  dte1->Hash() << std::endl;
+  std::cout << "Hash(dte2) = " <<  dte2->Hash() << std::endl;    
+#endif
+  BReal h1 = dte1->Hash();
+  BReal h2 = dte2->Hash();
+  BReal dif = h1 - h2;
+#ifdef TRACE_COMPARE
+  std::cout << "dif: " << dif << std::endl;
+  std::cout << "h1 < h2: " << (h1<h2) << std::endl;
+#endif
+  BReal dif0 = fabs( dif );
+  return dif < -1.0e-7 ? -1 : ( dif0 > 1.0e-7 ? 1 : 0 );
+}
 
 //--------------------------------------------------------------------

tol/bbasic/tol_bdate.h

@@ -329 +329 @@
    * \return Value indicating the lexicographical relation between the dates.
    */
-  static BInt Compare(const BDate* dte1, const BDate* dte2) {
-      BReal dif = dte1->Hash() - dte2->Hash();
-      return dif>0 ? 1 : (dif<0 ? -1 : 0);
-  }
+  static BInt Compare(const BDate* dte1, const BDate* dte2);
 
   // Support to algebraical operations: dtealgeb.cpp