From 2439e63ae55fb0e3fca0636cdc1bdbf0747e95e4 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 14:55:23 -0400
Subject: [PATCH 01/16] change output type and show model config in funman op

---
 .../scripts/docker-compose-taskrunner.yml     |  1 +
 .../src/assets/css/theme/_variables.scss      |  2 +-
 .../model/petrinet/tera-parameter-table.vue   |  1 +
 .../workflow/ops/funman/funman-operation.ts   |  7 +-
 .../ops/funman/tera-funman-drilldown.vue      |  8 +-
 .../workflow/ops/funman/tera-funman-node.vue  | 18 +++-
 .../ops/funman/tera-funman-output.vue         | 85 ++++++++++++++++---
 .../tera-model-config-drilldown.vue           | 35 ++------
 .../src/model-representation/mira/mira.ts     | 24 ++++++
 packages/taskrunner/core.dimacs               | 70 +++++++++++++++
 packages/taskrunner/unsat.core                |  1 +
 11 files changed, 201 insertions(+), 51 deletions(-)
 create mode 100644 packages/taskrunner/core.dimacs
 create mode 100644 packages/taskrunner/unsat.core

diff --git a/containers/scripts/docker-compose-taskrunner.yml b/containers/scripts/docker-compose-taskrunner.yml
index bb358e4c08..f48271d486 100644
--- a/containers/scripts/docker-compose-taskrunner.yml
+++ b/containers/scripts/docker-compose-taskrunner.yml
@@ -69,6 +69,7 @@ services:
       - ../../packages/funman:/funman_task
       - ../../packages/taskrunner:/taskrunner
     command: /funman_task/dev.sh
+    platform: linux/amd64
 
   equation_extraction_cpu-taskrunner:
     build:
diff --git a/packages/client/hmi-client/src/assets/css/theme/_variables.scss b/packages/client/hmi-client/src/assets/css/theme/_variables.scss
index 9d629fb403..52e514b606 100644
--- a/packages/client/hmi-client/src/assets/css/theme/_variables.scss
+++ b/packages/client/hmi-client/src/assets/css/theme/_variables.scss
@@ -420,7 +420,7 @@ $accordionHeaderTextActiveHoverColor: $textColor !default;
 $accordionContentBorder: 0 none !default;
 $accordionContentBg: #ffffff !default;
 $accordionContentTextColor: $textColor !default;
-$accordionContentPadding: 0.5rem 0.5rem 2rem !default;
+$accordionContentPadding: 0.5rem 0.5rem 0.5rem !default;
 
 //tabview
 $tabviewNavBorder: solid rgba(0, 0, 0, .12) !default;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
index ce5d94df9c..d5460b4993 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
@@ -142,6 +142,7 @@ import InputNumber from 'primevue/inputnumber';
 import Dropdown from 'primevue/dropdown';
 import Checkbox from 'primevue/checkbox';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
+import Divider from 'primevue/divider';
 import TeraParameterEntry from './tera-parameter-entry.vue';
 import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/funman-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/funman/funman-operation.ts
index d355d0047c..2017c6b485 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/funman-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/funman-operation.ts
@@ -47,10 +47,10 @@ export interface FunmanOperationState extends BaseState {
 	numSteps: number;
 	tolerance: number;
 	inProgressId: string;
+	runId: string;
 	compartmentalConstraint: CompartmentalConstraint;
 	constraintGroups: ConstraintGroup[];
 	requestParameters: RequestParameter[];
-
 	// selected state in ouptut
 	trajectoryState?: string;
 }
@@ -64,7 +64,7 @@ export const FunmanOperation: Operation = {
 		{ type: 'modelConfigId', label: 'Model configuration' },
 		{ type: 'datasetId', label: 'Dataset', isOptional: true }
 	],
