From 82adeede656f0b2dafdb2c7d0a28e0caf56e133e Mon Sep 17 00:00:00 2001
From: pat-alt <altmeyerpat@gmail.com>
Date: Thu, 19 Oct 2023 18:43:16 +0200
Subject: [PATCH] sorted

---
 experiments/california_housing.jl |  2 +-
 experiments/circles.jl            |  2 +-
 experiments/german_credit.jl      |  2 +-
 experiments/gmsc.jl               |  2 +-
 experiments/grid_search.jl        | 10 ++++++----
 experiments/linearly_separable.jl |  3 ++-
 experiments/moons.jl              |  2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/experiments/california_housing.jl b/experiments/california_housing.jl
index 99e598a9..e8a8db16 100644
--- a/experiments/california_housing.jl
+++ b/experiments/california_housing.jl
@@ -44,7 +44,7 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
 
 if GRID_SEARCH
     grid_search(
diff --git a/experiments/circles.jl b/experiments/circles.jl
index f0789906..0d4a6374 100644
--- a/experiments/circles.jl
+++ b/experiments/circles.jl
@@ -29,7 +29,7 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
 
 if GRID_SEARCH
     grid_search(
diff --git a/experiments/german_credit.jl b/experiments/german_credit.jl
index 082567b2..6a127b07 100644
--- a/experiments/german_credit.jl
+++ b/experiments/german_credit.jl
@@ -44,7 +44,7 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
 
 if GRID_SEARCH
     grid_search(
diff --git a/experiments/gmsc.jl b/experiments/gmsc.jl
index 3c55d0a5..2b93ff4e 100644
--- a/experiments/gmsc.jl
+++ b/experiments/gmsc.jl
@@ -44,7 +44,7 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
 
 if GRID_SEARCH
     grid_search(
diff --git a/experiments/grid_search.jl b/experiments/grid_search.jl
index 0c11b9f2..fff7c414 100644
--- a/experiments/grid_search.jl
+++ b/experiments/grid_search.jl
@@ -56,9 +56,9 @@ function grid_search(
         )
 
         # Collect:
-        params = map(x -> typeof(x[2]) <: Vector ? x[1] => Tuple(x[2]) : x[1] => x[2], params)
+        _params = map(x -> typeof(x[2]) <: Vector ? x[1] => Tuple(x[2]) : x[1] => x[2], params)
         df_params =
-            DataFrame(merge(Dict(:id => counter), Dict(params))) |>
+            DataFrame(merge(Dict(:id => counter), Dict(_params))) |>
             x -> select(x, :id, Not(:id))
         df_outcomes =
             DataFrame(Dict(:id => counter, :params => params, :outcome => outcome)) |>
@@ -236,7 +236,7 @@ best_outcome(outcomes; measure=["distance_from_energy_l2"]) = best_absolute_outc
 
 Appends the best parameters from grid search results to the specified parameters.
 """
-function append_best_params!(params::NamedTuple, dataname::String)
+function append_best_params(params::NamedTuple, dataname::String)
     if !isfile(
         joinpath(
             DEFAULT_OUTPUT_PATH,
@@ -256,6 +256,8 @@ function append_best_params!(params::NamedTuple, dataname::String)
         )
         best_params = best_outcome(grid_search_results).params
         params = (; params..., best_params...)
-        @info "Best parameters: $(best_params)"
+        
+        params = (; params..., (; Λ = typeof(params.Λ) <: Tuple ? collect(params.Λ) : params.Λ)...)
     end
+    return params
 end
diff --git a/experiments/linearly_separable.jl b/experiments/linearly_separable.jl
index 2421bd9a..43554f36 100644
--- a/experiments/linearly_separable.jl
+++ b/experiments/linearly_separable.jl
@@ -29,7 +29,8 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
+@info "Using the following parameters: $(params)"
 
 if GRID_SEARCH
     grid_search(
diff --git a/experiments/moons.jl b/experiments/moons.jl
index a1500279..809bdc40 100644
--- a/experiments/moons.jl
+++ b/experiments/moons.jl
@@ -28,7 +28,7 @@ params = (
 )
 
 # Best grid search params:
-append_best_params!(params, dataname)
+params = append_best_params(params, dataname)
 
 if GRID_SEARCH
     grid_search(
-- 
GitLab