Merge pull request #292 from mgreminger/matrix-index-fix

fix: fix dimension handling for matrix indexing (WIP)
mgreminger · Oct 24, 2024 · 29034ca · 29034ca
2 parents c305a3a + e2bd714
commit 29034ca
Show file tree

Hide file tree

Showing 9 changed files with 289 additions and 202 deletions.
diff --git a/public/dimensional_analysis.py b/public/dimensional_analysis.py
diff --git a/src/PlotCell.svelte b/src/PlotCell.svelte
@@ -633,12 +633,12 @@
               </TooltipIcon>
             {:else if !unitsValid($results[index][i].data[0].displayInputUnits)}
               <TooltipIcon direction="right" align="end">
-                <span slot="tooltipText">X-axis upper and/or lower limit dimension error{$results[index][i].data[0].asciiInputUnits === "Exponent Not Dimensionless" ? ": Exponent Not Dimensionless": ""}</span>
+                <span slot="tooltipText">X-axis upper and/or lower limit dimension error{$results[index][i].data[0].asciiInputUnits.startsWith("Dimension Error:") ? $results[index][i].data[0].asciiInputUnits.slice(15) : ""}</span>
                 <Error class="error"/>
               </TooltipIcon>
             {:else if !unitsValid($results[index][i].data[0].displayOutputUnits)}
               <TooltipIcon direction="right" align="end">
-                <span slot="tooltipText">Y-axis dimension error{$results[index][i].data[0].asciiOutputUnits === "Exponent Not Dimensionless" ? ": Exponent Not Dimensionless": ""}</span>
+                <span slot="tooltipText">Y-axis dimension error{$results[index][i].data[0].asciiOutputUnits.startsWith("Dimension Error:") ? $results[index][i].data[0].asciiOutputUnits.slice(15) : ""}</span>
                 <Error class="error"/>
               </TooltipIcon>
             {:else if $results[index][i].data[0].unitsMismatch}

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