fix: stratified matrix expressions (#2881)

DARPA-ASKEM · Feb 29, 2024 · a4df3ea · a4df3ea
1 parent 41cb5b1
commit a4df3ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...lient/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue b/...lient/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue
@@ -77,7 +77,7 @@ const props = defineProps<{
 
 const emit = defineEmits(['close-modal', 'update-configuration']);
 
-const matrixShouldEval = ref(true);
+const matrixShouldEval = ref(false);
 </script>
 
 <style scoped>

diff --git a/.../hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue b/.../hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue
@@ -131,7 +131,7 @@ watch(
 							if (!output[cell.row]) {
 								output[cell.row] = [];
 							}
-							output[cell.row][cell.col] = await getMatrixValue(cell.content.id, props.shouldEval);
+							output[cell.row][cell.col] = await getMatrixValue(cell.content.id);
 						}
 					})
 				)
@@ -188,10 +188,10 @@ function onEnterValueCell(variableName: string, rowIdx: number, colIdx: number)
 
 // See ES2_2a_start in "Eval do not touch"
 // Returns the presentation mathml
-async function getMatrixValue(variableName: string, shouldEvaluate: boolean) {
+async function getMatrixValue(variableName: string) {
 	const expressionBase = getMatrixExpression(variableName);
 
-	if (shouldEvaluate) {
+	if (props.shouldEval) {
 		const expressionEval = await pythonInstance.evaluateExpression(
 			expressionBase,
 			parametersValueMap.value