Skip to content

Commit

Permalink
Fix Style
Browse files Browse the repository at this point in the history
  • Loading branch information
Yngve S. Kristiansen committed Mar 20, 2024
1 parent 0e23b56 commit b63bca4
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/ert/config/observations.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
List,
Optional,
Tuple,
Union,
TypedDict,
Union,
)

import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion src/ert/dark_storage/common.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import contextlib
from typing import Any, Dict, Iterator, List, Sequence, Union, Optional
from typing import Any, Dict, Iterator, List, Optional, Sequence, Union
from uuid import UUID

import numpy as np
Expand Down
5 changes: 0 additions & 5 deletions src/ert/dark_storage/endpoints/records.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import io
from itertools import chain
from typing import Any, Dict, List, Mapping, Union
from uuid import UUID, uuid4

Expand All @@ -12,10 +11,6 @@
data_for_key,
ensemble_parameters,
gen_data_keys,
get_observation_keys_for_response,
get_observation_name,
get_observations_for_obs_keys,
get_all_observations,
get_observation_for_response,
)
from ert.dark_storage.enkf import get_storage
Expand Down
25 changes: 15 additions & 10 deletions src/ert/storage/local_ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import logging
import os
from datetime import datetime
from functools import lru_cache, cached_property, reduce
from functools import cached_property, lru_cache, reduce
from pathlib import Path
from typing import TYPE_CHECKING, List, Optional, Tuple, Union, Literal
from typing import TYPE_CHECKING, List, Optional, Tuple, Union
from uuid import UUID

import numpy as np
Expand All @@ -17,10 +17,10 @@

from ert.config.gen_data_config import GenDataConfig
from ert.config.gen_kw_config import GenKwConfig
from ert.config.observations import ObservationsIndices
from ert.storage.mode import BaseMode, Mode, require_write

from .realization_storage_state import RealizationStorageState
from ert.config.observations import ObservationsIndices

if TYPE_CHECKING:
import numpy.typing as npt
Expand Down Expand Up @@ -672,6 +672,14 @@ def set_key_index(df, index: List[str]):
f"{', '.join(ObservationsIndices.keys())}"
)

# columns: OBS, STD
left_cols = df[["OBS", "STD"]][:: (len(filtered_response.realization))]

# columns: 0, 1, 2, ...(nreals-1)
right_cols = df[["realization", "values"]].pivot(
columns="realization", values="values"
)

obs_missing_response = (
obs_ds.where(obs_ds_missing_response_mask)
.to_dataframe()
Expand All @@ -681,14 +689,11 @@ def set_key_index(df, index: List[str]):

if not obs_missing_response.empty:
set_key_index(obs_missing_response, index)
nan_obs_not_in_ds_mask = ~obs_missing_response.index.isin(
left_cols.index
)
obs_missing_response = obs_missing_response[nan_obs_not_in_ds_mask]
observations_without_responses.append(obs_missing_response)
# columns: OBS, STD
left_cols = df[["OBS", "STD"]][:: (len(filtered_response.realization))]

# columns: 0, 1, 2, ...(nreals-1)
right_cols = df[["realization", "values"]].pivot(
columns="realization", values="values"
)

long = pd.concat([left_cols, right_cols], axis=1)
long_dfs.append(long)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/analysis/test_es_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
_create_temporary_parameter_storage,
)
from ert.cli import ENSEMBLE_SMOOTHER_MODE
from ert.config import AnalysisConfig, ErtConfig, GenDataConfig, GenKwConfig
from ert.config import ErtConfig, GenDataConfig, GenKwConfig
from ert.config.analysis_config import UpdateSettings
from ert.config.analysis_module import ESSettings
from ert.storage import open_storage
Expand Down
5 changes: 0 additions & 5 deletions tests/unit_tests/config/test_observations.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import os
from contextlib import ExitStack as does_not_raise
from datetime import datetime, timedelta
from pathlib import Path
from textwrap import dedent

import numpy as np
import pytest
from hypothesis import given, settings
from hypothesis import strategies as st
from resdata.summary import Summary

from ert.config import (
Expand All @@ -21,8 +18,6 @@
from ert.config.observation_vector import ObsVector
from ert.config.parsing.observations_parser import ObservationConfigError

from .config_dict_generator import config_generators


def run_simulator():
"""
Expand Down
2 changes: 0 additions & 2 deletions tests/unit_tests/data/test_integration_data.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import pathlib
from datetime import datetime
from functools import reduce

import numpy as np
import pytest

from ert.config import ErtConfig
from ert.data import MeasuredData
from ert.data._measured_data import ObservationError
from ert.libres_facade import LibresFacade
from ert.storage import open_storage

Expand Down

0 comments on commit b63bca4

Please sign in to comment.