Merge pull request #3363 from quantified-uncertainty/formatting-fixes

Quick fix for FormattedNumber
quantified-uncertainty · Sep 6, 2024 · f5c90f8 · f5c90f8
2 parents 7376a70 + 347d5e9
commit f5c90f8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/llmRunner/src/app/api/create/route.ts b/packages/llmRunner/src/app/api/create/route.ts
@@ -5,7 +5,7 @@ import {
   SquiggleResponse,
 } from "../../utils/squiggleTypes";
 
-export const maxDuration = 500;
+export const maxDuration = 300;
 
 export async function POST(req: Request) {
   const abortController = new AbortController();

diff --git a/packages/squiggle-lang/__tests__/utility/FormattedNumber_test.ts b/packages/squiggle-lang/__tests__/utility/FormattedNumber_test.ts
@@ -6,9 +6,11 @@ import {
 
 describe("FormattedNumber", () => {
   const makeTestCases: [number, ReturnType<typeof makeFormattedNumber>][] = [
+    [0.01, { type: "basic", value: "0.01", isNegative: false }],
     [123.45, { type: "basic", value: "120", isNegative: false }],
     [-123.45, { type: "basic", value: "120", isNegative: true }],
     [1234, { type: "basic", value: "1200", isNegative: false }],
+    [1000, { type: "basic", value: "1000", isNegative: false }],
     [
       1234567,
       { type: "unit", mantissa: "1.2", symbol: "M", isNegative: false },

diff --git a/packages/squiggle-lang/__tests__/utility/compactTreeString_test.ts b/packages/squiggle-lang/__tests__/utility/compactTreeString_test.ts
@@ -87,7 +87,7 @@ describe("compactTreeString", () => {
     },
     y: {
       vType: "SampleSetDist",
-      samples: [10400, 6830, 5280, 7700, ...1000 total],
+      samples: [1.04e4, 6830, 5280, 7700, ...1000 total],
       summary: {
         mean: ...,
         p5: ...,

diff --git a/packages/squiggle-lang/src/utility/FormattedNumber.ts b/packages/squiggle-lang/src/utility/FormattedNumber.ts
@@ -64,7 +64,7 @@ export const makeFormattedNumber = (
 
   const magnitude = calculateOrderOfMagnitude(absNumber);
 
-  if (magnitude > -2 && magnitude < 5) {
+  if (magnitude > -3 && magnitude < 4) {
     return {
       type: "basic",
       value: formatNumberWithScale(absNumber, 0, precision),