Merge pull request #62 from kassonlab/b61-state-restoration

Restore RunData from state.json

Author: eirrgang

src/brer/run_data.py

@@ -333,7 +333,9 @@ def create_from(cls, source, *, ensemble_num: int = None):
                     warnings.warn(f'Caller provided ensemble_num={ensemble_num} overrides {_source_id} '
                                   f'from {source}.')
                     general_params.ensemble_num = ensemble_num
-            pair_params = {name: PairParams(name=name, sites=fields['sites']) for name, fields in
+            # Unlike when creating from a PairDataCollection, the state file provides
+            # non-default values for other PairParams fields.
+            pair_params = {name: PairParams(**fields) for name, fields in
                            source['pair parameters'].items()}
             return RunData(general_params=general_params, pair_params=pair_params)
         else:

tests/test_run_data.py

@@ -56,19 +56,21 @@ def test_run_data(tmpdir, raw_pair_data):
     rd.set(alpha=1., name=name)
 
     # Test getting
-    rd.get("alpha", name=name)
     with pytest.raises(ValueError):
         rd.get("alpha")
+    assert rd.get("alpha", name=name) == 1.
 
     # Test read/write of the state
     rd.save_config("{}/state.json".format(tmpdir))
-    old_rd = rd
-    rd = RunData.create_from("{}/state.json".format(tmpdir))
+    modified_rd = rd
+    rd = RunData.create_from(pairs)
+    assert rd.get("alpha", name=name) != 1.
+    assert modified_rd.as_dictionary() != rd.as_dictionary()
 
-    assert old_rd.as_dictionary() != rd.as_dictionary()
-    rd.set(alpha=1., name=name)
     # Confirm that the restored data is the same as the original.
-    assert old_rd.as_dictionary() == rd.as_dictionary()
+    rd = RunData.create_from("{}/state.json".format(tmpdir))
+    assert rd.get("alpha", name=name) == 1.
+    assert modified_rd.as_dictionary() == rd.as_dictionary()
 
     with tempfile.NamedTemporaryFile(suffix='.json', mode='w') as tmp:
         test_data = raw_pair_data.copy()