diff --git a/experiments/california_housing.jl b/experiments/california_housing.jl index ffe8610aa2f0eb0110eb7ed33863632bdb7e3838..4a486a1ba4b8311b56c0c1dc2d93ab81bd9b8d17 100644 --- a/experiments/california_housing.jl +++ b/experiments/california_housing.jl @@ -31,6 +31,7 @@ params = ( use_ensembling=true, opt=Flux.Optimise.Descent(0.05), Λ=[0.1, 0.1, 0.1], + reg_strength=0.0, n_individuals=25, dim_reduction=true, ) diff --git a/experiments/circles.jl b/experiments/circles.jl index 59facfe398d776e95fc241d8540018f68507f358..167ae9ae2cd43b1f723ae5918a94471785a3140c 100644 --- a/experiments/circles.jl +++ b/experiments/circles.jl @@ -21,6 +21,7 @@ params = ( sampling_steps=30, opt=Flux.Optimise.Descent(0.05), Λ=[0.1, 0.1, 0.05], + reg_strength=1.0, ) # Best grid search params: diff --git a/experiments/experiment.jl b/experiments/experiment.jl index 95f4a8026ba6309379aae8d586b9beb90598d41d..632ba235c590547b8aafc8e3d05f9558a3316520 100644 --- a/experiments/experiment.jl +++ b/experiments/experiment.jl @@ -151,6 +151,9 @@ function pretrained_path(exper::Experiment) if isfile(joinpath(DEFAULT_OUTPUT_PATH, "$(exper.save_name)_models.jls")) @info "Found local pre-trained models in $(DEFAULT_OUTPUT_PATH) and using those." return DEFAULT_OUTPUT_PATH + elseif isfile("models/$(exper.save_name)_models.jls") + @info "Found local pre-trained models in models/ and using those." + return "models" else @info "Using artifacts. Models were pre-trained on `julia-$(LATEST_VERSION)` and may not work on other versions." Pkg.Artifacts.download_artifact(ARTIFACT_HASH, ARTIFACT_TOML) diff --git a/experiments/german_credit.jl b/experiments/german_credit.jl index 4d5c170c3b0e7344c6886771ed238048f0d4fb42..e64ba13c60b140d906db62d2150624e706716d1f 100644 --- a/experiments/german_credit.jl +++ b/experiments/german_credit.jl @@ -31,6 +31,7 @@ params = ( use_ensembling=true, opt=Flux.Optimise.Descent(0.05), Λ=[0.2, 0.2, 0.2], + reg_strength=0.5, n_individuals=25, dim_reduction=true, ) diff --git a/experiments/gmsc.jl b/experiments/gmsc.jl index e21b72eef4089eadf6deaf9d94c1016a4cd020d1..9f5ab2c5a7deb3646e86da65aec8d6f14e6e9204 100644 --- a/experiments/gmsc.jl +++ b/experiments/gmsc.jl @@ -32,6 +32,7 @@ params = ( use_ensembling = true, opt=Flux.Optimise.Descent(0.05), Λ = [0.1, 0.1, 0.1], + reg_strength = 0.0, n_individuals=25, dim_reduction=true, ) diff --git a/experiments/linearly_separable.jl b/experiments/linearly_separable.jl index 5fed9e4c19f7fadd1500e4be6effd0d4595eb6ea..db09b5bb177a301dc55b007e95b8b16d01488758 100644 --- a/experiments/linearly_separable.jl +++ b/experiments/linearly_separable.jl @@ -20,8 +20,9 @@ params = ( n_layers=3, activation=Flux.swish, epochs=100, - Λ=[0.1, 0.1, 0.05], opt=Flux.Optimise.Descent(0.01), + Λ=[0.1, 0.1, 0.05], + reg_strength=0.0, ) # Best grid search params: diff --git a/experiments/moons.jl b/experiments/moons.jl index f92f0648ed7107e6cdc0bb84e673360a848f6947..c2a83e1024d2ec561688d1663d62591851a6205c 100644 --- a/experiments/moons.jl +++ b/experiments/moons.jl @@ -19,8 +19,9 @@ params = ( epochs=500, sampling_batch_size=10, sampling_steps=30, - Λ=[0.1, 0.1, 0.5], opt=Flux.Optimise.Descent(0.01), + Λ=[0.1, 0.1, 0.5], + reg_strength=0.0, ) # Best grid search params: diff --git a/experiments/post_processing/meta_data.jl b/experiments/post_processing/meta_data.jl index df6a66d6cc7b12eb0a1f43f2a628e6ce4990f8d8..0658563216e1418f655cf2486bebad26d4a4f4a1 100644 --- a/experiments/post_processing/meta_data.jl +++ b/experiments/post_processing/meta_data.jl @@ -59,6 +59,7 @@ function meta_generators(outcome::ExperimentOutcome; save_output::Bool=false, pa generator_dict = outcome.generator_dict Λ = exper.Λ Λ_Δ = exper.Λ_Δ + reg_strengh = exper.reg_strength # Output: opt = first(values(generator_dict)).opt @@ -74,6 +75,7 @@ function meta_generators(outcome::ExperimentOutcome; save_output::Bool=false, pa :lambda_2_Δ => string(Λ_Δ[2]), :lambda_3_Δ => string(Λ_Δ[3]), :n_individuals => exper.n_individuals, + :reg_strength => string(reg_strengh), ) ) diff --git a/models/california_housing_models.jls b/models/california_housing_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..24c49c4138019c7d33317e22e1a4a6b952481e60 Binary files /dev/null and b/models/california_housing_models.jls differ diff --git a/models/circles_models.jls b/models/circles_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..9ec8dce2e7f9d88c65af530762e213f37f498080 Binary files /dev/null and b/models/circles_models.jls differ diff --git a/models/fashion_mnist_models.jls b/models/fashion_mnist_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..6c6fe171b56891dc5fb978fc866efecce79b9d18 Binary files /dev/null and b/models/fashion_mnist_models.jls differ diff --git a/models/german_credit_models.jls b/models/german_credit_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..f7c13d754553aeb5ab9f8052ac29ae75c76998db Binary files /dev/null and b/models/german_credit_models.jls differ diff --git a/models/gmsc_models.jls b/models/gmsc_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..6742fe45a7ef0cccd8235e4f5b7a3d1b1554f959 Binary files /dev/null and b/models/gmsc_models.jls differ diff --git a/models/linearly_separable_models.jls b/models/linearly_separable_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..c296f6603eb83a0341310afcf93ba318249b53dd Binary files /dev/null and b/models/linearly_separable_models.jls differ diff --git a/models/mnist_models.jls b/models/mnist_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..c9557736d96f660bbc2ad5105a9f70fae50bcc6b Binary files /dev/null and b/models/mnist_models.jls differ diff --git a/models/moons_models.jls b/models/moons_models.jls new file mode 100644 index 0000000000000000000000000000000000000000..2884389c0a75512003ca585c9d7acd8092d6595e Binary files /dev/null and b/models/moons_models.jls differ