mgreminger · mgreminger · Jan 3, 2025 · Jan 3, 2025 · Jan 3, 2025 · Jan 5, 2025
diff --git a/public/dimensional_analysis.py b/public/dimensional_analysis.py
diff --git a/src/MathCell.svelte b/src/MathCell.svelte
@@ -335,7 +335,7 @@
         const currentResultLatex = getLatexResult(createSubQuery(sympyVar), subResults.get(sympyVar), numberConfig);
         let newLatex: string;
         if (currentResultLatex.error) {
-          newLatex = String.raw`\text{${currentResultLatex.error}}`;
+          newLatex = String.raw`\text{${currentResultLatex.error.startsWith("Dimension Error:") ? "Dimension Error" : currentResultLatex.error}}`;
         } else {
           newLatex = ` ${currentResultLatex.resultLatex}${currentResultLatex.resultUnitsLatex} `;
         }

diff --git a/src/cells/FluidCell.ts b/src/cells/FluidCell.ts
@@ -294,10 +294,8 @@ export default class FluidCell extends BaseCell {
           name: this.mathField.statement.name,
           sympy: `${fluidFuncName}(0,0)`,
           params: [],
-          isUnitlessSubExpression: false,
           isFunctionArgument: false,
           isFunction: false,
-          unitlessSubExpressions: [],
           implicitParams: [],
           functions: [],
           arguments: [],

diff --git a/src/parser/LatexToSympy.ts b/src/parser/LatexToSympy.ts
diff --git a/src/parser/constants.ts b/src/parser/constants.ts
@@ -31,6 +31,8 @@ export const BUILTIN_FUNCTION_MAP = new Map([
   ['stdevp', '_stdevp']
 ]);
 
+export const BUILTIN_FUNCTION_NEEDS_VALUES= new Set(['range',]);
+
 export const COMPARISON_MAP = new Map([
   ["<", "_StrictLessThan"],
   ["\\le", "_LessThan"],

diff --git a/src/parser/types.ts b/src/parser/types.ts
@@ -31,7 +31,6 @@ export type BlankStatement = {
   type: "blank";
   params: [];
   implicitParams: [];
-  unitlessSubExpressions: [];
   isFromPlotCell: false;
 };
 
@@ -87,10 +86,8 @@ type BaseAssignmentStatement = {
   name: string;
   sympy: string;
   params: string[];
-  isUnitlessSubExpression: false;
   isFunctionArgument: false;
   isFunction: false;
-  unitlessSubExpressions: UnitlessSubExpression[];
 };
 
 export type UserFunction = Omit<BaseAssignmentStatement, "isFunction"> & {
@@ -110,17 +107,9 @@ export type UserFunctionRange = Omit<UserFunction, "isRange"> & {
 };
 
 
-export type UnitlessSubExpression = Omit<BaseAssignmentStatement, "isUnitlessSubExpression"> & {
-  isUnitlessSubExpression: true;
-  unitlessContext: string;
-  isFunctionArgument: false;
-  isFunction: false;
-};
-
 export type FunctionArgumentAssignment = Pick<BaseAssignmentStatement,
                                               "type" | "name" | "sympy" |
-                                              "params" | "unitlessSubExpressions"> & {
-  isUnitlessSubExpression: false;
+                                              "params"> & {
   isFunctionArgument: true;
   isFunction: false;
 };
@@ -168,13 +157,11 @@ export type EqualityStatement = Omit<AssignmentStatement, "type" | "name"> & {
 type BaseQueryStatement = {
   type: "query";
   sympy: string;
-  unitlessSubExpressions: UnitlessSubExpression[];
   implicitParams: ImplicitParameter[];
   params: string[];
   functions: (UserFunction | UserFunctionRange | FunctionUnitsQuery)[];
   arguments: (FunctionArgumentAssignment | FunctionArgumentQuery) [];
   localSubs: (LocalSubstitution | LocalSubstitutionRange)[];
-  isUnitlessSubExpression: false;
   isFunctionArgument: false;
   isFunction: false;
   isUnitsQuery: false;
@@ -264,7 +251,6 @@ export type ScatterQueryStatement = {
   arguments: (FunctionArgumentAssignment | FunctionArgumentQuery) [];
   localSubs: (LocalSubstitution | LocalSubstitutionRange)[];
   implicitParams: ImplicitParameter[];
-  unitlessSubExpressions: UnitlessSubExpression[];
   equationIndex: number;
   cellNum: number;
   isFromPlotCell: boolean;
@@ -298,9 +284,8 @@ export type CodeFunctionRawQuery = BaseQueryStatement & {
   isCodeFunctionRawQuery: true;
 }
 
-export type FunctionArgumentQuery = Pick<BaseQueryStatement, "type" | "sympy" | "params" | "unitlessSubExpressions" > & {
+export type FunctionArgumentQuery = Pick<BaseQueryStatement, "type" | "sympy" | "params" > & {
   name: string;
-  isUnitlessSubExpression: false;
   isFunctionArgument: true;
   isFunction: false;
   isUnitsQuery: false;
@@ -310,9 +295,8 @@ export type FunctionArgumentQuery = Pick<BaseQueryStatement, "type" | "sympy" |
   isCodeFunctionRawQuery: false;
 };
 
-export type FunctionUnitsQuery = Pick<BaseQueryStatement, "type" | "sympy" | "params" | "unitlessSubExpressions" > & {
+export type FunctionUnitsQuery = Pick<BaseQueryStatement, "type" | "sympy" | "params" > & {
   units: '';
-  isUnitlessSubExpression: false;
   isFunctionArgument: false;
   isFunction: false;
   isUnitsQuery: true;

diff --git a/src/parser/utility.ts b/src/parser/utility.ts
@@ -89,15 +89,13 @@ export function applyEdits(source: string, pendingEdits: (Insertion | Replacemen
 export function createSubQuery(name: string): SubQueryStatement {
   return {
     type: "query",
-    unitlessSubExpressions: [],
     implicitParams: [],
     params: [name],
     functions: [],
     arguments: [],
     localSubs: [],
     units: "",
     unitsLatex: "",
-    isUnitlessSubExpression: false,
     isFunctionArgument: false,
     isFunction: false,
     isUnitsQuery: false,
@@ -112,4 +110,5 @@ export function createSubQuery(name: string): SubQueryStatement {
     isCodeFunctionQuery: false,
     isCodeFunctionRawQuery: false
   };
-}
+}
+
diff --git a/tests/test_basic.spec.mjs b/tests/test_basic.spec.mjs
@@ -750,6 +750,22 @@ test('Test function notation with exponents and units', async () => {
 
 });
 
+test('Test function notation with exponents and units and nested functions', async () => {
+
+  await page.setLatex(0, String.raw`t\left(s=y\left(x=2\left\lbrack in\right\rbrack\right)\cdot1\left\lbrack in\right\rbrack\right)=`);
+  await page.click('#add-math-cell');
+  await page.setLatex(1, String.raw`t=2^{\frac{s}{1\left\lbrack in\right\rbrack}}`);
+  await page.click('#add-math-cell');
+  await page.setLatex(2, String.raw`y=3^{\frac{x}{1\left\lbrack in\right\rbrack}}`);
+
+  await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+  let content = await page.textContent('#result-value-0');
+  expect(parseLatexFloat(content)).toBeCloseTo(512, precision-1);  
+  content = await page.textContent('#result-units-0');
+  expect(content).toBe('');
+});
+
 
 test('Test function notation with integrals', async () => {
 

diff --git a/tests/test_matrix_functions.spec.mjs b/tests/test_matrix_functions.spec.mjs
@@ -347,8 +347,17 @@
   expect(content).toBe(String.raw`\begin{bmatrix} 0\left\lbrack m\right\rbrack  \\ 1\left\lbrack m\right\rbrack  \\ 2\left\lbrack m\right\rbrack  \\ 3\left\lbrack m\right\rbrack  \\ 4\left\lbrack m\right\rbrack  \\ 5\left\lbrack m\right\rbrack  \end{bmatrix}`); 
 });
 
-test('Test range input needs to be unitless', async () => {
-  await page.setLatex(0, String.raw`\mathrm{range}\left(1\left\lbrack m\right\rbrack,2\left\lbrack m\right\rbrack,.1\left\lbrack m\right\rbrack\right)=`);
+test('Test range with consistent units', async () => {
+  await page.setLatex(0, String.raw`\mathrm{range}\left(1\left\lbrack m\right\rbrack,2\left\lbrack m\right\rbrack,1\left\lbrack m\right\rbrack\right)=`);
+
+  await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+  let content = await page.textContent(`#result-value-0`);
+  expect(content).toBe(String.raw`\begin{bmatrix} 1\left\lbrack m\right\rbrack  \\ 2\left\lbrack m\right\rbrack  \end{bmatrix}`); 
+});
+
+test('Test range with inconsistent units', async () => {
+  await page.setLatex(0, String.raw`\mathrm{range}\left(1\left\lbrack m\right\rbrack,2\left\lbrack s\right\rbrack,1\left\lbrack m\right\rbrack\right)=`);
 
   await page.waitForSelector('text=Updating...', {state: 'detached'});
 
@@ -402,7 +411,7 @@

  await page.waitForSelector('text=Updating...', {state: 'detached'});

  let content = await page.textContent(`#result-value-0`);
  expect(parseLatexFloat(content)).toBeCloseTo(3, precision);

  content = await page.textContent('#result-units-0');

diff --git a/tests/test_number_format.spec.mjs b/tests/test_number_format.spec.mjs
@@ -53,6 +53,10 @@ test('Test symbolic format', async () => {
   await page.locator('#add-math-cell').click();
   await page.setLatex(2, String.raw`\frac{-3\left\lbrack mm\right\rbrack}{\sqrt2}=`);
 
+  // symbolic expression with fractional exponent
+  await page.locator('#add-math-cell').click();
+  await page.setLatex(3, String.raw`3.0^{.500}=`);
+
   await page.waitForSelector('text=Updating...', {state: 'detached'});
 
   // check all values rendered as floating point values first
@@ -69,6 +73,9 @@ test('Test symbolic format', async () => {
   content = await page.textContent('#result-units-2');
   expect(content).toBe('m');
 
+  content = await page.textContent('#result-value-3');
+  expect(parseLatexFloat(content)).toBeCloseTo(sqrt(3), precision);
+
   // switch to symbolic formatting
   await page.getByRole('button', { name: 'Sheet Settings' }).click();
   await page.locator('label').filter({ hasText: 'Display Symbolic Results' }).click();
@@ -87,6 +94,8 @@ test('Test symbolic format', async () => {
   content = await page.textContent('#result-units-2');
   expect(content).toBe('m');
 
+  content = await page.textContent('#result-value-3');
+  expect(content).toBe(String.raw`\sqrt{3}`);
 });
 
 test('Test disabling automatic expressions simplification', async () => {