refactor: update some property names for consistent style

mgreminger · Oct 26, 2023 · 7d945aa · 7d945aa
1 parent fd43c45
commit 7d945aa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/public/dimensional_analysis.py b/public/dimensional_analysis.py
@@ -273,7 +273,8 @@ class RangeQueryStatement(BaseQueryStatement):
     upperLimitArgument: str
     upperLimitInclusive: bool
     unitsQueryFunction: str
-    input_units: str
+    inputUnits: str
+    inputUnitsLatex: str
     outputName: str
 
 class ScatterXValuesQueryStatement(QueryAssignmentCommon):

diff --git a/src/PlotCell.svelte b/src/PlotCell.svelte
@@ -91,8 +91,8 @@
 
     if (plotCell.mathFields[0].statement?.type === "query" && plotCell.mathFields[0].statement.isRange) { 
       // use input units from first plot statement
-      userInputUnits = plotCell.mathFields[0].statement.input_units;
-      userInputUnitsLatex = plotCell.mathFields[0].statement.input_units_latex;
+      userInputUnits = plotCell.mathFields[0].statement.inputUnits;
+      userInputUnitsLatex = plotCell.mathFields[0].statement.inputUnitsLatex;
     }
     for (const [j, statement] of plotCell.mathFields.map((field) => field.statement).entries()) {
       if ($results[index] && $results[index][j] &&

diff --git a/src/parser/LatexToSympy.ts b/src/parser/LatexToSympy.ts
@@ -38,7 +38,7 @@ import { getBlankMatrixLatex } from "../utility";
 type UnitBlockData = {
   units: string;
   unitsLatex: string;
-  units_valid: boolean;
+  unitsValid: boolean;
   dimensions: number[];
 }
 
@@ -113,8 +113,8 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
   argumentIndex = 0;
   argumentPrefix = "argument__";
 
-  input_units = "";
-  input_units_latex = "";
+  inputUnits = "";
+  inputUnitsLatex = "";
 
   constructor(sourceLatex: string, equationIndex: number, type: FieldTypes = "math") {
     super();
@@ -460,7 +460,7 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
   visitQuery = (ctx: QueryContext): QueryStatement | RangeQueryStatement | CodeFunctionQueryStatement => {
     let sympy = this.visit(ctx.expr()) as string;
 
-    const {units, unitsLatex, units_valid, dimensions} = this.visitU_block(ctx.u_block());
+    const {units, unitsLatex, unitsValid, dimensions} = this.visitU_block(ctx.u_block());
 
     const initialQuery: QueryStatement = {
       type: "query",
@@ -508,8 +508,8 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
           upperLimitArgument: rangeFunction.upperLimitArgument,
           upperLimitInclusive: rangeFunction.upperLimitInclusive,
           unitsQueryFunction: rangeFunction.unitsQueryFunction,
-          input_units: this.input_units,
-          input_units_latex: this.input_units_latex,
+          inputUnits: this.inputUnits,
+          inputUnitsLatex: this.inputUnitsLatex,
           outputName: rangeFunction.sympy,
         }
       }
@@ -641,7 +641,7 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
       return {type: "error"};
     }
 
-    const {units, unitsLatex, units_valid, dimensions} = this.visitU_block(ctx.u_block());
+    const {units, unitsLatex, unitsValid, dimensions} = this.visitU_block(ctx.u_block());
 
     return {
       type: "query",
@@ -926,8 +926,8 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
       this.arguments.push(...newArguments);
 
       if (inputUnitsParameter) {
-        this.input_units = inputUnitsParameter.units;
-        this.input_units_latex = inputUnitsParameter.unitsLatex;
+        this.inputUnits = inputUnitsParameter.units;
+        this.inputUnitsLatex = inputUnitsParameter.unitsLatex;
       }
     }
 
@@ -1408,7 +1408,7 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
 
     const original_value = this.visitNumber(ctx.number_());
 
-    if (unitBlockData.units_valid) {
+    if (unitBlockData.unitsValid) {
       try{
         numWithUnits = unit(
           bignumber(original_value),
@@ -1493,8 +1493,8 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
   visitU_block = (ctx: U_blockContext): UnitBlockData => {
     let units = "";
     let unitsLatex = "";
-    let units_valid = false;
-    let units_dimensions: number[] = [];
+    let unitsValidReturn = false;
+    let unitsDimensions: number[] = [];
 
     if(ctx) {
       units = this.visit(ctx.u_expr()) as string;
@@ -1504,19 +1504,19 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
       )}`;
       const { dimensions, unitsValid } = checkUnits(units);
       if (unitsValid) {
-        units_dimensions = dimensions;
-        units_valid = true;
+        unitsDimensions = dimensions;
+        unitsValidReturn = true;
       } else {
         this.addParsingErrorMessage(`Unknown Dimension ${units}`);
-        units_valid = false;
+        unitsValidReturn = false;
       }
     }
 
     return {
       units: units,
       unitsLatex: unitsLatex,
-      units_valid: units_valid,
-      dimensions: units_dimensions,
+      unitsValid: unitsValidReturn,
+      dimensions: unitsDimensions,
     }
   }
 

diff --git a/src/parser/types.ts b/src/parser/types.ts
@@ -203,8 +203,8 @@ export type RangeQueryStatement = BaseQueryStatement & {
   upperLimitArgument: string;
   upperLimitInclusive: boolean;
   unitsQueryFunction: string;
-  input_units: string;
-  input_units_latex: string;
+  inputUnits: string;
+  inputUnitsLatex: string;
   outputName: string;
 };