Make convergent calculator more sane

xenharmonic-devs · Dec 26, 2023 · e6e9e2c · e6e9e2c
1 parent 22b15a3
commit e6e9e2c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/__tests__/approximation.spec.ts b/src/__tests__/approximation.spec.ts
@@ -120,6 +120,12 @@ describe('Convergent calculator', () => {
     expect(semiconvergents[3].equals('10/3')).toBeTruthy();
     expect(semiconvergents[4].equals('13/4')).toBeTruthy();
   });
+
+  it('calculates convergents for 1\\5', () => {
+    expect(() =>
+      getConvergents(1.148698354997035, undefined, 256, true, false)
+    ).not.toThrow();
+  });
 });
 
 describe('Radical approximator', () => {

diff --git a/src/approximation.ts b/src/approximation.ts
@@ -52,17 +52,21 @@ export function getConvergents(
         if (includeNonMonotonic) {
           result.push(convergent);
         } else {
-          // See https://en.wikipedia.org/wiki/Continued_fraction#Semiconvergents
-          // for the origin of this half-rule
           if (2 * i > cfDigit) {
             result.push(convergent);
-          } else if (
-            convergent
-              .sub(value_)
-              .abs()
-              .compare(result[result.length - 1].sub(value_).abs()) < 0
-          ) {
-            result.push(convergent);
+          } else {
+            // See https://en.wikipedia.org/wiki/Continued_fraction#Semiconvergents
+            // for the origin of this half-rule
+            try {
+              const halfRule =
+                convergent
+                  .sub(value_)
+                  .abs()
+                  .compare(result[result.length - 1].sub(value_).abs()) < 0;
+              if (halfRule) {
+                result.push(convergent);
+              }
+            } catch {}
           }
         }
         if (result.length >= maxLength!) {