Skip to content

[ModelicaSystemDoE] rename simple => non_structural #368

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

Merged
merged 2 commits into from
Nov 14, 2025
Merged

[ModelicaSystemDoE] rename simple => non_structural #368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dea276
[ModelicaSystemDoE] rename simple => non_structural
syntron Nov 4, 2025
96d71d7
Merge branch 'master' into ModelicaSystemDoE_simple
adeas31 Nov 14, 2025
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
22 changes: 11 additions & 11 deletions OMPython/ModelicaSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,7 @@ def run_doe():
# structural
'p': [1, 2],
'q': [3, 4],
# simple
# non-structural
'a': [5, 6],
'b': [7, 8],
}
Expand Down Expand Up @@ -2023,7 +2023,7 @@ def prepare(self) -> int:
param_structure[param_name] = self._parameters[param_name]

param_structure_combinations = list(itertools.product(*param_structure.values()))
param_simple_combinations = list(itertools.product(*param_non_structure.values()))
param_non_structural_combinations = list(itertools.product(*param_non_structure.values()))

for idx_pc_structure, pc_structure in enumerate(param_structure_combinations):

Expand Down Expand Up @@ -2051,15 +2051,15 @@ def prepare(self) -> int:

self._mod.buildModel()

for idx_pc_simple, pc_simple in enumerate(param_simple_combinations):
sim_param_simple = {}
for idx_simple, pk_simple in enumerate(param_non_structure.keys()):
sim_param_simple[pk_simple] = cast(Any, pc_simple[idx_simple])
for idx_non_structural, pk_non_structural in enumerate(param_non_structural_combinations):
sim_param_non_structural = {}
for idx, pk in enumerate(param_non_structure.keys()):
sim_param_non_structural[pk] = cast(Any, pk_non_structural[idx])

resfilename = f"DOE_{idx_pc_structure:09d}_{idx_pc_simple:09d}.mat"
resfilename = f"DOE_{idx_pc_structure:09d}_{idx_non_structural:09d}.mat"
logger.info(f"use result file {repr(resfilename)} "
f"for structural parameters: {sim_param_structure} "
f"and simple parameters: {sim_param_simple}")
f"and non-structural parameters: {sim_param_non_structural}")
resultfile = self._resultpath / resfilename

df_data = (
Expand All @@ -2068,15 +2068,15 @@ def prepare(self) -> int:
}
| sim_param_structure
| {
self.DICT_ID_NON_STRUCTURE: idx_pc_simple,
self.DICT_ID_NON_STRUCTURE: idx_non_structural,
}
| sim_param_simple
| sim_param_non_structural
| {
self.DICT_RESULT_AVAILABLE: False,
}
)

self._mod.setParameters(sim_param_simple)
self._mod.setParameters(sim_param_non_structural)
mscmd = self._mod.simulate_cmd(
result_file=resultfile,
timeout=self._timeout,
Expand Down