Plot: Replace magic with DEFAULT_GRID_SIZE + fix a small arg bug

Author: kernc

sambo/_test.py

@@ -117,10 +117,6 @@ def test_plot_objective(self):
         _plot_objective(self.RESULT_SMBO, plot_max_points=5)
         with self.assertWarns(UserWarning):
             _plot_objective(self.RESULT_SCEUA)
-        with self.assertWarns(UserWarning):
-            _plot_objective(self.RESULT_SCEUA, estimator='gp')
-        with self.assertWarns(UserWarning):
-            _plot_objective(self.RESULT_SHGO, estimator='gp')
 
     def test_plot_evaluations(self):
         plot_evaluations(self.RESULT_SMBO)

sambo/plot.py

@@ -32,6 +32,7 @@
 from ._util import OptimizeResult, _SklearnLikeRegressor
 
 _MARKER_SEQUENCE = 'osxdvP^'
+_DEFAULT_SUBPLOT_SIZE = 2.1
 
 
 def plot_convergence(
@@ -245,7 +246,7 @@ def _format_scatter_plot_axes(fig, axs, space, plot_dims=None, dim_labels=None,
     if dim_labels is None:
         dim_labels = [fr"$\mathbf{{x_{{{i}}}}}$" for i in plot_dims]
 
-    nticks = int((1 + np.log10(size / (base_figsize := 2))) * (base_nticks := 6))  # noqa: F841
+    nticks = int((1 + np.log10(size / (base_figsize := _DEFAULT_SUBPLOT_SIZE))) * (base_nticks := 6))  # noqa: F841
     fontsize = 10
 
     _MaxNLocator = partial(MaxNLocator, nbins=nticks)
@@ -441,9 +442,9 @@ def _subplots_grid(n_dims, size, title):
     _watermark(fig)
     if add_figure_title:
         fig.suptitle(title)
-    margins = dict(left=(m := 3 / n_dims * size / 2 * .07), bottom=m, right=1 - m,
+    margins = dict(left=(m := 3 / n_dims * size / _DEFAULT_SUBPLOT_SIZE * .07), bottom=m, right=1 - m,
                    top=1 - (2 if add_figure_title else 1.1) * m)
-    fig.subplots_adjust(**margins, hspace=.15, wspace=.15)
+    fig.subplots_adjust(**margins, hspace=.1, wspace=.1)
     return fig, axs
 
 
@@ -470,7 +471,7 @@ def plot_objective(
         resolution: int = 16,
         n_samples: int = 250,
         estimator: Optional[str | _SklearnLikeRegressor] = None,
-        size: float = 2,
+        size: float = _DEFAULT_SUBPLOT_SIZE,
         zscale: Literal['linear', 'log'] = 'linear',
         names: Optional[list[str]] = None,
         true_minimum: Optional[list[float] | list[list[float]]] = None,
@@ -609,8 +610,9 @@ def plot_objective(
     if estimator is None and result_estimator is not None:
         estimator = result_estimator
     else:
+        _estimator_arg = estimator
         estimator = _estimator_factory(estimator, bounds, rng=0)
-        if result_estimator is None:
+        if result_estimator is None and _estimator_arg is None:
             warnings.warn(
                 'The optimization result process does not appear to have been '
                 'driven by a model. You can still still observe partial dependence '
@@ -654,7 +656,7 @@ def plot_evaluations(
         names: Optional[list[str]] = None,
         plot_dims: Optional[list[int]] = None,
         jitter: float = .02,
-        size: int = 2,
+        size: int = _DEFAULT_SUBPLOT_SIZE,
         cmap: str = 'summer',
 ) -> Figure:
     """Visualize the order in which points were evaluated during optimization.