3764 research how we can save calibrated configurations from a dill f…

…ile (#3829) Co-authored-by: dvince2 <[email protected]>
DARPA-ASKEM · Jun 12, 2024 · 8282043 · 8282043
1 parent d69a795
commit 8282043
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
@@ -164,6 +164,7 @@ export interface Dataset extends TerariumAsset {
 
 export interface DatasetColumn extends TerariumEntity {
  name: string;
+ fileName: string;
  dataType: ColumnType;
  formatStr?: string;
  annotations: string[];
@@ -239,6 +240,7 @@ export interface InitialSemantic extends Semantic {
 export interface ModelConfiguration extends TerariumAsset {
  calibrationRunId: string;
  modelId: string;
+ simulationId?: string;
  observableSemanticList: ObservableSemantic[];
  parameterSemanticList: ParameterSemantic[];
  initialSemanticList: InitialSemantic[];

diff --git a/...harted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/...harted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -12,6 +12,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.annotations.TSOptional;
 import software.uncharted.terarium.hmiserver.models.TerariumAsset;
 
 @EqualsAndHashCode(callSuper = true)
@@ -23,6 +24,10 @@ public class ModelConfiguration extends TerariumAsset {
  private UUID calibrationRunId;
  private UUID modelId;
 
+ /** This is "simulation" in the sense of our POJO. It actually corresponds to a pyciemss calibration */
+ @TSOptional
+ private UUID simulationId;
+
  @OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
  @JsonManagedReference
  private List<ObservableSemantic> observableSemanticList = new ArrayList<>();