v0.0.57 sklearn updated

Author: bartzbeielstein

.gitignore

@@ -422,3 +422,23 @@ Figures.d/13-torch_bartz09_10min_5init_2023-05-06_18-24-09_progress.pdf
 Figures.d/12-torch_p040025_1min_5init_2023-05-07_10-00-44_progress.pdf
 Figures.d/12-torch_p040025_1min_5init_2023-05-07_10-00-44_importance.pdf
 Figures.d/12-torch_p040025_1min_5init_2023-05-07_10-00-44_contour_2_3.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-19-36_importance.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-19-36_progress.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-31-38_importance.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-31-38_progress.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_1_3.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_1_5.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_1_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_3_5.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_3_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_contour_5_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_importance.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_12-49-08_progress.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_1_3.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_1_8.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_1_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_3_8.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_3_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_contour_8_9.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_importance.pdf
+Figures.d/10-sklearn_bartz09_1min_10init_2023-05-07_13-06-20_progress.pdf

notebooks/10_spot_hpt_sklearn.ipynb

@@ -2680,7 +2680,7 @@
     }
    ],
    "source": [
-    "spot_torch = spot.Spot(fun=fun,\n",
+    "spot_tuner = spot.Spot(fun=fun,\n",
     "                   lower = lower,\n",
     "                   upper = upper,\n",
     "                   fun_evals = inf,\n",
@@ -2708,7 +2708,7 @@
     "                                      \"model_fun_evals\": 10_000,\n",
     "                                      \"log_level\": 50\n",
     "                                      })\n",
-    "spot_torch.run(X_start=X_start)"
+    "spot_tuner.run(X_start=X_start)"
    ]
   },
   {
@@ -2731,12 +2731,12 @@
     "if SAVE:\n",
     "    result_file_name = \"res_\" + experiment_name + \".pkl\"\n",
     "    with open(result_file_name, 'wb') as f:\n",
-    "        pickle.dump(spot_torch, f)\n",
+    "        pickle.dump(spot_tuner, f)\n",
     "\n",
     "if LOAD:\n",
     "    result_file_name = \"res_ch10-friedman-hpt-0_maans03_60min_20init_1K_2023-04-14_10-11-19.pkl\"\n",
     "    with open(result_file_name, 'rb') as f:\n",
-    "        spot_torch =  pickle.load(f)"
+    "        spot_tuner =  pickle.load(f)"
    ]
   },
   {
@@ -2764,7 +2764,7 @@
     }
    ],
    "source": [
-    "spot_torch.plot_progress(log_y=False, filename=\"../Figures.d/\" + experiment_name+\"_progress.pdf\")"
+    "spot_tuner.plot_progress(log_y=False, filename=\"../Figures.d/\" + experiment_name+\"_progress.pdf\")"
    ]
   },
   {
@@ -2797,7 +2797,7 @@
     }
    ],
    "source": [
-    "print(gen_design_table(fun_control=fun_control, spot=spot_torch))"
+    "print(gen_design_table(fun_control=fun_control, spot=spot_tuner))"
    ]
   },
   {
@@ -2825,7 +2825,7 @@
     }
    ],
    "source": [
-    "spot_torch.plot_importance(threshold=0.025, filename=\"../Figures.d/\" + experiment_name+\"_importance.pdf\")"
+    "spot_tuner.plot_importance(threshold=0.025, filename=\"../Figures.d/\" + experiment_name+\"_importance.pdf\")"
    ]
   },
   {
@@ -2910,7 +2910,7 @@
     }
    ],
    "source": [
-    "X = spot_torch.to_all_dim(spot_torch.min_X.reshape(1,-1))\n",
+    "X = spot_tuner.to_all_dim(spot_tuner.min_X.reshape(1,-1))\n",
     "print(X)"
    ]
   },
@@ -3072,7 +3072,7 @@
     }
    ],
    "source": [
-    "min(spot_torch.y), max(spot_torch.y)"
+    "min(spot_tuner.y), max(spot_tuner.y)"
    ]
   },
   {
@@ -3089,8 +3089,8 @@
    "metadata": {},
    "source": [
     "* For productive use, you might want to select:\n",
-    "  * `min_z=min(spot_torch.y)` and\n",
-    "  * `max_z = max(spot_torch.y)`\n",
+    "  * `min_z=min(spot_tuner.y)` and\n",
+    "  * `max_z = max(spot_tuner.y)`\n",
     "* These settings are not so colorful as visualizations that use `None` for the ranges, but give better insights."
    ]
   },
@@ -3141,16 +3141,16 @@
    ],
    "source": [
     "threshold = 0.025\n",
-    "impo = spot_torch.print_importance(threshold=threshold, print_screen=True)\n",
+    "impo = spot_tuner.print_importance(threshold=threshold, print_screen=True)\n",
     "var_plots = [i for i, x in enumerate(impo) if x[1] > threshold]\n",
-    "min_z = min(spot_torch.y)\n",
-    "max_z = max(spot_torch.y)\n",
-    "n = spot_torch.k\n",
+    "min_z = min(spot_tuner.y)\n",
+    "max_z = max(spot_tuner.y)\n",
+    "n = spot_tuner.k\n",
     "for i in var_plots:\n",
     "    for j in var_plots:\n",
     "        if j > i:\n",
     "            filename = \"../Figures.d/\" + experiment_name+\"_contour_\"+str(i)+\"_\"+str(j)+\".pdf\"\n",
-    "            spot_torch.plot_contour(i=i, j=j, min_z=min_z, max_z = max_z, filename=filename)"
+    "            spot_tuner.plot_contour(i=i, j=j, min_z=min_z, max_z = max_z, filename=filename)"
    ]
   },
   {
@@ -4694,7 +4694,7 @@
     }
    ],
    "source": [
-    "spot_torch.parallel_plot()"
+    "spot_tuner.parallel_plot()"
    ]
   },
   {
@@ -4715,10 +4715,10 @@
    "source": [
     "PLOT_ALL = False\n",
     "if PLOT_ALL:\n",
-    "    n = spot_torch.k\n",
+    "    n = spot_tuner.k\n",
     "    for i in range(n-1):\n",
     "        for j in range(i+1, n):\n",
-    "            spot_torch.plot_contour(i=i, j=j, min_z=min_z, max_z = max_z)"
+    "            spot_tuner.plot_contour(i=i, j=j, min_z=min_z, max_z = max_z)"
    ]
   }
  ],