-	outputs: [{ type: 'funmanQueryId' }],
+	outputs: [{ type: 'modelConfigId', label: 'Model configuration' }],
 	isRunnable: true,
 	action: () => {},
 	initState: () => {
@@ -75,7 +75,8 @@ export const FunmanOperation: Operation = {
 			compartmentalConstraint: { name: 'Compartmental constraint', isActive: true },
 			constraintGroups: [],
 			requestParameters: [],
-			inProgressId: ''
+			inProgressId: '',
+			runId: ''
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
index 85b123043b..5d21cff74a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
@@ -143,8 +143,8 @@
 				<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%" />
 				<template v-else>
 					<tera-funman-output
-						v-if="activeOutput"
-						:fun-model-id="activeOutput.value?.[0]"
+						v-if="!isEmpty(node.state.runId)"
+						:run-id="node.state.runId"
 						:trajectoryState="node.state.trajectoryState"
 						@update:trajectoryState="updateTrajectorystate"
 					/>
@@ -156,7 +156,7 @@
 </template>
 
 <script setup lang="ts">
-import _, { floor } from 'lodash';
+import _, { floor, isEmpty } from 'lodash';
 import { computed, ref, watch } from 'vue';
 import Button from 'primevue/button';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
@@ -197,7 +197,7 @@ const props = defineProps<{
 	node: WorkflowNode<FunmanOperationState>;
 }>();
 
-const emit = defineEmits(['append-output', 'select-output', 'update-state', 'close']);
+const emit = defineEmits(['select-output', 'update-state', 'close']);
 
 interface BasicKnobs {
 	tolerance: number;
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
index 7f7fecf87b..04d8888313 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
@@ -21,8 +21,9 @@ import { WorkflowNode } from '@/types/workflow';
 import { FunmanOperationState, FunmanOperation } from '@/components/workflow/ops/funman/funman-operation';
 import Button from 'primevue/button';
 import { Poller, PollerState } from '@/api/api';
-import { pollAction } from '@/services/models/simulation-service';
+import { pollAction, getRunResult } from '@/services/models/simulation-service';
 import { nodeOutputLabel } from '@/components/workflow/util';
+import { logger } from '@/utils/logger';
 
 const emit = defineEmits(['open-drilldown', 'append-output', 'update-state']);
 
@@ -34,15 +35,24 @@ const inProgressId = computed(() => props.node.state.inProgressId);
 const poller = new Poller();
 
 const addOutputPorts = async (runId: string) => {
+	// The validated configuration id is set as the output value
+	const rawFunmanResult = await getRunResult(runId, 'validation.json');
+	if (!rawFunmanResult) {
+		logger.error('Failed to fetch funman result');
+		return;
+	}
+	const validatedConfigurationId = JSON.parse(rawFunmanResult).modelConfiguration.id;
+
 	const portLabel = props.node.inputs[0].label;
 
 	const outState = _.cloneDeep(props.node.state);
 	outState.inProgressId = '';
+	outState.runId = runId;
 
 	emit('append-output', {
 		label: nodeOutputLabel(props.node, `${portLabel} Result`),
 		type: FunmanOperation.outputs[0].type,
-		value: runId,
+		value: validatedConfigurationId,
 		state: outState
 	});
 };
@@ -72,6 +82,8 @@ watch(
 	() => props.node.state.inProgressId,
 	async (id) => {
 		if (!id || id === '') return;
+		console.log(props.node);
+		console.log('Polling funman status', id);
 
 		const response = await getStatus(id);
 		if (response.state === PollerState.Done) {
@@ -85,5 +97,3 @@ watch(
 	{ immediate: true }
 );
 </script>
-
-<style scoped></style>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
index 79c4b50a03..22218f9959 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
@@ -1,7 +1,7 @@
 <template>
 	<header class="flex align-items-start">
 		<div>
-			<h4>{{ contractedModel?.header.name }}</h4>
+			<h4>{{ validatedModelConfiguration?.name }}</h4>
 			<span class="secondary-text">Output generated date</span>
 		</div>
 		<div class="btn-group">
@@ -23,15 +23,45 @@
 			<template #header>Parameters<i class="pi pi-info-circle" /></template>
 			<vega-chart :visualization-spec="parameterCharts" :are-embed-actions-visible="false" />
 		</AccordionTab>
-		<!--TODO: Read only model configuration-->
-		<!-- <AccordionTab v-if="contractedModel" header="Validated configuration"> -->
-		<!-- <tera-model-diagram :model="contractedModel"/> -->
-		<!-- </AccordionTab> -->
+		<AccordionTab header="Diagram">
+			<tera-model-diagram v-if="model" :model="model" />
+		</AccordionTab>
 	</Accordion>
+	<template v-if="model && validatedModelConfiguration && configuredMmt">
+		<tera-initial-table
+			:model="model"
+			:model-configuration="validatedModelConfiguration"
+			:model-configurations="[validatedModelConfiguration]"
+			:mmt="configuredMmt"
+			:mmt-params="mmtParams"
+		/>
+		<tera-parameter-table
+			:model="model"
+			:model-configuration="validatedModelConfiguration"
+			:model-configurations="[validatedModelConfiguration]"
+			:mmt="configuredMmt"
+			:mmt-params="mmtParams"
+		/>
+		<Accordion :active-index="0" v-if="!isEmpty(calibratedConfigObservables)">
+			<AccordionTab v-if="!isEmpty(calibratedConfigObservables)" header="Observables">
+				<tera-observables
+					class="pl-4"
+					:model="model"
+					:mmt="configuredMmt"
+					:observables="calibratedConfigObservables"
+					:feature-config="{ isPreview: true }"
+				/>
+			</AccordionTab>
+		</Accordion>
+	</template>
 </template>
 
 <script setup lang="ts">
+import { isEmpty } from 'lodash';
 import { ref, watch } from 'vue';
+import TeraObservables from '@/components/model/model-parts/tera-observables.vue';
+import TeraInitialTable from '@/components/model/petrinet/tera-initial-table.vue';
+import TeraParameterTable from '@/components/model/petrinet/tera-parameter-table.vue';
 import {
 	type ProcessedFunmanResult,
 	type FunmanConstraintsResponse,
@@ -44,12 +74,15 @@ import Dropdown from 'primevue/dropdown';
 import Button from 'primevue/button';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
-// import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-model-diagram.vue'; // TODO: Once we save the output model properly in the backend we can use this.
+import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-model-diagram.vue'; // TODO: Once we save the output model properly in the backend we can use this.
 import { logger } from '@/utils/logger';
-import type { Model } from '@/types/Types';
+import type { Model, ModelConfiguration, Observable } from '@/types/Types';
+import { getModelByModelConfigurationId, getMMT } from '@/services/model';
+import type { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
+import { makeConfiguredMMT } from '@/model-representation/mira/mira';
 
 const props = defineProps<{
-	funModelId: string;
+	runId: string;
 	trajectoryState?: string;
 }>();
 
@@ -58,7 +91,13 @@ const emit = defineEmits(['update:trajectoryState']);
 let processedFunmanResult: ProcessedFunmanResult | null = null;
 let constraintsResponse: FunmanConstraintsResponse[] = [];
 
-const contractedModel = ref<Model | null>(null);
+// Model configuration stuff
+const model = ref<Model | null>(null);
+const validatedModelConfiguration = ref<ModelConfiguration | null>(null);
+const configuredMmt = ref<MiraModel | null>(null);
+const mmtParams = ref<MiraTemplateParams>({});
+const calibratedConfigObservables = ref<Observable[]>([]);
+
 const stateOptions = ref<string[]>([]);
 const selectedState = ref<string>('');
 
@@ -66,8 +105,7 @@ const stateChart = ref();
 const parameterCharts = ref();
 
 const initalize = async () => {
-	// props.funModelId bf7ef7f4-b8ab-4008-b03c-d0c96a7c763f
-	const rawFunmanResult = await getRunResult(props.funModelId, 'validation.json');
+	const rawFunmanResult = await getRunResult(props.runId, 'validation.json');
 	if (!rawFunmanResult) {
 		logger.error('Failed to fetch funman result');
 		return;
@@ -75,6 +113,7 @@ const initalize = async () => {
 	const funmanResult = JSON.parse(rawFunmanResult);
 	constraintsResponse = funmanResult.request.constraints;
 	stateOptions.value = funmanResult.model.petrinet.model.states.map(({ id }) => id);
+	validatedModelConfiguration.value = funmanResult.modelConfiguration;
 
 	processedFunmanResult = processFunman(funmanResult);
 
@@ -82,11 +121,33 @@ const initalize = async () => {
 	selectedState.value = props.trajectoryState ?? stateOptions.value[0];
 	updateStateChart();
 
+	console.log(funmanResult); /// //////////////////////////
+
 	// Parameter charts
 	const parametersOfInterest = funmanResult.request.parameters.filter((d: any) => d.label === 'all');
 	if (processedFunmanResult.boxes) {
 		parameterCharts.value = createFunmanParameterChart(parametersOfInterest, processedFunmanResult.boxes);
 	}
+
+	// For displaying model/model configuration
+	model.value = await getModelByModelConfigurationId(funmanResult.modelConfiguration.id);
+	if (!model.value) {
+		logger.error('Failed to fetch model');
+		return;
+	}
+	const response = await getMMT(model.value);
+	const mmt = response.mmt;
+	mmtParams.value = response.template_params;
+
+	configuredMmt.value = makeConfiguredMMT(mmt, funmanResult.modelConfiguration);
+	calibratedConfigObservables.value = funmanResult.modelConfiguration.observableSemanticList.map(
+		({ referenceId, states, expression }) => ({
+			id: referenceId,
+			name: referenceId,
+			states,
+			expression
+		})
+	);
 };
 
 function updateStateChart() {
@@ -96,7 +157,7 @@ function updateStateChart() {
 }
 
 watch(
-	() => props.funModelId,
+	() => props.runId,
 	() => {
 		initalize();
 	},
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
index d23d623d5e..55405d5d6a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
@@ -210,7 +210,11 @@ import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-mo
 import TeraObservables from '@/components/model/model-parts/tera-observables.vue';
 import TeraInitialTable from '@/components/model/petrinet/tera-initial-table.vue';
 import TeraParameterTable from '@/components/model/petrinet/tera-parameter-table.vue';
-import { emptyMiraModel, generateModelDatasetConfigurationContext } from '@/model-representation/mira/mira';
+import {
+	emptyMiraModel,
+	generateModelDatasetConfigurationContext,
+	makeConfiguredMMT
+} from '@/model-representation/mira/mira';
 import type { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
 import { configureModelFromDataset, configureModelFromDocument } from '@/services/goLLM';
 import { KernelSessionManager } from '@/services/jupyter';
@@ -471,30 +475,7 @@ const model = ref<Model | null>(null);
 const mmt = ref<MiraModel>(emptyMiraModel());
 const mmtParams = ref<MiraTemplateParams>({});
 
-const configuredMmt = ref(makeConfiguredMMT());
-
-function makeConfiguredMMT() {
-	const mmtCopy = cloneDeep(mmt.value);
-	knobs.value.transientModelConfig.initialSemanticList.forEach((initial) => {
-		const mmtInitial = mmtCopy.initials[initial.target];
-		if (mmtInitial) {
-			mmtInitial.expression = initial.expression;
-		}
-	});
-	knobs.value.transientModelConfig.parameterSemanticList.forEach((parameter) => {
-		const mmtParameter = mmtCopy.parameters[parameter.referenceId];
-		if (mmtParameter) {
-			mmtParameter.value = parameter.distribution.parameters.value;
-		}
-	});
-	knobs.value.transientModelConfig.observableSemanticList.forEach((observable) => {
-		const mmtObservable = mmtCopy.observables[observable.referenceId];
-		if (mmtObservable) {
-			mmtObservable.expression = observable.expression;
-		}
-	});
-	return mmtCopy;
-}
+const configuredMmt = ref(makeConfiguredMMT(mmt.value, knobs.value.transientModelConfig));
 
 const downloadModelArchive = async (configuration: ModelConfiguration = knobs.value.transientModelConfig) => {
 	const archive = await getArchive(configuration);
@@ -587,7 +568,7 @@ const initialize = async (overwriteWithState: boolean = false) => {
 		}
 	}
 
-	configuredMmt.value = makeConfiguredMMT();
+	configuredMmt.value = makeConfiguredMMT(mmt.value, knobs.value.transientModelConfig);
 
 	// Create a new session and context based on model
 	try {
@@ -700,7 +681,7 @@ const debounceUpdateState = debounce(() => {
 	console.log('debounced update');
 	const state = cloneDeep(props.node.state);
 	state.transientModelConfig = knobs.value.transientModelConfig;
-	configuredMmt.value = makeConfiguredMMT();
+	configuredMmt.value = makeConfiguredMMT(mmt.value, knobs.value.transientModelConfig);
 
 	emit('update-state', state);
 }, 100);
diff --git a/packages/client/hmi-client/src/model-representation/mira/mira.ts b/packages/client/hmi-client/src/model-representation/mira/mira.ts
index 25f5975dc5..afd91b21a1 100644
--- a/packages/client/hmi-client/src/model-representation/mira/mira.ts
+++ b/packages/client/hmi-client/src/model-representation/mira/mira.ts
@@ -1,6 +1,7 @@
 import _, { isEmpty, cloneDeep, uniq } from 'lodash';
 import { IGraph } from '@graph-scaffolder/types';
 import { NodeType } from '@/services/graph';
+import type { ModelConfiguration } from '@/types/Types';
 import {
 	extractOutcomeControllersMatrix,
 	extractSubjectControllersMatrix,
@@ -621,3 +622,26 @@ export const generateModelDatasetConfigurationContext = (mmt: MiraModel, miraTem
 	// Make string
 	return lines.join('\n');
 };
+
+export function makeConfiguredMMT(mmt: MiraModel, modelConfiguration: ModelConfiguration): MiraModel {
+	const mmtCopy = cloneDeep(mmt);
+	modelConfiguration.initialSemanticList.forEach((initial) => {
+		const mmtInitial = mmtCopy.initials[initial.target];
+		if (mmtInitial) {
+			mmtInitial.expression = initial.expression;
+		}
+	});
+	modelConfiguration.parameterSemanticList.forEach((parameter) => {
+		const mmtParameter = mmtCopy.parameters[parameter.referenceId];
+		if (mmtParameter) {
+			mmtParameter.value = parameter.distribution.parameters.value;
+		}
+	});
+	modelConfiguration.observableSemanticList.forEach((observable) => {
+		const mmtObservable = mmtCopy.observables[observable.referenceId];
+		if (mmtObservable) {
+			mmtObservable.expression = observable.expression;
+		}
+	});
+	return mmtCopy;
+}
diff --git a/packages/taskrunner/core.dimacs b/packages/taskrunner/core.dimacs
new file mode 100644
index 0000000000..72f9626cc3
--- /dev/null
+++ b/packages/taskrunner/core.dimacs
@@ -0,0 +1,70 @@
+p cnf 892 69
+-8 9 -1 0
+-8 10 -1 0
+-8 11 -1 0
+-8 16 -1 0
+-8 -18 -1 0
+-8 -19 -1 0
+-8 -20 -1 0
+-8 -21 -1 0
+-8 -22 -1 0
+-8 24 -1 0
+-27 8 -1 0
+-47 48 -41 0
+-47 49 -41 0
+-47 50 -41 0
+-47 51 -41 0
+-47 -53 -41 0
+-47 -54 -41 0
+-47 -55 -41 0
+-58 47 -41 0
+-79 80 -73 0
+-79 81 -73 0
+-79 82 -73 0
+-79 83 -73 0
+-79 -85 -73 0
+-79 -86 -73 0
+-79 -87 -73 0
+-90 79 -73 0
+-110 111 -104 0
+-110 112 -104 0
+-110 113 -104 0
+-110 114 -104 0
+-110 -116 -104 0
+-110 -117 -104 0
+-110 -118 -104 0
+-121 110 -104 0
+-140 141 -134 0
+-140 142 -134 0
+-140 143 -134 0
+-140 144 -134 0
+-140 -146 -134 0
+-140 -147 -134 0
+-140 -148 -134 0
+-151 140 -134 0
+-168 -167 -164 -163 0
+-169 168 -163 0
+-169 170 -163 0
+-169 171 -163 0
+-169 172 -163 0
+-169 173 -163 0
+-169 -175 -163 0
+-169 -176 -163 0
+-169 -177 -163 0
+-169 179 -163 0
+-180 169 -163 0
+13 -152 0
+14 -152 0
+15 -152 0
+-152 -884 0
+-152 -885 0
+-152 886 0
+25 -152 0
+27 -123 0
+-123 180 0
+-123 151 0
+121 -123 0
+90 -123 0
+58 -123 0
+-123 164 0
+-179 167 -123 884 885 -886 -172 -144 -170 -171 -173 175 176 177 -114 -141 -142 -143 146 147 148 -83 -111 -112 -113 116 117 118 -51 -80 -81 -82 85 86 87 -10 -14 -16 19 21 22 -24 -25 -48 -49 -50 53 54 55 -9 -11 -13 -15 18 20 0
diff --git a/packages/taskrunner/unsat.core b/packages/taskrunner/unsat.core
new file mode 100644
index 0000000000..4791ed5559
--- /dev/null
+++ b/packages/taskrunner/unsat.core
@@ -0,0 +1 @@
+True
\ No newline at end of file

From 7c8685652a61c1a265ad87ebda6dc7016c5d0d5a Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 14:56:47 -0400
Subject: [PATCH 02/16] Delete packages/taskrunner/core.dimacs

---
 packages/taskrunner/core.dimacs | 70 ---------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 packages/taskrunner/core.dimacs

diff --git a/packages/taskrunner/core.dimacs b/packages/taskrunner/core.dimacs
deleted file mode 100644
index 72f9626cc3..0000000000
--- a/packages/taskrunner/core.dimacs
+++ /dev/null
@@ -1,70 +0,0 @@
-p cnf 892 69
--8 9 -1 0
--8 10 -1 0
--8 11 -1 0
--8 16 -1 0
--8 -18 -1 0
--8 -19 -1 0
--8 -20 -1 0
--8 -21 -1 0
--8 -22 -1 0
--8 24 -1 0
--27 8 -1 0
--47 48 -41 0
--47 49 -41 0
--47 50 -41 0
--47 51 -41 0
--47 -53 -41 0
--47 -54 -41 0
--47 -55 -41 0
--58 47 -41 0
--79 80 -73 0
--79 81 -73 0
--79 82 -73 0
--79 83 -73 0
--79 -85 -73 0
--79 -86 -73 0
--79 -87 -73 0
--90 79 -73 0
--110 111 -104 0
--110 112 -104 0
--110 113 -104 0
--110 114 -104 0
--110 -116 -104 0
--110 -117 -104 0
--110 -118 -104 0
--121 110 -104 0
--140 141 -134 0
--140 142 -134 0
--140 143 -134 0
--140 144 -134 0
--140 -146 -134 0
--140 -147 -134 0
--140 -148 -134 0
--151 140 -134 0
--168 -167 -164 -163 0
--169 168 -163 0
--169 170 -163 0
--169 171 -163 0
--169 172 -163 0
--169 173 -163 0
--169 -175 -163 0
--169 -176 -163 0
--169 -177 -163 0
--169 179 -163 0
--180 169 -163 0
-13 -152 0
-14 -152 0
-15 -152 0
--152 -884 0
--152 -885 0
--152 886 0
-25 -152 0
-27 -123 0
--123 180 0
--123 151 0
-121 -123 0
-90 -123 0
-58 -123 0
--123 164 0
--179 167 -123 884 885 -886 -172 -144 -170 -171 -173 175 176 177 -114 -141 -142 -143 146 147 148 -83 -111 -112 -113 116 117 118 -51 -80 -81 -82 85 86 87 -10 -14 -16 19 21 22 -24 -25 -48 -49 -50 53 54 55 -9 -11 -13 -15 18 20 0

From b1d2927d887bf53d8c357711b8e98d35b3e72569 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 15:22:04 -0400
Subject: [PATCH 03/16] Delete packages/taskrunner/unsat.core

---
 packages/taskrunner/unsat.core | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 packages/taskrunner/unsat.core

diff --git a/packages/taskrunner/unsat.core b/packages/taskrunner/unsat.core
deleted file mode 100644
index 4791ed5559..0000000000
--- a/packages/taskrunner/unsat.core
+++ /dev/null
@@ -1 +0,0 @@
-True
\ No newline at end of file

From ca45b953da408119f72555961386c28ae82cd883 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 16:38:59 -0400
Subject: [PATCH 04/16] read only config

---
 .../model/petrinet/tera-initial-entry.vue     |  4 ++-
 .../model/petrinet/tera-initial-table.vue     |  5 +++-
 .../model/petrinet/tera-parameter-entry.vue   | 26 +++++++++++++++++--
 .../model/petrinet/tera-parameter-table.vue   |  6 ++++-
 .../workflow/ops/funman/tera-funman-node.vue  |  2 --
 .../ops/funman/tera-funman-output.vue         |  6 +++--
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
index d2c63662d7..7f6df4407a 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
@@ -15,7 +15,7 @@
 			</div>
 			<span v-if="description" class="description">{{ description }}</span>
 		</header>
-		<template v-if="isEmpty(modelConfiguration.inferredParameterList)">
+		<template v-if="isEmpty(modelConfiguration.inferredParameterList) && !featureConfig?.isPreview">
 			<main>
 				<span class="expression">
 					<tera-input-text
@@ -67,12 +67,14 @@ import Button from 'primevue/button';
 import { getInitialDescription, getInitialName, getInitialUnits, getStates } from '@/model-representation/service';
 import { getCurieFromGroundingIdentifier, getNameOfCurieCached } from '@/services/concept';
 import { stringToLatexExpression } from '@/services/model';
+import type { FeatureConfig } from '@/types/common';
 
 const props = defineProps<{
 	model: Model;
 	initialId: string;
 	modelConfiguration: ModelConfiguration;
 	modelConfigurations: ModelConfiguration[];
+	featureConfig?: FeatureConfig;
 }>();
 
 const otherValueList = computed(() =>
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
index 218a02ccd0..250417a441 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
@@ -24,6 +24,7 @@
 												:model-configuration="modelConfiguration"
 												:modelConfigurations="modelConfigurations"
 												:initial-id="target"
+												:feature-config="featureConfig"
 												@update-expression="emit('update-expression', $event)"
 												@update-source="emit('update-source', $event)"
 											/>
@@ -42,6 +43,7 @@
 						:model-configuration="modelConfiguration"
 						:modelConfigurations="modelConfigurations"
 						:initial-id="baseInitial"
+						:feature-config="featureConfig"
 						@update-expression="emit('update-expression', $event)"
 						@update-source="emit('update-source', $event)"
 					/>
@@ -50,7 +52,6 @@
 			</ul>
 		</AccordionTab>
 	</Accordion>
-
 	<tera-stratified-matrix-modal
 		v-if="matrixModalId && isStratified"
 		:id="matrixModalId"
@@ -75,6 +76,7 @@ import AccordionTab from 'primevue/accordiontab';
 import Button from 'primevue/button';
 import Divider from 'primevue/divider';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
+import type { FeatureConfig } from '@/types/common';
 import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
 import TeraInitialEntry from './tera-initial-entry.vue';
 
@@ -84,6 +86,7 @@ const props = defineProps<{
 	model: Model;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
+	featureConfig?: FeatureConfig;
 }>();
 
 const emit = defineEmits(['update-expression', 'update-source']);
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
index bc38e9f791..040e329ab9 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
@@ -26,7 +26,7 @@
 				<label>STDDEV</label> {{ displayNumber(inferredDistribution?.parameters?.stddev.toString()) }}
 			</span>
 		</div>
-		<template v-else>
+		<template v-else-if="!featureConfig?.isPreview">
 			<main>
 				<span class="flex gap-2">
 					<Dropdown
@@ -93,6 +93,26 @@
 				/>
 			</footer>
 		</template>
+		<span class="flex gap-4" v-else>
+			<template v-if="getParameterDistribution(modelConfiguration, parameterId).type === DistributionType.Constant">
+				<span><label>Type</label> {{ DistributionTypeLabel.Constant }}</span>
+				<span>
+					<label>Value</label>
+					{{ getParameterDistribution(modelConfiguration, parameterId).parameters.value }}
+				</span>
+			</template>
+			<template v-else-if="getParameterDistribution(modelConfiguration, parameterId).type === DistributionType.Uniform">
+				<span><label>Type</label> {{ DistributionTypeLabel.StandardUniform1 }}</span>
+				<span>
+					<label>Min</label>
+					{{ getParameterDistribution(modelConfiguration, parameterId).parameters.minimum }}
+				</span>
+				<span>
+					<label>Max</label>
+					{{ getParameterDistribution(modelConfiguration, parameterId).parameters.maximum }}
+				</span>
+			</template>
+		</span>
 	</div>
 	<tera-parameter-other-value-modal
 		v-if="showOtherConfigValueModal"
@@ -113,17 +133,19 @@ import TeraInputText from '@/components/widgets/tera-input-text.vue';
 import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
-import { DistributionType, distributionTypeOptions } from '@/services/distribution';
+import { DistributionType, DistributionTypeLabel, distributionTypeOptions } from '@/services/distribution';
 import { getParameter } from '@/model-representation/service';
 import TeraParameterOtherValueModal from '@/components/model/petrinet/tera-parameter-other-value-modal.vue';
 import { displayNumber } from '@/utils/number';
 import { getCurieFromGroundingIdentifier, getNameOfCurieCached } from '@/services/concept';
+import type { FeatureConfig } from '@/types/common';
 
 const props = defineProps<{
 	model: Model;
 	modelConfiguration: ModelConfiguration;
 	modelConfigurations: ModelConfiguration[];
 	parameterId: string;
+	featureConfig?: FeatureConfig;
 }>();
 
 const emit = defineEmits(['update-parameter', 'update-source']);
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
index d5460b4993..7fe72079c0 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
@@ -6,7 +6,7 @@
 					Parameters<span class="artifact-amount">({{ numParameters }})</span>
 				</span>
 				<Button
-					v-if="!isAddingUncertainty"
+					v-if="!isAddingUncertainty && !featureConfig?.isPreview"
 					label="Add uncertainty"
 					outlined
 					severity="secondary"
@@ -69,6 +69,7 @@
 													:model-configuration="props.modelConfiguration"
 													:model-configurations="props.modelConfigurations"
 													:parameter-id="referenceId"
+													:featureConfig="featureConfig"
 													@update-parameter="emit('update-parameters', [$event])"
 													@update-source="emit('update-source', $event)"
 												/>
@@ -96,6 +97,7 @@
 							:model-configuration="modelConfiguration"
 							:modelConfigurations="modelConfigurations"
 							:parameter-id="baseParameter"
+							:featureConfig="featureConfig"
 							@update-parameter="emit('update-parameters', [$event])"
 							@update-source="emit('update-source', $event)"
 						/>
@@ -143,6 +145,7 @@ import Dropdown from 'primevue/dropdown';
 import Checkbox from 'primevue/checkbox';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
 import Divider from 'primevue/divider';
+import type { FeatureConfig } from '@/types/common';
 import TeraParameterEntry from './tera-parameter-entry.vue';
 import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
 
@@ -152,6 +155,7 @@ const props = defineProps<{
 	modelConfigurations: ModelConfiguration[];
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
+	featureConfig?: FeatureConfig;
 }>();
 
 const emit = defineEmits(['update-parameters', 'update-source']);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
index 04d8888313..fbed20d4ba 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
@@ -82,8 +82,6 @@ watch(
 	() => props.node.state.inProgressId,
 	async (id) => {
 		if (!id || id === '') return;
-		console.log(props.node);
-		console.log('Polling funman status', id);
 
 		const response = await getStatus(id);
 		if (response.state === PollerState.Done) {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
index 22218f9959..bd928e0a0f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
@@ -31,16 +31,18 @@
 		<tera-initial-table
 			:model="model"
 			:model-configuration="validatedModelConfiguration"
-			:model-configurations="[validatedModelConfiguration]"
+			:model-configurations="[]"
 			:mmt="configuredMmt"
 			:mmt-params="mmtParams"
+			:feature-config="{ isPreview: true }"
 		/>
 		<tera-parameter-table
 			:model="model"
 			:model-configuration="validatedModelConfiguration"
-			:model-configurations="[validatedModelConfiguration]"
+			:model-configurations="[]"
 			:mmt="configuredMmt"
 			:mmt-params="mmtParams"
+			:feature-config="{ isPreview: true }"
 		/>
 		<Accordion :active-index="0" v-if="!isEmpty(calibratedConfigObservables)">
 			<AccordionTab v-if="!isEmpty(calibratedConfigObservables)" header="Observables">

From 46c5547af3620c3d4929c9767f7815d63451bc3e Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 17:13:34 -0400
Subject: [PATCH 05/16] no need to refetch model

---
 .../workflow/ops/funman/tera-funman-output.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
index bd928e0a0f..bc5af41ab1 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
@@ -81,7 +81,7 @@ import { logger } from '@/utils/logger';
 import type { Model, ModelConfiguration, Observable } from '@/types/Types';
 import { getModelByModelConfigurationId, getMMT } from '@/services/model';
 import type { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
-import { makeConfiguredMMT } from '@/model-representation/mira/mira';
+import { emptyMiraModel, makeConfiguredMMT } from '@/model-representation/mira/mira';
 
 const props = defineProps<{
 	runId: string;
@@ -92,6 +92,7 @@ const emit = defineEmits(['update:trajectoryState']);
 
 let processedFunmanResult: ProcessedFunmanResult | null = null;
 let constraintsResponse: FunmanConstraintsResponse[] = [];
+let mmt: MiraModel = emptyMiraModel();
 
 // Model configuration stuff
 const model = ref<Model | null>(null);
@@ -132,14 +133,17 @@ const initalize = async () => {
 	}
 
 	// For displaying model/model configuration
-	model.value = await getModelByModelConfigurationId(funmanResult.modelConfiguration.id);
+	// Model will be the same on runId change, no need to fetch it again
 	if (!model.value) {
-		logger.error('Failed to fetch model');
-		return;
+		model.value = await getModelByModelConfigurationId(funmanResult.modelConfiguration.id);
+		if (!model.value) {
+			logger.error('Failed to fetch model');
+			return;
+		}
+		const response = await getMMT(model.value);
+		mmt = response.mmt;
+		mmtParams.value = response.template_params;
 	}
-	const response = await getMMT(model.value);
-	const mmt = response.mmt;
-	mmtParams.value = response.template_params;
 
 	configuredMmt.value = makeConfiguredMMT(mmt, funmanResult.modelConfiguration);
 	calibratedConfigObservables.value = funmanResult.modelConfiguration.observableSemanticList.map(

From b2026d34db5ececa751f673a1978f3bcf085df76 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 19:34:49 -0400
Subject: [PATCH 06/16] a lil hack to fix the distrbution

---
 .../workflow/ops/funman/tera-funman-output.vue       |  2 --
 .../dataservice/modelparts/ModelDistribution.java    | 10 ++++++++++
 .../service/data/ModelConfigurationService.java      | 12 +++++++++---
 .../service/tasks/ValidateModelConfigHandler.java    |  3 ---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
index bc5af41ab1..172a8d55cb 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-output.vue
@@ -124,8 +124,6 @@ const initalize = async () => {
 	selectedState.value = props.trajectoryState ?? stateOptions.value[0];
 	updateStateChart();
 
-	console.log(funmanResult); /// //////////////////////////
-
 	// Parameter charts
 	const parametersOfInterest = funmanResult.request.parameters.filter((d: any) => d.label === 'all');
 	if (processedFunmanResult.boxes) {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
index c2093d7bfb..a7b391faaf 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
@@ -30,4 +30,14 @@ public ModelDistribution clone() {
 		clone.setType(this.getType());
 		return clone;
 	}
+
+	public boolean isMinimumEqualToMaximum() {
+		if (parameters == null) return false;
+		Object min = parameters.get("minimum");
+		Object max = parameters.get("maximum");
+		if (min instanceof Number && max instanceof Number) {
+			return ((Number) min).doubleValue() == ((Number) max).doubleValue();
+		}
+		return false;
+	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
index 05860b93ca..9fbfb313eb 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
@@ -184,7 +184,7 @@ private static List<ParameterSemantic> createParameterSemanticList(final Model m
 
 	private static ModelDistribution getModelDistribution(final ModelParameter parameter) {
 		ModelDistribution distribution = parameter.getDistribution();
-		// constant distribution
+		// Fill with constant distribution if it's missing
 		if (distribution == null || distribution.getType() == null) {
 			distribution = new ModelDistribution();
 			distribution.setType("Constant");
@@ -192,11 +192,17 @@ private static ModelDistribution getModelDistribution(final ModelParameter param
 		}
 
 		// NOTE: there isn't any difference between Uniform1 and StandardUniform1, so we
-		// are changing it to
-		// StandardUniform1 for consistenty sake
+		// are changing it to StandardUniform1 for consistenty sake
 		if (distribution.getType().equals("Uniform1")) {
 			distribution.setType("StandardUniform1");
 		}
+
+		// If minimum equals maximum force it to be a constant distribution (this is needed when converting funman model parameters into configuration parameters)
+		if (distribution.isMinimumEqualToMaximum()) {
+			distribution.setType("Constant");
+			distribution.setParameters(Map.of("value", distribution.getParameters().get("minimum")));
+		}
+
 		return distribution;
 	}
 
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ValidateModelConfigHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ValidateModelConfigHandler.java
index 8186dc8523..73e3f82413 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ValidateModelConfigHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ValidateModelConfigHandler.java
@@ -1,6 +1,5 @@
 package software.uncharted.terarium.hmiserver.service.tasks;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -20,7 +19,6 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
-import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
 
 @Component
@@ -32,7 +30,6 @@ public class ValidateModelConfigHandler extends TaskResponseHandler {
 
 	private final ObjectMapper objectMapper;
 	private final SimulationService simulationService;
-	private final ModelService modelService;
 	private final ModelConfigurationService modelConfigurationService;
 
 	@Override

From 37289bf0c818c6928a00d0b6b4259eb936951735 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 19:36:09 -0400
Subject: [PATCH 07/16] compose

---
 containers/scripts/docker-compose-taskrunner.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/containers/scripts/docker-compose-taskrunner.yml b/containers/scripts/docker-compose-taskrunner.yml
index f48271d486..bb358e4c08 100644
--- a/containers/scripts/docker-compose-taskrunner.yml
+++ b/containers/scripts/docker-compose-taskrunner.yml
@@ -69,7 +69,6 @@ services:
       - ../../packages/funman:/funman_task
       - ../../packages/taskrunner:/taskrunner
     command: /funman_task/dev.sh
-    platform: linux/amd64
 
   equation_extraction_cpu-taskrunner:
     build:

From d463c311b86d5ec65315b3144ba63fe962b5c4c5 Mon Sep 17 00:00:00 2001
From: shawnyama <shawnyama@users.noreply.github.com>
Date: Mon, 7 Oct 2024 23:36:21 +0000
Subject: [PATCH 08/16] chore: update generated types

---
 packages/client/hmi-client/src/types/Types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 3bb2fb504e..5aae55d8fb 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -792,6 +792,7 @@ export interface TerariumAssetThatSupportsAdditionalProperties extends TerariumA
 export interface ModelDistribution {
     type: string;
     parameters: { [index: string]: any };
+    minimumEqualToMaximum: boolean;
 }
 
 export interface ModelGrounding {

From a927a8c8111a05bbca9b21bc2f5d6591dea2628d Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 19:54:58 -0400
Subject: [PATCH 09/16] name output label

---
 .../workflow/ops/funman/tera-funman-node.vue  |  8 +-
 packages/taskrunner/core.dimacs               | 79 +++++++++++++++++++
 packages/taskrunner/unsat.core                |  1 +
 3 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 packages/taskrunner/core.dimacs
 create mode 100644 packages/taskrunner/unsat.core

diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
index fbed20d4ba..b7f3854ea2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
@@ -41,18 +41,16 @@ const addOutputPorts = async (runId: string) => {
 		logger.error('Failed to fetch funman result');
 		return;
 	}
-	const validatedConfigurationId = JSON.parse(rawFunmanResult).modelConfiguration.id;
-
-	const portLabel = props.node.inputs[0].label;
+	const validatedConfiguration = JSON.parse(rawFunmanResult).modelConfiguration;
 
 	const outState = _.cloneDeep(props.node.state);
 	outState.inProgressId = '';
 	outState.runId = runId;
 
 	emit('append-output', {
-		label: nodeOutputLabel(props.node, `${portLabel} Result`),
+		label: nodeOutputLabel(props.node, `${validatedConfiguration.name} Result`),
 		type: FunmanOperation.outputs[0].type,
-		value: validatedConfigurationId,
+		value: validatedConfiguration.id,
 		state: outState
 	});
 };
diff --git a/packages/taskrunner/core.dimacs b/packages/taskrunner/core.dimacs
new file mode 100644
index 0000000000..63af94cb9e
--- /dev/null
+++ b/packages/taskrunner/core.dimacs
@@ -0,0 +1,79 @@
+p cnf 366 78
+-2 3 -1 0
+-2 4 -1 0
+-2 5 -1 0
+-2 10 -1 0
+-2 -12 -1 0
+-2 -13 -1 0
+-2 -14 -1 0
+-2 -15 -1 0
+-2 19 -1 0
+-21 2 -1 0
+-35 36 -34 0
+-35 37 -34 0
+-35 38 -34 0
+-35 39 -34 0
+-35 -41 -34 0
+-35 -42 -34 0
+-35 -43 -34 0
+-46 35 -34 0
+-65 66 -58 0
+-65 67 -58 0
+-65 68 -58 0
+-65 69 -58 0
+-65 -71 -58 0
+-65 -72 -58 0
+-65 -73 -58 0
+-76 65 -58 0
+-98 99 -92 0
+-98 100 -92 0
+-98 101 -92 0
+-98 102 -92 0
+-98 -104 -92 0
+-98 -105 -92 0
+-98 -106 -92 0
+-109 98 -92 0
+-130 131 -124 0
+-130 132 -124 0
+-130 133 -124 0
+-130 134 -124 0
+-130 -136 -124 0
+-130 -137 -124 0
+-130 -138 -124 0
+-141 130 -124 0
+-161 162 -155 0
+-161 163 -155 0
+-161 164 -155 0
+-161 165 -155 0
+-161 -167 -155 0
+-161 -168 -155 0
+-161 -169 -155 0
+-161 171 -155 0
+-172 161 -155 0
+-187 188 185 -174 0
+-190 187 -174 0
+-190 191 -174 0
+-190 192 -174 0
+-190 193 -174 0
+-190 194 -174 0
+-190 -196 -174 0
+-190 -197 -174 0
+-190 -198 -174 0
+-190 -199 -174 0
+-201 190 -174 0
+7 -269 0
+8 -269 0
+9 -269 0
+-269 -360 0
+-16 -269 0
+18 -269 0
+-269 361 0
+21 -268 0
+201 -268 0
+172 -268 0
+141 -268 0
+109 -268 0
+76 -268 0
+46 -268 0
+-185 -268 0
+199 -188 -268 360 -361 -171 -194 -193 198 -192 197 -191 196 -134 -162 -163 -164 -165 167 168 169 -102 -131 -132 -133 136 137 138 -69 -99 -100 -101 104 105 106 -3 -4 -5 -7 -8 -9 -10 12 13 14 15 16 -18 -19 -36 -37 -38 -39 41 42 43 -66 -67 -68 71 72 73 0
diff --git a/packages/taskrunner/unsat.core b/packages/taskrunner/unsat.core
new file mode 100644
index 0000000000..c0636e83be
--- /dev/null
+++ b/packages/taskrunner/unsat.core
@@ -0,0 +1 @@
+(solve_step_0 and b((R0 == 0)) and b((I0 == 1)) and b((S0 == 2000)) and b((gamma < 0.029999999999999999)) and solve_step_6 and solve_step_5 and solve_step_4 and solve_step_3 and solve_step_2 and solve_step_1 and b((beta < 0.034082902420079845)) and (conj0 or !(solve_step_0)) and (b((R_0 == R0)) or !(conj0)) and (b((I_0 == I0)) or !(conj0)) and (b((S_0 == S0)) or !(conj0)) and (b((noninf_0 == (R_0 + S_0))) or !(conj0)) and (b((R_0 < 0)) or b((I_0 < 0)) or b((S_0 < 0)) or b((gamma < 0.010000000000000001)) or b((beta < 0.029999999999999999)) or b((R_10 < 0)) or b((I_10 < 0)) or b((S_10 < 0)) or b((R_20 < 0)) or b((I_20 < 0)) or b((S_20 < 0)) or b((R_30 < 0)) or b((I_30 < 0)) or b((S_30 < 0)) or b((R_40 < 0)) or b((I_40 < 0)) or b((S_40 < 0)) or b((R_50 < 0)) or b((I_50 < 0)) or b((S_50 < 0)) or b((R_60 < 0)) or b((I_60 < 0)) or b((S_60 < 0)) or b(((R_60 + I_60 + S_60) < 2000.9900000000001)) or b((gamma < 0.025653259569372048)) or !(b((R_0 == R0))) or !(b((I_0 == I0))) or !(b((S_0 == S0))) or !(b((R0 == 0))) or !(b((I0 == 1))) or !(b((S0 == 2000))) or !(b((noninf_0 == (R_0 + S_0)))) or !(b((gamma < 0.029999999999999999))) or !(b((beta < 0.050000000000000003))) or !(b((R_10 == (R_0 + 10 * (I_0 * gamma))))) or !(b((I_10 == (I_0 + 10 * (0.00400001 * (I_0 * S_0 * beta) - (I_0 * gamma)))))) or !(b((S_10 == (S_0 - 0.0400001 * (I_0 * S_0 * beta))))) or !(b((noninf_10 == (R_0 + S_0)))) or !(b((R_20 == (R_10 + 10 * (gamma * I_10))))) or !(b((I_20 == (I_10 + 10 * ( - (gamma * I_10) + 0.00400001 * (beta * I_10 * S_10)))))) or !(b((S_20 == (S_10 - 0.0400001 * (beta * I_10 * S_10))))) or !(b((noninf_20 == (R_0 + S_0)))) or !(b((R_30 == (R_20 + 10 * (gamma * I_20))))) or !(b((I_30 == (I_20 + 10 * ( - (gamma * I_20) + 0.00400001 * (beta * I_20 * S_20)))))) or !(b((S_30 == (S_20 - 0.0400001 * (beta * I_20 * S_20))))) or !(b((noninf_30 == (R_0 + S_0)))) or !(b((R_40 == (R_30 + 10 * (gamma * I_30))))) or !(b((I_40 == (I_30 + 10 * ( - (gamma * I_30) + 0.00400001 * (beta * I_30 * S_30)))))) or !(b((S_40 == (S_30 - 0.0400001 * (beta * I_30 * S_30))))) or !(b((noninf_40 == (R_0 + S_0)))) or !(b((R_50 == (R_40 + 10 * (gamma * I_40))))) or !(b((I_50 == (I_40 + 10 * ( - (gamma * I_40) + 0.00400001 * (beta * I_40 * S_40)))))) or !(b((S_50 == (S_40 - 0.0400001 * (beta * I_40 * S_40))))) or !(b((noninf_50 == (R_0 + S_0)))) or !(b(((R_50 + I_50 + S_50) <= 2001.0100000000003))) or !(b(((R_60 + S_60) < 500))) or !(b((R_60 == (R_50 + 10 * (gamma * I_50))))) or !(b((I_60 == (I_50 + 10 * ( - (gamma * I_50) + 0.00400001 * (beta * I_50 * S_50)))))) or !(b((S_60 == (S_50 - 0.0400001 * (beta * I_50 * S_50))))) or !(b((noninf_60 == (R_0 + S_0)))) or !(b((beta < 0.034082902420079845)))) and (b((beta < 0.050000000000000003)) or !(conj0)) and (conj3 or !(solve_step_1)) and (b((R_10 == (R_0 + 10 * (I_0 * gamma)))) or !(conj3)) and (b((I_10 == (I_0 + 10 * (0.00400001 * (I_0 * S_0 * beta) - (I_0 * gamma))))) or !(conj3)) and (b((S_10 == (S_0 - 0.0400001 * (I_0 * S_0 * beta)))) or !(conj3)) and (b((noninf_10 == (R_0 + S_0))) or !(conj3)) and (conj6 or !(solve_step_2)) and (b((R_20 == (R_10 + 10 * (gamma * I_10)))) or !(conj6)) and (b((I_20 == (I_10 + 10 * ( - (gamma * I_10) + 0.00400001 * (beta * I_10 * S_10))))) or !(conj6)) and (b((S_20 == (S_10 - 0.0400001 * (beta * I_10 * S_10)))) or !(conj6)) and (b((noninf_20 == (R_0 + S_0))) or !(conj6)) and (conj10 or !(solve_step_3)) and (b((R_30 == (R_20 + 10 * (gamma * I_20)))) or !(conj10)) and (b((I_30 == (I_20 + 10 * ( - (gamma * I_20) + 0.00400001 * (beta * I_20 * S_20))))) or !(conj10)) and (b((S_30 == (S_20 - 0.0400001 * (beta * I_20 * S_20)))) or !(conj10)) and (b((noninf_30 == (R_0 + S_0))) or !(conj10)) and (conj14 or !(solve_step_4)) and (b((R_40 == (R_30 + 10 * (gamma * I_30)))) or !(conj14)) and (b((I_40 == (I_30 + 10 * ( - (gamma * I_30) + 0.00400001 * (beta * I_30 * S_30))))) or !(conj14)) and (b((S_40 == (S_30 - 0.0400001 * (beta * I_30 * S_30)))) or !(conj14)) and (b((noninf_40 == (R_0 + S_0))) or !(conj14)) and (conj18 or !(solve_step_5)) and (b((R_50 == (R_40 + 10 * (gamma * I_40)))) or !(conj18)) and (b((I_50 == (I_40 + 10 * ( - (gamma * I_40) + 0.00400001 * (beta * I_40 * S_40))))) or !(conj18)) and (b((S_50 == (S_40 - 0.0400001 * (beta * I_40 * S_40)))) or !(conj18)) and (b((noninf_50 == (R_0 + S_0))) or !(conj18)) and (b(((R_50 + I_50 + S_50) <= 2001.0100000000003)) or !(conj18)) and (assume_Constraint_1_60 or b(((R_60 + S_60) < 500)) or !(disj23)) and (disj23 or !(conj22)) and (conj22 or !(solve_step_6)) and (b((R_60 == (R_50 + 10 * (gamma * I_50)))) or !(conj22)) and (b((I_60 == (I_50 + 10 * ( - (gamma * I_50) + 0.00400001 * (beta * I_50 * S_50))))) or !(conj22)) and (b((S_60 == (S_50 - 0.0400001 * (beta * I_50 * S_50)))) or !(conj22)) and (b((noninf_60 == (R_0 + S_0))) or !(conj22)) and (!(conj0) or !(b((R_0 < 0)))) and (!(conj0) or !(b((I_0 < 0)))) and (!(conj0) or !(b((S_0 < 0)))) and (!(conj0) or !(b((gamma < 0.010000000000000001)))) and (!(conj3) or !(b((R_10 < 0)))) and (!(conj3) or !(b((I_10 < 0)))) and (!(conj3) or !(b((S_10 < 0)))) and (!(conj6) or !(b((R_20 < 0)))) and (!(conj6) or !(b((I_20 < 0)))) and (!(conj6) or !(b((S_20 < 0)))) and (!(conj10) or !(b((R_30 < 0)))) and (!(conj10) or !(b((I_30 < 0)))) and (!(conj10) or !(b((S_30 < 0)))) and (!(conj14) or !(b((R_40 < 0)))) and (!(conj14) or !(b((I_40 < 0)))) and (!(conj14) or !(b((S_40 < 0)))) and (!(conj18) or !(b((R_50 < 0)))) and (!(conj18) or !(b((I_50 < 0)))) and (!(conj18) or !(b((S_50 < 0)))) and (!(conj22) or !(b((R_60 < 0)))) and (!(conj22) or !(b((I_60 < 0)))) and (!(conj22) or !(b((S_60 < 0)))) and (!(conj22) or !(b(((R_60 + I_60 + S_60) < 2000.9900000000001)))) and !(b((beta < 0.029999999999999999))) and !(assume_Constraint_1_60) and !(b((gamma < 0.025653259569372048))))
\ No newline at end of file

From e1ea2c670d40ca69e4177ca06b184878458a1381 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 20:02:41 -0400
Subject: [PATCH 10/16] use json ignore

---
 packages/client/hmi-client/src/types/Types.ts                   | 1 -
 .../models/dataservice/modelparts/ModelDistribution.java        | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 5aae55d8fb..3bb2fb504e 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -792,7 +792,6 @@ export interface TerariumAssetThatSupportsAdditionalProperties extends TerariumA
 export interface ModelDistribution {
     type: string;
     parameters: { [index: string]: any };
-    minimumEqualToMaximum: boolean;
 }
 
 export interface ModelGrounding {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
index a7b391faaf..dab90c5729 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelDistribution.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.modelparts;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Map;
@@ -31,6 +32,7 @@ public ModelDistribution clone() {
 		return clone;
 	}
 
+	@JsonIgnore
 	public boolean isMinimumEqualToMaximum() {
 		if (parameters == null) return false;
 		Object min = parameters.get("minimum");

From 0ef4f84a1438c5cd554ec878380bf8211f755e28 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 20:03:22 -0400
Subject: [PATCH 11/16] Delete packages/taskrunner/core.dimacs

---
 packages/taskrunner/core.dimacs | 79 ---------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 packages/taskrunner/core.dimacs

diff --git a/packages/taskrunner/core.dimacs b/packages/taskrunner/core.dimacs
deleted file mode 100644
index 63af94cb9e..0000000000
--- a/packages/taskrunner/core.dimacs
+++ /dev/null
@@ -1,79 +0,0 @@
-p cnf 366 78
--2 3 -1 0
--2 4 -1 0
--2 5 -1 0
--2 10 -1 0
--2 -12 -1 0
--2 -13 -1 0
--2 -14 -1 0
--2 -15 -1 0
--2 19 -1 0
--21 2 -1 0
--35 36 -34 0
--35 37 -34 0
--35 38 -34 0
--35 39 -34 0
--35 -41 -34 0
--35 -42 -34 0
--35 -43 -34 0
--46 35 -34 0
--65 66 -58 0
--65 67 -58 0
--65 68 -58 0
--65 69 -58 0
--65 -71 -58 0
--65 -72 -58 0
--65 -73 -58 0
--76 65 -58 0
--98 99 -92 0
--98 100 -92 0
--98 101 -92 0
--98 102 -92 0
--98 -104 -92 0
--98 -105 -92 0
--98 -106 -92 0
--109 98 -92 0
--130 131 -124 0
--130 132 -124 0
--130 133 -124 0
--130 134 -124 0
--130 -136 -124 0
--130 -137 -124 0
--130 -138 -124 0
--141 130 -124 0
--161 162 -155 0
--161 163 -155 0
--161 164 -155 0
--161 165 -155 0
--161 -167 -155 0
--161 -168 -155 0
--161 -169 -155 0
--161 171 -155 0
--172 161 -155 0
--187 188 185 -174 0
--190 187 -174 0
--190 191 -174 0
--190 192 -174 0
--190 193 -174 0
--190 194 -174 0
--190 -196 -174 0
--190 -197 -174 0
--190 -198 -174 0
--190 -199 -174 0
--201 190 -174 0
-7 -269 0
-8 -269 0
-9 -269 0
--269 -360 0
--16 -269 0
-18 -269 0
--269 361 0
-21 -268 0
-201 -268 0
-172 -268 0
-141 -268 0
-109 -268 0
-76 -268 0
-46 -268 0
--185 -268 0
-199 -188 -268 360 -361 -171 -194 -193 198 -192 197 -191 196 -134 -162 -163 -164 -165 167 168 169 -102 -131 -132 -133 136 137 138 -69 -99 -100 -101 104 105 106 -3 -4 -5 -7 -8 -9 -10 12 13 14 15 16 -18 -19 -36 -37 -38 -39 41 42 43 -66 -67 -68 71 72 73 0

From 202a7df810bd431489f13e6fee1026789ccef50f Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Mon, 7 Oct 2024 20:03:33 -0400
Subject: [PATCH 12/16] Delete packages/taskrunner/unsat.core

---
 packages/taskrunner/unsat.core | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 packages/taskrunner/unsat.core

diff --git a/packages/taskrunner/unsat.core b/packages/taskrunner/unsat.core
deleted file mode 100644
index c0636e83be..0000000000
--- a/packages/taskrunner/unsat.core
+++ /dev/null
@@ -1 +0,0 @@
-(solve_step_0 and b((R0 == 0)) and b((I0 == 1)) and b((S0 == 2000)) and b((gamma < 0.029999999999999999)) and solve_step_6 and solve_step_5 and solve_step_4 and solve_step_3 and solve_step_2 and solve_step_1 and b((beta < 0.034082902420079845)) and (conj0 or !(solve_step_0)) and (b((R_0 == R0)) or !(conj0)) and (b((I_0 == I0)) or !(conj0)) and (b((S_0 == S0)) or !(conj0)) and (b((noninf_0 == (R_0 + S_0))) or !(conj0)) and (b((R_0 < 0)) or b((I_0 < 0)) or b((S_0 < 0)) or b((gamma < 0.010000000000000001)) or b((beta < 0.029999999999999999)) or b((R_10 < 0)) or b((I_10 < 0)) or b((S_10 < 0)) or b((R_20 < 0)) or b((I_20 < 0)) or b((S_20 < 0)) or b((R_30 < 0)) or b((I_30 < 0)) or b((S_30 < 0)) or b((R_40 < 0)) or b((I_40 < 0)) or b((S_40 < 0)) or b((R_50 < 0)) or b((I_50 < 0)) or b((S_50 < 0)) or b((R_60 < 0)) or b((I_60 < 0)) or b((S_60 < 0)) or b(((R_60 + I_60 + S_60) < 2000.9900000000001)) or b((gamma < 0.025653259569372048)) or !(b((R_0 == R0))) or !(b((I_0 == I0))) or !(b((S_0 == S0))) or !(b((R0 == 0))) or !(b((I0 == 1))) or !(b((S0 == 2000))) or !(b((noninf_0 == (R_0 + S_0)))) or !(b((gamma < 0.029999999999999999))) or !(b((beta < 0.050000000000000003))) or !(b((R_10 == (R_0 + 10 * (I_0 * gamma))))) or !(b((I_10 == (I_0 + 10 * (0.00400001 * (I_0 * S_0 * beta) - (I_0 * gamma)))))) or !(b((S_10 == (S_0 - 0.0400001 * (I_0 * S_0 * beta))))) or !(b((noninf_10 == (R_0 + S_0)))) or !(b((R_20 == (R_10 + 10 * (gamma * I_10))))) or !(b((I_20 == (I_10 + 10 * ( - (gamma * I_10) + 0.00400001 * (beta * I_10 * S_10)))))) or !(b((S_20 == (S_10 - 0.0400001 * (beta * I_10 * S_10))))) or !(b((noninf_20 == (R_0 + S_0)))) or !(b((R_30 == (R_20 + 10 * (gamma * I_20))))) or !(b((I_30 == (I_20 + 10 * ( - (gamma * I_20) + 0.00400001 * (beta * I_20 * S_20)))))) or !(b((S_30 == (S_20 - 0.0400001 * (beta * I_20 * S_20))))) or !(b((noninf_30 == (R_0 + S_0)))) or !(b((R_40 == (R_30 + 10 * (gamma * I_30))))) or !(b((I_40 == (I_30 + 10 * ( - (gamma * I_30) + 0.00400001 * (beta * I_30 * S_30)))))) or !(b((S_40 == (S_30 - 0.0400001 * (beta * I_30 * S_30))))) or !(b((noninf_40 == (R_0 + S_0)))) or !(b((R_50 == (R_40 + 10 * (gamma * I_40))))) or !(b((I_50 == (I_40 + 10 * ( - (gamma * I_40) + 0.00400001 * (beta * I_40 * S_40)))))) or !(b((S_50 == (S_40 - 0.0400001 * (beta * I_40 * S_40))))) or !(b((noninf_50 == (R_0 + S_0)))) or !(b(((R_50 + I_50 + S_50) <= 2001.0100000000003))) or !(b(((R_60 + S_60) < 500))) or !(b((R_60 == (R_50 + 10 * (gamma * I_50))))) or !(b((I_60 == (I_50 + 10 * ( - (gamma * I_50) + 0.00400001 * (beta * I_50 * S_50)))))) or !(b((S_60 == (S_50 - 0.0400001 * (beta * I_50 * S_50))))) or !(b((noninf_60 == (R_0 + S_0)))) or !(b((beta < 0.034082902420079845)))) and (b((beta < 0.050000000000000003)) or !(conj0)) and (conj3 or !(solve_step_1)) and (b((R_10 == (R_0 + 10 * (I_0 * gamma)))) or !(conj3)) and (b((I_10 == (I_0 + 10 * (0.00400001 * (I_0 * S_0 * beta) - (I_0 * gamma))))) or !(conj3)) and (b((S_10 == (S_0 - 0.0400001 * (I_0 * S_0 * beta)))) or !(conj3)) and (b((noninf_10 == (R_0 + S_0))) or !(conj3)) and (conj6 or !(solve_step_2)) and (b((R_20 == (R_10 + 10 * (gamma * I_10)))) or !(conj6)) and (b((I_20 == (I_10 + 10 * ( - (gamma * I_10) + 0.00400001 * (beta * I_10 * S_10))))) or !(conj6)) and (b((S_20 == (S_10 - 0.0400001 * (beta * I_10 * S_10)))) or !(conj6)) and (b((noninf_20 == (R_0 + S_0))) or !(conj6)) and (conj10 or !(solve_step_3)) and (b((R_30 == (R_20 + 10 * (gamma * I_20)))) or !(conj10)) and (b((I_30 == (I_20 + 10 * ( - (gamma * I_20) + 0.00400001 * (beta * I_20 * S_20))))) or !(conj10)) and (b((S_30 == (S_20 - 0.0400001 * (beta * I_20 * S_20)))) or !(conj10)) and (b((noninf_30 == (R_0 + S_0))) or !(conj10)) and (conj14 or !(solve_step_4)) and (b((R_40 == (R_30 + 10 * (gamma * I_30)))) or !(conj14)) and (b((I_40 == (I_30 + 10 * ( - (gamma * I_30) + 0.00400001 * (beta * I_30 * S_30))))) or !(conj14)) and (b((S_40 == (S_30 - 0.0400001 * (beta * I_30 * S_30)))) or !(conj14)) and (b((noninf_40 == (R_0 + S_0))) or !(conj14)) and (conj18 or !(solve_step_5)) and (b((R_50 == (R_40 + 10 * (gamma * I_40)))) or !(conj18)) and (b((I_50 == (I_40 + 10 * ( - (gamma * I_40) + 0.00400001 * (beta * I_40 * S_40))))) or !(conj18)) and (b((S_50 == (S_40 - 0.0400001 * (beta * I_40 * S_40)))) or !(conj18)) and (b((noninf_50 == (R_0 + S_0))) or !(conj18)) and (b(((R_50 + I_50 + S_50) <= 2001.0100000000003)) or !(conj18)) and (assume_Constraint_1_60 or b(((R_60 + S_60) < 500)) or !(disj23)) and (disj23 or !(conj22)) and (conj22 or !(solve_step_6)) and (b((R_60 == (R_50 + 10 * (gamma * I_50)))) or !(conj22)) and (b((I_60 == (I_50 + 10 * ( - (gamma * I_50) + 0.00400001 * (beta * I_50 * S_50))))) or !(conj22)) and (b((S_60 == (S_50 - 0.0400001 * (beta * I_50 * S_50)))) or !(conj22)) and (b((noninf_60 == (R_0 + S_0))) or !(conj22)) and (!(conj0) or !(b((R_0 < 0)))) and (!(conj0) or !(b((I_0 < 0)))) and (!(conj0) or !(b((S_0 < 0)))) and (!(conj0) or !(b((gamma < 0.010000000000000001)))) and (!(conj3) or !(b((R_10 < 0)))) and (!(conj3) or !(b((I_10 < 0)))) and (!(conj3) or !(b((S_10 < 0)))) and (!(conj6) or !(b((R_20 < 0)))) and (!(conj6) or !(b((I_20 < 0)))) and (!(conj6) or !(b((S_20 < 0)))) and (!(conj10) or !(b((R_30 < 0)))) and (!(conj10) or !(b((I_30 < 0)))) and (!(conj10) or !(b((S_30 < 0)))) and (!(conj14) or !(b((R_40 < 0)))) and (!(conj14) or !(b((I_40 < 0)))) and (!(conj14) or !(b((S_40 < 0)))) and (!(conj18) or !(b((R_50 < 0)))) and (!(conj18) or !(b((I_50 < 0)))) and (!(conj18) or !(b((S_50 < 0)))) and (!(conj22) or !(b((R_60 < 0)))) and (!(conj22) or !(b((I_60 < 0)))) and (!(conj22) or !(b((S_60 < 0)))) and (!(conj22) or !(b(((R_60 + I_60 + S_60) < 2000.9900000000001)))) and !(b((beta < 0.029999999999999999))) and !(assume_Constraint_1_60) and !(b((gamma < 0.025653259569372048))))
\ No newline at end of file

From e1876d4b4b85589d850be0096315fc44f3455362 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Tue, 8 Oct 2024 12:29:43 -0400
Subject: [PATCH 13/16] show label names

---
 .../components/workflow/ops/funman/tera-funman-drilldown.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
index 5d21cff74a..b3f6e66a86 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
@@ -88,12 +88,11 @@
 								<label>Select parameters of interest</label>
 								<MultiSelect
 									ref="columnSelect"
+									class="w-full mt-1 mb-2"
 									:modelValue="variablesOfInterest"
 									:options="requestParameters.map((d: any) => d.name)"
 									:show-toggle-all="false"
-									class="w-full mt-1 mb-2"
 									@update:modelValue="onToggleVariableOfInterest"
-									:maxSelectedLabels="1"
 									placeholder="Select variables"
 								/>
 								<div class="mb-2 timespan">
@@ -348,6 +347,8 @@ const runMakeQuery = async () => {
 		}
 	};
 
+	console.log(request);
+
 	const response = await makeQueries(request, originalModelId);
 
 	// Setup the in-progress id

From fc03e1d1d323234cd3e6585eec28e91934abc680 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Tue, 8 Oct 2024 12:31:30 -0400
Subject: [PATCH 14/16] rm log

---
 .../components/workflow/ops/funman/tera-funman-drilldown.vue    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
index b3f6e66a86..47aeaeb31f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue
@@ -347,8 +347,6 @@ const runMakeQuery = async () => {
 		}
 	};
 
-	console.log(request);
-
 	const response = await makeQueries(request, originalModelId);
 
 	// Setup the in-progress id

From e9a0af60b893064295e5afb1e070376bbfcb2a01 Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Tue, 8 Oct 2024 13:20:21 -0400
Subject: [PATCH 15/16] compose

---
 containers/scripts/docker-compose-taskrunner.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/containers/scripts/docker-compose-taskrunner.yml b/containers/scripts/docker-compose-taskrunner.yml
index bb358e4c08..f48271d486 100644
--- a/containers/scripts/docker-compose-taskrunner.yml
+++ b/containers/scripts/docker-compose-taskrunner.yml
@@ -69,6 +69,7 @@ services:
       - ../../packages/funman:/funman_task
       - ../../packages/taskrunner:/taskrunner
     command: /funman_task/dev.sh
+    platform: linux/amd64
 
   equation_extraction_cpu-taskrunner:
     build:

From bdb3288b496ad4829d242bb2517fa9567f8b0adb Mon Sep 17 00:00:00 2001
From: Shawn Yama <syama@uncharted.software>
Date: Tue, 8 Oct 2024 14:34:55 -0400
Subject: [PATCH 16/16] p tag

---
 .../src/components/model/petrinet/tera-parameter-entry.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
index 040e329ab9..1c8d0ba0f8 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
@@ -93,7 +93,7 @@
 				/>
 			</footer>
 		</template>
-		<span class="flex gap-4" v-else>
+		<p class="flex gap-4" v-else>
 			<template v-if="getParameterDistribution(modelConfiguration, parameterId).type === DistributionType.Constant">
 				<span><label>Type</label> {{ DistributionTypeLabel.Constant }}</span>
 				<span>
@@ -112,7 +112,7 @@
 					{{ getParameterDistribution(modelConfiguration, parameterId).parameters.maximum }}
 				</span>
 			</template>
-		</span>
+		</p>
 	</div>
 	<tera-parameter-other-value-modal
 		v-if="showOtherConfigValueModal"