Skip to content

Commit

Permalink
♻️ Renamed replace_{model|global}_dimension methods
Browse files Browse the repository at this point in the history
to set_{model|global}_dimension
  • Loading branch information
s-weigand committed Mar 12, 2022
1 parent c320860 commit 57c32a9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_baseline():
pixel = np.asarray([0])
coords = {"time": time, "pixel": pixel}
dataset_model = model.dataset["dataset1"].fill(model, parameter)
dataset_model.replace_global_dimension("pixel")
dataset_model.set_global_dimension("pixel")
dataset_model.set_coordinates(coords)
matrix = calculate_matrix(dataset_model, {})
compartments = matrix.clp_labels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def test_coherent_artifact(spectral_dependence: str):
coords = {"time": time, "spectral": spectral}

dataset_model = model.dataset["dataset1"].fill(model, parameters)
dataset_model.replace_global_dimension("spectral")
dataset_model.set_global_dimension("spectral")
dataset_model.set_coordinates(coords)
matrix = calculate_matrix(dataset_model, {"spectral": 1})
compartments = matrix.clp_labels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class OneCompartmentModelInvertedAxis:
axis = {"time": time, "spectral": spectral}

decay_dataset_model = decay_model.dataset["dataset1"].fill(decay_model, decay_parameters)
decay_dataset_model.replace_global_dimension("spectral")
decay_dataset_model.set_global_dimension("spectral")
decay_dataset_model.set_coordinates(axis)
matrix = calculate_matrix(decay_dataset_model, {})
decay_compartments = matrix.clp_labels
Expand Down Expand Up @@ -157,7 +157,7 @@ class OneCompartmentModelNegativeSkew:
axis = {"time": time, "spectral": spectral}

decay_dataset_model = decay_model.dataset["dataset1"].fill(decay_model, decay_parameters)
decay_dataset_model.replace_global_dimension("spectral")
decay_dataset_model.set_global_dimension("spectral")
decay_dataset_model.set_coordinates(axis)
matrix = calculate_matrix(decay_dataset_model, {})
decay_compartments = matrix.clp_labels
Expand Down Expand Up @@ -261,7 +261,7 @@ class ThreeCompartmentModel:
axis = {"time": time, "spectral": spectral}

decay_dataset_model = decay_model.dataset["dataset1"].fill(decay_model, decay_parameters)
decay_dataset_model.replace_global_dimension("spectral")
decay_dataset_model.set_global_dimension("spectral")
decay_dataset_model.set_coordinates(axis)
matrix = calculate_matrix(decay_dataset_model, {})
decay_compartments = matrix.clp_labels
Expand Down
8 changes: 4 additions & 4 deletions glotaran/model/dataset_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def finalize_data(self, dataset: xr.Dataset) -> None:
self, dataset, is_full_model=is_full_model, as_global=True
)

def replace_model_dimension(self, model_dimension: str) -> None:
def set_model_dimension(self, model_dimension: str) -> None:
"""Overwrites the dataset model's model dimension."""
self._model_dimension = model_dimension

Expand Down Expand Up @@ -131,16 +131,16 @@ def get_global_dimension(self) -> str:
)
return self._global_dimension

def replace_global_dimension(self, global_dimension: str) -> None:
def set_global_dimension(self, global_dimension: str) -> None:
"""Overwrites the dataset model's global dimension."""
self._global_dimension = global_dimension

def swap_dimensions(self) -> None:
"""Swaps the dataset model's global and model dimension."""
global_dimension = self.get_model_dimension()
model_dimension = self.get_global_dimension()
self.replace_global_dimension(global_dimension)
self.replace_model_dimension(model_dimension)
self.set_global_dimension(global_dimension)
self.set_model_dimension(model_dimension)

def set_data(self, dataset: xr.Dataset) -> DatasetModel:
"""Sets the dataset model's data."""
Expand Down
4 changes: 2 additions & 2 deletions glotaran/model/dataset_model.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class DatasetModel:
) -> Generator[tuple[Parameter | int | None, Megacomplex | str], None, None]: ...
def get_model_dimension(self) -> str: ...
def finalize_data(self, dataset: xr.Dataset) -> None: ...
def replace_model_dimension(self, model_dimension: str) -> None: ...
def set_model_dimension(self, model_dimension: str) -> None: ...
def get_global_dimension(self) -> str: ...
def replace_global_dimension(self, global_dimension: str) -> None: ...
def set_global_dimension(self, global_dimension: str) -> None: ...
def swap_dimensions(self) -> None: ...
def set_data(self, dataset: xr.Dataset) -> DatasetModel: ...
def get_data(self) -> np.ndarray: ...
Expand Down

0 comments on commit 57c32a9

Please sign in to comment.