Also serialize the starting values and reapply them on restore

Author: fwitte

src/tespy/connections/connection.py

@@ -541,23 +541,38 @@ def _deserialize(self, data, all_connections):
     def _save_specifications(self):
         specs = {}
         for key, container in self.property_data.items():
-            if not container.is_set:
-                continue
-            if isinstance(container, dc_ref):
-                specs[key] = container._serialize()
-            elif isinstance(container, dc_flu):
-                specs[key] = {
-                    "val": {f: container.val[f] for f in container.is_set},
-                    "is_set": list(container.is_set)
-                }
-            elif isinstance(container, dc_prop):
-                specs[key] = {
-                    "val": container.val,
-                    "unit": container.unit,
-                    "is_set": True
+            data = {}
+            if container.is_set:
+                if isinstance(container, dc_ref):
+                    data = container._serialize()
+                elif isinstance(container, dc_flu):
+                    data = {
+                        "val": {f: container.val[f] for f in container.is_set},
+                        "is_set": list(container.is_set)
+                    }
+                elif isinstance(container, dc_prop):
+                    data = {
+                        "val": container.val,
+                        "unit": container.unit,
+                        "is_set": True
+                    }
+                else:
+                    data = {"val": container.val, "is_set": True}
+            if (
+                    isinstance(container, dc_prop)
+                    and container._val0_is_quantity
+                    and not np.isnan(container.val0.magnitude)
+                ):
+                data["val0"] = float(container.val0.magnitude)
+                data["val0_unit"] = str(container.val0.units)
+            elif isinstance(container, dc_flu) and container.val0:
+                data["val0"] = {
+                    f: float(x) for f, x in container.val0.items()
                 }
-            else:
-                specs[key] = {"val": container.val, "is_set": True}
+            if data:
+                specs[key] = data
+        if specs and self.good_starting_values:
+            specs["good_starting_values"] = True
         return specs
 
     def _clear_specifications(self):
@@ -567,7 +582,8 @@ def _clear_specifications(self):
             else:
                 container.is_set = False
 
-    def _restore_specifications(self, data, all_connections):
+    def _restore_specifications(self, data, all_connections, units):
+        self.good_starting_values = data.pop("good_starting_values", False)
         for key, param_data in data.items():
             container = self.get_attr(key)
             if isinstance(container, dc_ref):
@@ -580,10 +596,18 @@ def _restore_specifications(self, data, all_connections):
                     ref=ref, is_set=True, unit=param_data["unit"]
                 )
             elif isinstance(container, dc_flu):
-                container.val.update(param_data["val"])
-                container.is_set = set(param_data["is_set"])
+                if "val" in param_data:
+                    container.val.update(param_data["val"])
+                    container.is_set = set(param_data["is_set"])
+                if "val0" in param_data:
+                    container.val0.update(param_data["val0"])
             else:
-                container.set_attr(**param_data)
+                val0 = param_data.pop("val0", None)
+                val0_unit = param_data.pop("val0_unit", None)
+                if param_data:
+                    container.set_attr(**param_data)
+                if val0 is not None:
+                    container.val0 = units.ureg.Quantity(val0, val0_unit)
 
 
 @connection_registry

src/tespy/networks/network.py

@@ -3306,15 +3306,17 @@ def _attach_default_units_to_specifications(self):
         # units". The unit is only attached to the containers when the
         # network is transformed to SI for solving: serializing before that
         # would attach the global default units, misinterpreting the values
-        # when reapplied
-        containers = [
+        # when reapplied. The same applies to plain numeric starting values
+        # of connections, which are serialized alongside the specifications
+        conn_containers = [
             c.get_attr(key)
             for c in self.conns["object"] for key in c.property_data
-        ] + [
+        ]
+        comp_containers = [
             cp.get_attr(key)
             for cp in self.comps["object"] for key in cp.parameters
         ]
-        for container in containers:
+        for container in conn_containers + comp_containers:
             if not isinstance(container, dc_prop) or not container.is_set:
                 continue
             if container._val_is_quantity or container.quantity is None:
@@ -3449,7 +3451,7 @@ def restore_specifications(self, data):
         all_connections = {c.label: c for c in self.conns["object"]}
         for label, specs in data.get("Connection", {}).items():
             all_connections[label]._restore_specifications(
-                specs, all_connections
+                specs, all_connections, self.units
             )
         for label, specs in data.get("Component", {}).items():
             self.get_comp(label)._restore_specifications(specs)