Optionally export models with byParam data for easier loading

2 files changed, 26 insertions, 6 deletions

diff --git a/bin/analyze-log.py b/bin/analyze-log.py
index 3f04e01..0b66bdf 100755
--- a/bin/analyze-log.py
+++ b/bin/analyze-log.py
@@ -292,7 +292,7 @@ def main():
 
     if args.export_model:
         print(f"Exporting model to {args.export_model}")
-        json_model = model.to_json(with_lut=args.export_model_with_lut)
+        json_model = model.to_json(with_by_param=args.export_model_with_lut)
         with open(args.export_model, "w") as f:
             json.dump(
                 json_model, f, indent=2, sort_keys=True, cls=dfatool.utils.NpEncoder
diff --git a/lib/model.py b/lib/model.py
index 58f05a4..0026249 100644
--- a/lib/model.py
+++ b/lib/model.py
@@ -14,7 +14,13 @@ from .parameters import (
     distinct_param_values,
 )
 from .paramfit import ParamFit
-from .utils import is_numeric, soft_cast_int, by_name_to_by_param, regression_measures
+from .utils import (
+    is_numeric,
+    soft_cast_int,
+    by_name_to_by_param,
+    by_param_to_by_name,
+    regression_measures,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -643,7 +649,7 @@ class AnalyticModel:
                             ret[f"xv/{name}/{attr_name}/{k}"] = np.mean(entry[k])
         return ret
 
-    def to_json(self, **kwargs) -> dict:
+    def to_json(self, with_by_param=False, **kwargs) -> dict:
         """
         Return JSON encoding of this AnalyticModel.
         """
@@ -653,6 +659,12 @@ class AnalyticModel:
             "paramValuesbyName": dict([[name, dict()] for name in self.names]),
         }
 
+        if with_by_param:
+            by_param = self.get_by_param()
+            ret["byParam"] = list()
+            for k, v in by_param.items():
+                ret["byParam"].append((k, v))
+
         for name in self.names:
             for attr_name, attr in self.attr_by_name[name].items():
                 ret["name"][name][attr_name] = attr.to_json(**kwargs)
@@ -665,9 +677,17 @@ class AnalyticModel:
         return ret
 
     @classmethod
-    def from_json(cls, data, by_name, parameters):
-        assert data["parameters"] == parameters
-        return cls(by_name, parameters, from_json=data)
+    def from_json(cls, data, by_name=None, parameters=None):
+        if by_name is None and parameters is None:
+            assert data["byParam"] is not None
+            by_param = dict()
+            for (nk, pk), v in data["byParam"]:
+                by_param[(nk, tuple(pk))] = v
+            by_name = by_param_to_by_name(by_param)
+            return cls(by_name, data["parameters"], from_json=data)
+        else:
+            assert data["parameters"] == parameters
+            return cls(by_name, parameters, from_json=data)
 
     def webconf_function_map(self) -> list:
         ret = list()