Merge pull request #2525 from snowgoer540/gregc/floating-point

interp: fix GE/LE operators to handle double-precision comparison

Author: rene-dev

docs/src/gcode/overview.adoc

@@ -704,11 +704,10 @@ false, and any non-zero number is equivalent to logical true.
 
 == Equality and floating-point values
 
-The RS274/NGC language only supports floating-point values of finite
-precision. Therefore, testing for equality or inequality of two
-floating-point values is inherently problematic. The interpreter
-solves this problem by considering values equal if their absolute
-difference is less than 0.0001 (this value is defined as
+Testing for equality or inequality of two
+double-precision floating-point values is inherently problematic.
+The interpreter solves this problem by considering values equal if
+their absolute difference is less than 1e-6 (this value is defined as
 'TOLERANCE_EQUAL' in src/emc/rs274ngc/interp_internal.hh).
 
 [[gcode:functions]]

src/emc/rs274ngc/interp_execute.cc

@@ -158,20 +158,20 @@ int Interp::execute_binary2(double *left,        //!< pointer to the left operan
       *left = (*left < *right) ? 1.0 : 0.0;
       break;
   case EQ:
-      diff = *left - *right;
-      diff = (diff < 0) ? -diff : diff;
+      diff = fabs(*left - *right);
       *left = (diff < TOLERANCE_EQUAL) ? 1.0 : 0.0;
       break;
   case NE:
-      diff = *left - *right;
-      diff = (diff < 0) ? -diff : diff;
+      diff = fabs(*left - *right);
       *left = (diff >= TOLERANCE_EQUAL) ? 1.0 : 0.0;
       break;
   case LE:
-      *left = (*left <= *right) ? 1.0 : 0.0;
+      diff = fabs(*left - *right);
+      *left = ((diff < TOLERANCE_EQUAL) || (*left <= *right)) ? 1.0 : 0.0;
       break;
   case GE:
-      *left = (*left >= *right) ? 1.0 : 0.0;
+      diff = fabs(*left - *right);
+      *left = ((diff < TOLERANCE_EQUAL) || (*left >= *right)) ? 1.0 : 0.0;
       break;
   case GT:
       *left = (*left > *right) ? 1.0 : 0.0;

src/emc/rs274ngc/interp_internal.hh

@@ -87,8 +87,8 @@ Tighter tolerance down to a minimum of 1 micron +- also accepted.
 #define SPIRAL_RELATIVE_TOLERANCE 0.001
 
 /* angle threshold for concavity for cutter compensation, in radians */
-#define TOLERANCE_CONCAVE_CORNER 0.05  
-#define TOLERANCE_EQUAL 0.0001 /* two numbers compare EQ if the
+#define TOLERANCE_CONCAVE_CORNER 0.05
+#define TOLERANCE_EQUAL 1e-6 /* two numbers compare EQ if the
 				  difference is less than this */
 
 static inline bool equal(double a, double b)