Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename optimize static interventions. #4611

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Rename optimize static interventions. #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,9 +741,7 @@ const runOptimize = async () => {
};

// These are interventions to be considered but not optimized over.
const fixedStaticParameterInterventions: Intervention[] = _.cloneDeep(
inactivePolicyGroups.value.map((ele) => ele.intervention)
);
const fixedInterventions: Intervention[] = _.cloneDeep(inactivePolicyGroups.value.map((ele) => ele.intervention));

// TODO: https://github.com/DARPA-ASKEM/terarium/issues/3909
// The method should be a list but pyciemss + pyciemss service is not yet ready for this.
Expand All @@ -761,7 +759,7 @@ const runOptimize = async () => {
end: knobs.value.endTime
},
optimizeInterventions,
fixedStaticParameterInterventions,
fixedInterventions,
qoi,
riskBound: props.node.state.constraintGroups[0].threshold, // TODO: https://github.com/DARPA-ASKEM/terarium/issues/3909
boundsInterventions: listBoundsInterventions,
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/types/Types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ export interface OptimizeRequestCiemss {
modelConfigId: string;
timespan: TimeSpan;
optimizeInterventions?: OptimizeInterventions;
fixedStaticParameterInterventions?: Intervention[];
fixedInterventions?: Intervention[];
loggingStepSize?: number;
qoi: OptimizeQoi;
riskBound: number;
Expand Down
4 changes: 2 additions & 2 deletions ...software/uncharted/terarium/hmiserver/models/simulationservice/OptimizeRequestCiemss.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public class OptimizeRequestCiemss implements Serializable {
private OptimizeInterventions optimizeInterventions;

@TSOptional
@JsonAlias("fixed_static_parameter_interventions")
private List<Intervention> fixedStaticParameterInterventions;
@JsonAlias("fixed_interventions")
private List<Intervention> fixedInterventions;

@JsonAlias("logging_step_size")
@TSOptional
Expand Down
Loading