Minimal attempt at keeping response/param states #8232
Conversation
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
30 times, most recently
from
548a801 to
c3bc99b
Compare
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
10 times, most recently
from
2cfd244 to
c8ddb62
Compare
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
8 times, most recently
from
0dfdd73 to
00ccd21
Compare
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
2 times, most recently
from
86adcb0 to
d6c2272
Compare
| def _to_json(self) -> Dict[int, List[Tuple[str, str, bool]]]: | ||
| return {i: list(states) for i, states in self._states.items()} |
| def has(self, realization: int, key: str) -> bool: | ||
| if realization not in self._states: | ||
| return False | ||
|
|
||
| state = self._states[realization] | ||
|
|
||
| return ( | ||
| (key, key, True) in state | ||
| or any(_has_it and key == _group for _group, _, _has_it in state) | ||
| or any(_has_it and key == _key for _, _key, _has_it in state) | ||
| ) | ||
|
|
||
| def has_entry(self, realization: int, key: str) -> bool: | ||
| if realization not in self._states: | ||
| return False | ||
|
|
||
| state = self._states[realization] | ||
|
|
||
| result = ( | ||
| (key, key, True) in state | ||
| or (key, key, False) in state | ||
| or any(key == _group for _group, _, _ in state) | ||
| or any(key == _key for _, _key, _ in state) | ||
| ) | ||
|
|
There was a problem hiding this comment.
What is the difference between these two?
There was a problem hiding this comment.
has_entry is if a state is registered for the realization, whether it be True or False, whereas has is if there is a state registered and it is also True
| @@ -544,6 +698,17 @@ def unset_failure( | |||
| if filename.exists(): | |||
There was a problem hiding this comment.
Can this be joined with the state_map?
There was a problem hiding this comment.
failure is scoped per realization, state map holds the has_response / has_parameter, and responses/params have unique keys/subkeys depending on the grouping, the has_failure would be a single bool per realization, and adding it would be possible but would also imply restructuring the json a bit. I'd prefer leaving it for a separate PR after this
src/ert/storage/local_ensemble.py
Outdated
| @@ -1045,6 +1210,13 @@ def save_parameters( | |||
|
|
|||
| dataset.to_netcdf(path, engine="scipy") | |||
|
|
|||
| if self._realization_states is not None: | |||
There was a problem hiding this comment.
Yep, removing Optional logic
src/ert/storage/local_ensemble.py
Outdated
| def _refresh_parameter_state( | ||
| self, parameter_key: str, realization: int, skip_others: bool = False | ||
| ) -> None: | ||
| if self._realization_states is None: |
There was a problem hiding this comment.
Yep, removing Optional logic
| ) | ||
| return | ||
|
|
||
| self._realization_states.add( |
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
4 times, most recently
from
80ef929 to
98fdfdb
Compare
with some safeguards to be removed
yngve-sk
force-pushed
the
fix-slow-realmask-fn-on-save-only
branch
from
98fdfdb to
bb1d26e
Compare
Issue
Resolves #8125