Increase value of epsilon in nontrivially_less_than to avoid intermin…

…able loop (#32) * Avoid near-infinite loop in SPI * Precision 4 works; let's conservatively go to 8. * Update metatext - CID still seems to encounter issue.
ms609 · Aug 16, 2020 · ce5ffa4 · ce5ffa4
1 parent 4527591
commit ce5ffa4
Show file tree

Hide file tree

Showing 3 changed files with 261 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,10 @@
 # TreeDist 1.1.1.9001 (development)
 
-- Improve floating-point arithmetic in `TreeDistance()` functions to avoid
-  multi-hour runtimes in corner cases.
-
+- Improve floating-point arithmetic in `TreeDistance()` functions.
+
+- Reduce precision of LAPJV so rounding errors do not result in interminable run
+  times.
+
 - Fix rounding error in NNI 'Li' upper estimate, and improve NNI performance.
 
 # TreeDist 1.1.1.9000

diff --git a/src/lap.cpp b/src/lap.cpp
@@ -74,7 +74,7 @@ List lapjv (NumericMatrix x, NumericVector maxX) {
 }
 
 bool nontrivially_less_than(cost a, cost b) {
-  return a + ((a > ROUND_PRECISION) ? 2 : 0) < b;
+  return a + ((a > ROUND_PRECISION) ? 8 : 0) < b;
 }
 
 /* This function is the jv shortest augmenting path algorithm to solve the