diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts index dca05a4bd2..147d482608 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts +++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts @@ -182,16 +182,12 @@ export async function getOptimizedInterventions(optimizeRunId: string) { allInterventions.push(newIntervetion); }); - // At the moment we only accept one intervention type. Pyciemss, pyciemss-service and this will all need to be updated. - // https://github.com/DARPA-ASKEM/terarium/issues/3909 const interventionType = optimizeInterventions.intervention_type ?? ''; const paramNames: string[] = optimizeInterventions.param_names ?? []; const paramValues: number[] = optimizeInterventions.param_values ?? []; const startTimes: number[] = optimizeInterventions.start_time ?? []; const policyResult = await getRunResult(optimizeRunId, 'policy.json'); - // TODO: https://github.com/DARPA-ASKEM/terarium/issues/3909 - // This will need to be updated to allow multiple intervention types. This is not allowed at the moment. if (interventionType === OptimizationInterventionObjective.startTime && startTimes.length !== 0) { // If we our intervention type is param value our policyResult will provide a timestep. for (let i = 0; i < paramNames.length; i++) { diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue index 0122f2d918..3693fce78d 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue @@ -30,7 +30,7 @@
-
Success criteria
+
Success criteria
-
- Intervention policy - -
+
Intervention policy
-

No intervention policies have been added.

-
- Optimization settings - -
+
Optimization settings
@@ -158,11 +151,7 @@
-
- Output settings - -
- +
Output settings
-
- Success Criteria - -
+
Success Criteria
-
- Interventions - -
+
Interventions
-
- Simulation plots - -
+
Simulation plots
- -
- - -
-
- - -
-
({ interventionPolicyGroups: props.node.state.interventionPolicyGroups ?? [] }); -const criteriaTooltip = 'TODO'; -const interventionPolicyToolTip = 'TODO'; -const optimizeSettingsToolTip = 'TODO'; -const outputSettingsToolTip = 'TODO'; - const summaryCheckbox = ref(true); const successDisplayChartsCheckbox = ref(true); const interventionsDisplayChartsCheckbox = ref(true); const simulationDisplayChartsCheckbox = ref(true); -const modelConfigName = ref(''); -const modelConfigDesc = ref(''); const showSaveDataDialog = ref(false); const showSaveInterventionPolicy = ref(false); @@ -538,7 +494,6 @@ const datasetId = computed(() => { return output?.value?.[0]?.datasetId ?? ''; }); -const showModelModal = ref(false); const displayOptimizationResultMessage = ref(true); const isRunDisabled = computed(() => { @@ -868,32 +823,6 @@ const setOutputSettingDefaults = () => { } }; -// TODO: utlize with https://github.com/DARPA-ASKEM/terarium/issues/4767 -const saveModelConfiguration = async () => { - if (!modelConfiguration.value) return; - - if (!knobs.value.optimizationRunId) { - logger.error('No optimization run to create model configuration from'); - } - - // TODO: use new interventions - // const optRunId = knobs.value.optimizationRunId; - // const interventions = await getOptimizedInterventions(optRunId); - const configClone = cloneDeep(modelConfiguration.value); - - // setInterventions(configClone, interventions); - configClone.name = modelConfigName.value; - configClone.description = modelConfigDesc.value; - const data = await createModelConfiguration(configClone); - if (!data) { - logger.error('Failed to create model configuration'); - return; - } - - logger.success('Created model configuration'); - showModelModal.value = false; -}; - const setOutputValues = async () => { const preForecastRunId = knobs.value.preForecastRunId; const postForecastRunId = knobs.value.postForecastRunId;