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

refactor stratify related components , fix equations to model saving #4369

Merged
merged 8 commits into from
Aug 6, 2024
Merged

refactor stratify related components , fix equations to model saving #4369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4dd5a44
attempt and clean up
shawnyama Aug 6, 2024
0167799
rm comments, fix model save
shawnyama Aug 6, 2024
863beb9
Merge branch 'main' into parameter-matrix-fix
shawnyama Aug 6, 2024
977d8b0
rm comments
shawnyama Aug 6, 2024
e0c9dc8
Merge branch 'parameter-matrix-fix' of https://github.com/DARPA-ASKEM…
shawnyama Aug 6, 2024
cfe9e58
Merge branch 'main' into parameter-matrix-fix
shawnyama Aug 6, 2024
9d27406
rm section
shawnyama Aug 6, 2024
e79f4ab
Merge branch 'parameter-matrix-fix' of https://github.com/DARPA-ASKEM…
shawnyama Aug 6, 2024
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
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ footer {
header {
display: inline-flex;
justify-content: space-between;
padding: var(--gap-2) 0;
padding: var(--gap-4) 0;
gap: var(--gap-3);
}

header > div {
display: inline-flex;
gap: var(--gap-small);
gap: var(--gap-1);
align-items: center;
}

Expand Down
7 changes: 1 addition & 6 deletions ...ent/src/components/model/petrinet/model-configurations/tera-stratified-matrix-preview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@
</div>
<div class="matrix-grid">
<template v-for="row in matrix">
<div
class="cell"
:class="{ 'filled-cell': cell.content.id }"
v-for="(cell, colIdx) in row"
:key="colIdx"
></div>
<div class="cell" :class="{ 'filled-cell': cell.content.id }" v-for="(cell, colIdx) in row" :key="colIdx" />
</template>
</div>
</section>
Expand Down
10 changes: 2 additions & 8 deletions .../src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,7 @@
</template>
</tera-drilldown-section>
<tera-drilldown-preview>
<section v-if="selectedModel">
<tera-model-description
:model="selectedModel"
:feature-config="{ isPreview: true }"
:generating-card="isGeneratingCard"
/>
</section>
<tera-model-description v-if="selectedModel" :model="selectedModel" :generating-card="isGeneratingCard" />
<tera-operator-placeholder v-else :node="node" style="height: 100%" />
</tera-drilldown-preview>
</tera-columnar-panel>
Expand All @@ -120,7 +114,7 @@
</tera-drilldown>
<tera-save-asset-modal
v-if="selectedModel"
:model="selectedModel"
:asset="selectedModel"
:is-visible="showSaveModelModal"
@close-modal="onCloseModelModal"
@on-save="onAddModel"
Expand Down
66 changes: 32 additions & 34 deletions packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,39 @@
>
<div :tabName="StratifyTabs.Wizard">
<tera-drilldown-section class="pl-4">
<div class="form-section">
<header class="inline-flex justify-content-between">
<section>
<h5>Stratify model</h5>
<p>The model will be stratified with the following settings.</p>
<p v-if="node.state.hasCodeBeenRun" class="code-executed-warning">
Note: Code has been executed which may not be reflected here.
</p>
</section>
<section>
<Button
style="margin-right: auto"
size="small"
severity="secondary"
outlined
label="Reset"
@click="resetModel"
class="mr-2"
/>
<Button
:disabled="isStratifyButtonDisabled"
:label="stratifyButtonLabel"
size="small"
icon="pi pi-play"
@click="stratifyModel"
/>
</section>
</header>
<tera-stratification-group-form
class="mt-2"
:model-node-options="modelNodeOptions"
:config="node.state.strataGroup"
@update-self="updateStratifyGroupForm"
<template #header-controls-left>
<section>
<h5>Stratify model</h5>
<p>The model will be stratified with the following settings.</p>
<p v-if="node.state.hasCodeBeenRun" class="code-executed-warning">
Note: Code has been executed which may not be reflected here.
</p>
</section>
</template>
<template #header-controls-right>
<Button
style="margin-right: auto"
size="small"
severity="secondary"
outlined
label="Reset"
@click="resetModel"
class="mr-2"
/>
</div>
<Button
:disabled="isStratifyButtonDisabled"
:label="stratifyButtonLabel"
size="small"
icon="pi pi-play"
@click="stratifyModel"
/>
</template>
<tera-stratification-group-form
class="mt-2"
:model-node-options="modelNodeOptions"
:config="node.state.strataGroup"
@update-self="updateStratifyGroupForm"
/>
</tera-drilldown-section>
</div>
<div :tabName="StratifyTabs.Notebook">
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/model-representation/mira/mira-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export const extractTemplateMatrix = (templates: MiraTemplate[]) => {
const rowNames = extractConceptNames(templates, 'subject');
const colNames = extractConceptNames(templates, 'outcome');

// Not sure how to parse templates with no subejct or no outcomes
// Not sure how to parse templates with no subject or no outcomes
// and interacts with only controllers and itself, return a matrix
// with a single row for now - Mar 13, 2024
if (rowNames.length === 0 || colNames.length === 0) {
Expand Down
1 change: 1 addition & 0 deletions packages/client/hmi-client/src/model-representation/mira/mira.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ export const collapseTemplates = (miraModel: MiraModel) => {
if (!tempMatrixMap.has(key)) {
tempMatrixMap.set(key, []);
}

const originalTemplate = templateMap.get(t.name);
tempMatrixMap.get(key)?.push(originalTemplate as MiraTemplate);

Expand Down
Loading