From 807592eab2fef96b7696269a111089c2c5503469 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Fri, 14 Aug 2026 16:33:20 +0200 Subject: [PATCH] Ensemble: Rename 'range' to 'params'. --- src/Model/Ensembles/Ensemble.py | 46 ++++++++++++++++----------------- src/View/Ensembles/Table.py | 2 +- src/View/Ensembles/Window.py | 4 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Model/Ensembles/Ensemble.py b/src/Model/Ensembles/Ensemble.py index d24d4644..00d490fa 100644 --- a/src/Model/Ensembles/Ensemble.py +++ b/src/Model/Ensembles/Ensemble.py @@ -31,7 +31,7 @@ class Ensemble(SQLSubModel): _sub_classes = [] def __init__(self, id: int = -1, name: str = "", - function=None, range=[0., 100.], + function=None, params=[0., 100.], data_type=None, target_data=None, status=None, owner_scenario=-1): super(Ensemble, self).__init__( @@ -42,7 +42,7 @@ class Ensemble(SQLSubModel): self._name = name self._data_type = data_type self._function = function - self._range = range + self._params = params self._target_data = target_data @classmethod @@ -55,8 +55,8 @@ class Ensemble(SQLSubModel): type VARCHAR(8) NOT NULL, function INTEGER NOT NULL, function_name VARCHAR(32) NOT NULL, - range BLOB NOT NULL, - range_len INTEGER NOT NULL, + params BLOB NOT NULL, + params_len INTEGER NOT NULL, data_pid INTEGER NOT NULL, {Scenario.create_db_add_scenario()}, {Scenario.create_db_add_scenario_fk()}, @@ -90,7 +90,7 @@ class Ensemble(SQLSubModel): table = execute( "SELECT pamhyr_id, deleted, name, type, " + - "function, function_name, range, range_len, data_pid, " + + "function, function_name, params, params_len, data_pid, " + "scenario " + "FROM ensemble " + f"WHERE scenario = {scenario.id} " + @@ -106,8 +106,8 @@ class Ensemble(SQLSubModel): data_type = next(it) fid = next(it) fname = next(it) - range = next(it) - range_len = next(it) + params = next(it) + params_len = next(it) data_pid = next(it) owner_scenario = next(it) @@ -128,12 +128,12 @@ class Ensemble(SQLSubModel): None ) - rdata = cls._decode_range(range, range_len) + rdata = cls._decode_params(params, params_len) new_ensemble = cls( id, name=name, function=function, - range=rdata, + params=rdata, data_type=data_type, target_data=target_data, status=data["status"], @@ -157,7 +157,7 @@ class Ensemble(SQLSubModel): f"AND scenario = {self._status.scenario_id}" ) - brange, length = self._encode_range() + bparams, length = self._encode_params() if self._function is None: fid = -1 @@ -176,32 +176,32 @@ class Ensemble(SQLSubModel): execute( "INSERT INTO " + "ensemble(pamhyr_id, deleted, name, type, " + - " function, function_name, range, range_len, " + + " function, function_name, params, params_len, " + " data_pid, scenario) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", self.pamhyr_id, self.is_deleted(), self._name, self._data_type, - fid, fname, brange, length, + fid, fname, bparams, length, data_pid, self._status.scenario_id ) return True - def _encode_range(self): - length = len(self._range) + def _encode_params(self): + length = len(self._params) data_format = ">" + ''.join(itertools.repeat("d", length)) - return struct.pack(data_format, *self._range), length + return struct.pack(data_format, *self._params), length @classmethod - def _decode_range(cls, brange, length): + def _decode_params(cls, bparams, length): data_format = ">" + ''.join(itertools.repeat("d", length)) - return struct.unpack(data_format, brange) + return struct.unpack(data_format, bparams) def get_sample(self, nb): return self._function.get_sample( - self._range, nb + self._params, nb ) @property @@ -223,12 +223,12 @@ class Ensemble(SQLSubModel): self._status.modified() @property - def range(self): - return self._range + def params(self): + return self._params - @range.setter - def range(self, range): - self._range = range + @params.setter + def params(self, params): + self._params = params self._status.modified() @property diff --git a/src/View/Ensembles/Table.py b/src/View/Ensembles/Table.py index 9cf3d7a7..e4006ece 100644 --- a/src/View/Ensembles/Table.py +++ b/src/View/Ensembles/Table.py @@ -172,7 +172,7 @@ class EnsembleTableModel(PamhyrTableModel): return self._trad["not_defined"] return value.name elif self._headers[column] == "parameters": - value = self._lst.get(row).range + value = self._lst.get(row).params return str(value) return QVariant() diff --git a/src/View/Ensembles/Window.py b/src/View/Ensembles/Window.py index c361bb7c..a04d937e 100644 --- a/src/View/Ensembles/Window.py +++ b/src/View/Ensembles/Window.py @@ -194,7 +194,7 @@ class EnsemblesWindow(PamhyrWindow): parent=self ) if dlg.exec(): - self._ensembles.get(row).range = dlg._minmax + self._ensembles.get(row).params = dlg._minmax except Exception as e: logger_exception(e) return @@ -217,7 +217,7 @@ class MinMaxDialog(PamhyrDialog): self._init_default_values() def _init_default_values(self): - self._minmax = self._ensemble.range + self._minmax = self._ensemble.params if len(self._minmax) > 0: self.set_double_spin_box("doubleSpinBox_min", self._minmax[0]) self.set_double_spin_box("doubleSpinBox_max", self._minmax[1])