Improve test and typing

Author: basnijholt

adaptive/learner/average_learner.py

@@ -98,7 +98,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         seed_name: str = "seed",

adaptive/learner/average_learner1D.py

@@ -176,7 +176,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         seed_name: str = "seed",

adaptive/learner/learner1D.py

@@ -351,7 +351,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         x_name: str = "x",

adaptive/learner/learner2D.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import itertools
 import warnings
 from collections import OrderedDict
@@ -415,7 +417,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         x_name: str = "x",

adaptive/learner/learnerND.py

@@ -425,7 +425,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         point_names: tuple[str, ...] = ("x", "y", "z"),

adaptive/learner/sequence_learner.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from copy import copy
 
 import cloudpickle
@@ -150,7 +152,7 @@ def to_dataframe(
 
     def load_dataframe(
         self,
-        df,
+        df: pandas.DataFrame,
         with_default_function_args: bool = True,
         function_prefix: str = "function.",
         index_name: str = "i",

adaptive/tests/test_learners.py

@@ -712,6 +712,12 @@ def test_to_dataframe(learner_type, f, learner_kwargs):
         kw = {}
 
     learner = learner_type(generate_random_parametrization(f), **learner_kwargs)
+
+    # Test empty dataframe
+    df = learner.to_dataframe()
+    assert len(df) == 0
+
+    # Run the learner
     simple_run(learner, 100)
     df = learner.to_dataframe(**kw)
     assert isinstance(df, pandas.DataFrame)
@@ -721,8 +727,9 @@ def test_to_dataframe(learner_type, f, learner_kwargs):
         assert len(df) == learner.npoints
 
     # Add points from the DataFrame to a new empty learner
-    learner2 = learner_type(generate_random_parametrization(f), **learner_kwargs)
+    learner2 = learner_type(learner.function, **learner_kwargs)
     learner2.load_dataframe(df, **kw)
+    assert learner2.npoints == learner.npoints
 
     # Test this for a learner in a BalancingLearner
     learners = [