change DataPoint to dict before saving

Author: basnijholt

adaptive/learner/average1D.py

@@ -7,7 +7,7 @@
 
 from adaptive.notebook_integration import ensure_holoviews
 from adaptive.learner.learner1D import Learner1D
-from adaptive.learner.average_mixin import add_average_mixin
+from adaptive.learner.average_mixin import add_average_mixin, DataPoint
 
 
 @add_average_mixin
@@ -65,7 +65,8 @@ def tell_pending(self, x_seed):
     def tell_many(self, xs, ys):
         # `super().tell_many(xs, ys)` will not work.
         for x, y in zip(xs, ys):
-            self.tell(x, y)
+            for seed, value in y.items():
+                self.tell((x, seed), value)
 
     def remove_unfinished(self):
         self.pending_points = {}
@@ -87,3 +88,8 @@ def plot(self, *, with_sem=True):
             return scatter * spread
         else:
             return scatter
+
+    def _set_data(self, data):
+        # change dict -> DataPoint, because the points are saved using dicts
+        data = {k: DataPoint(v) for k, v in data.items()}
+        self.tell_many(data.keys(), data.values())

adaptive/learner/average2D.py

@@ -146,3 +146,8 @@ def tell(self, point, value):
         if not point_exists:
             self._ip = None
         self._stack.pop(point, None)
+
+    def _set_data(self, data):
+        # change dict -> DataPoint, because the points are saved using dicts
+        data = {k: DataPoint(v) for k, v in data.items()}
+        super()._set_data(data)

adaptive/learner/average_mixin.py

@@ -129,14 +129,19 @@ def needs_more_data(p):
         return [inf if needs_more_data(p) else loss
             for (p, seed), loss in zip(points, loss_improvements)]
 
+    def _get_data(self):
+        # change DataPoint -> dict for saving
+        return {k: dict(v) for k, v in self._data.items()}
+
 
 def add_average_mixin(cls):
     names = ('data', 'data_sem', 'mean_values_per_point',
              'get_seed', 'loss_per_existing_point', '_add_to_pending',
              '_remove_from_to_pending', '_add_to_data', 'ask', 'n_values',
              '_normalize_new_points_loss_improvements',
              '_normalize_existing_points_loss_improvements',
-             '_mean_values_per_neighbor')
+             '_mean_values_per_neighbor',
+             '_get_data')
 
     for name in names:
         setattr(cls, name, getattr(AverageMixin, name))