feat: pivot/matrix improvement for Catlab stratify

packages/client/hmi-client/src/components/models/tera-stratified-value-matrix.vue

@@ -79,7 +79,7 @@ import {
 	extractStateMatrixData,
 	extractTransitionMatrixData
 } from '@/model-representation/petrinet/petrinet-service';
-import { createStateMatrix, createTransitionMatrix } from '@/utils/pivot';
+import { createMatrix1D, createMatrix2D } from '@/utils/pivot';
 import Dropdown from 'primevue/dropdown';
 import { Initial, ModelConfiguration, ModelParameter, Rate } from '@/types/Types';
 import { NodeType } from '@/model-representation/petrinet/petrinet-renderer';
@@ -198,8 +198,8 @@ function configureMatrix() {
 
 	const matrixAttributes =
 		props.nodeType === NodeType.State
-			? createStateMatrix(matrixData)
-			: createTransitionMatrix(matrixData, colDimensions, rowDimensions);
+			? createMatrix1D(matrixData)
+			: createMatrix2D(matrixData, colDimensions, rowDimensions);
 
 	matrix.value = matrixAttributes.matrix;
 	chosenCol.value = colDimensions[0];

packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts

@@ -595,7 +595,6 @@ export const isStratifiedAMR = (amr: Model) => {
 	return false;
 };
 
-// Returns a 1xN matrix describing state's initials
 export const extractMapping = (amr: Model, id: string) => {
 	const typeMapList = amr.semantics?.typing?.map as [string, string][];
 	const item = typeMapList.find((d) => d[0] === id);
@@ -664,6 +663,88 @@ export const extractStateMatrixData = (amr: Model, stateIds: string[], dimension
 	return results;
 };
 
+const MAX_DEPTH = 10;
+
+/**
+ * Given an identifier string id, recursiviely lookup mapping information
+ * to find out where the id originated. At eash iteration record the term
+ * and type/model that was added.
+ */
+export const getCatlabStratasDataPoint = (amr: Model, id: string) => {
+	let span: any = amr.semantics?.span;
+	let key = id;
+	let c = 0;
+	const result: any = {};
+
+	// Recursively crawl up the strata provenance chain
+	while (c < MAX_DEPTH) {
+		c++;
+		// Name of strata dimension, Catlab doesn't actually track it
+		// so the cloest thing is the strata model name
+		const dimension = span[1].system.name;
+
+		// The strata
+		// eslint-disable-next-line
+		const term = span[1].map.find((d: any) => d[0] === key)[1];
+		result[dimension] = term;
+
+		// eslint-disable-next-line
+		key = span[0].map.find((d: any) => d[0] === key)[1];
+		span = span[0].system.semantics.span;
+		if (!span) {
+			result.id = id;
+			result['@base'] = key;
+			break;
+		}
+	}
+	return result;
+};
+
+export const getCatlabStatesMatrixData = (amr: Model) => {
+	const stateIds = amr.model.states.map((d: any) => d.id);
+	const results: any[] = [];
+	for (let i = 0; i < stateIds.length; i++) {
+		const result = getCatlabStratasDataPoint(amr as any, stateIds[i]);
+		results.push(result);
+	}
+	return results;
+};
+
+export const getCatlabTransitionsMatrixData = (amr: Model) => {
+	const transitions = amr.model.transitions as PetriNetTransition[];
+	const results: any[] = [];
+	for (let i = 0; i < transitions.length; i++) {
+		const transition = transitions[i];
+		let result: any = {};
+
+		// Scan both inut and outut
+		transition.input.forEach((stateId: string) => {
+			result = Object.assign(result, getCatlabStratasDataPoint(amr as any, stateId));
+		});
+		transition.output.forEach((stateId: string) => {
+			result = Object.assign(result, getCatlabStratasDataPoint(amr as any, stateId));
+		});
+
+		// Build the @base/id for a transition
+		let c = 0;
+		let key = transition.id;
+		let span: any = amr.semantics?.span;
+		while (c < MAX_DEPTH) {
+			c++;
+			// eslint-disable-next-line
+			key = span[0].map.find((d: any) => d[0] === key)[1];
+			span = span[0].system.semantics.span;
+			if (!span) {
+				result['@base'] = key;
+				result.id = transition.id;
+				break;
+			}
+		}
+		results.push(result);
+	}
+	return results;
+};
+
 export function newAMR(modelName: string) {
 	const amr: Model = {
 		id: '',

packages/client/hmi-client/src/utils/pivot.ts

@@ -76,12 +76,12 @@ const pivotAxes = (data: any[], rowDimensions: string[], colDimensions: string[]
 			}
 		}
 	});
-	return { colAxis, rowAxis };
+	return { colAxis, rowAxis, termsMap: cardinality };
 };
 
 // Creates a M x 1 matrix where
 // M =  cardinality(rowDimensions[0]) * cardinality(rowDimensions[1]) * ... * cardinality(rowDimensions[m])
-export const createStateMatrix = (data: any[]) => {
+export const createMatrix1D = (data: any[]) => {
 	const rows: any[] = [];
 
 	// Construct 1D matrix for state data
@@ -103,11 +103,7 @@ export const createStateMatrix = (data: any[]) => {
 // Creates a M x N matrix where
 // M =  cardinality(rowDimensions[0]) * cardinality(rowDimensions[1]) * ... * cardinality(rowDimensions[m])
 // N =  cardinality(colDimensions[0]) * cardinality(colDimensions[1]) * ... * cardinality(colDimensions[n])
-export const createTransitionMatrix = (
-	data: any[],
-	rowDimensions: string[],
-	colDimensions: string[]
-) => {
+export const createMatrix2D = (data: any[], rowDimensions: string[], colDimensions: string[]) => {
 	const axes = pivotAxes(data, colDimensions, rowDimensions);
 	const rows: any[] = [];
 
@@ -162,6 +158,7 @@ export const createTransitionMatrix = (
 
 	return {
 		matrix: rows,
+		termsMap: axes.termsMap,
 		colDimensions,
 		rowDimensions
 	};

packages/client/hmi-client/tests/unit/utils/pivot.spec.ts

@@ -1,4 +1,4 @@
-import { createTransitionMatrix } from '@/utils/pivot';
+import { createMatrix2D } from '@/utils/pivot';
 import { describe, expect, it } from 'vitest';
 
 const data: any[] = [
@@ -10,7 +10,7 @@ const data: any[] = [
 
 describe('pivot table tests', () => {
 	it('square pivot table', () => {
-		const r = createTransitionMatrix(data, ['fruit'], ['fruit']);
+		const r = createMatrix2D(data, ['fruit'], ['fruit']);
 
 		expect(r.matrix.length).to.eq(3);
 		expect(r.matrix[0].length).to.eq(3);