PySimultan 0.2.5__tar.gz → 0.2.6__tar.gz

{pysimultan-0.2.5/src/PySimultan.egg-info → pysimultan-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.5
+Version: 0.2.6
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.2.5 → pysimultan-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PySimultan"
-version = "0.2.5"
+version = "0.2.6"
 authors = [
     {name = "Max Bühler", email = "maximilian.buehler@tuwien.ac.at"}
 ]

{pysimultan-0.2.5 → pysimultan-0.2.6}/setup.py

@@ -8,7 +8,7 @@ project_dir = Path(__file__).parent
 
 setuptools.setup(
     name="PySimultan",
-    version="0.2.5",
+    version="0.2.6",
     description="Integrate SIMULTAN into Python",
     # Allow UTF-8 characters in README with encoding argument.
     long_description=project_dir.joinpath("README.md").read_text(encoding="utf-8"),

{pysimultan-0.2.5 → pysimultan-0.2.6/src/PySimultan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySimultan
-Version: 0.2.5
+Version: 0.2.6
 Home-page: 
 Author: Max Buehler
 Author-email: Max Bühler <maximilian.buehler@tuwien.ac.at>

{pysimultan-0.2.5 → pysimultan-0.2.6}/src/PySimultan2/multi_values.py

@@ -189,11 +189,23 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
     :return: SimDoubleParameter
     """
 
+    _ = x_ax_val
+
+    def default_value_source(val_field: SimMultiValueField3D,
+                             x_ax: float = None,
+                             y_ax: float = None,
+                             z_ax: float = None):
+        x_ax = x_ax if x_ax is not None else val_field.XAxis[0]
+        y_ax = y_ax if y_ax is not None else val_field.YAxis[0]
+        z_ax = z_ax if z_ax is not None else val_field.ZAxis[0]
+        return SimMultiValueField3DParameterSource(val_field, x_ax, y_ax, z_ax)
+
     if not isinstance(parameter, SimDoubleParameter):
         raise ValueError('The input parameter must be a SimDoubleParameter object.')
 
     if isinstance(value, SimMultiValueField3D):
-        source = value
+        # source = value
+        source = default_value_source(value, x_ax_val, y_ax_val, z_ax_val)
     elif isinstance(value, np.ndarray):
         value_field = numpy_to_simultan_multi_value_field_3d(value,
                                                              name=field_name if field_name is not None else str(
@@ -201,11 +213,12 @@ def set_parameter_to_value_field(parameter: SimDoubleParameter,
         if data_model is not None:
             data_model.add_field(value_field)
 
-        x_ax_val = x_ax_val if x_ax_val is not None else value_field.XAxis[0]
-        y_ax_val = y_ax_val if y_ax_val is not None else value_field.YAxis[0]
-        z_ax_val = z_ax_val if z_ax_val is not None else value_field.ZAxis[0]
-
-        source = SimMultiValueField3DParameterSource(value_field, x_ax_val, y_ax_val, z_ax_val)
+        # x_ax_val = x_ax_val if x_ax_val is not None else value_field.XAxis[0]
+        # y_ax_val = y_ax_val if y_ax_val is not None else value_field.YAxis[0]
+        # z_ax_val = z_ax_val if z_ax_val is not None else value_field.ZAxis[0]
+        #
+        # source = SimMultiValueField3DParameterSource(value_field, x_ax_val, y_ax_val, z_ax_val)
+        source = default_value_source(value_field, x_ax_val, y_ax_val, z_ax_val)
 
     elif isinstance(value, pd.DataFrame):
         value_field = pandas_to_simultan_multi_value_big_table(value,