diff --git a/experiments/benchmarking/benchmarking.jl b/experiments/benchmarking/benchmarking.jl index 05bf79771e43d1b9701a9a8278621c66802d16b0..6e5ca946f17c62cb35e37be9e9fd7942d1f7b926 100644 --- a/experiments/benchmarking/benchmarking.jl +++ b/experiments/benchmarking/benchmarking.jl @@ -18,7 +18,7 @@ function default_generators(; generator_dict = Dict( "Wachter" => WachterGenerator(λ=λâ‚, opt=opt), "REVISE" => REVISEGenerator(λ=λâ‚, opt=opt), - "Schut" => GreedyGenerator(), + "Schut" => GreedyGenerator(η=opt.eta), "ECCCo" => ECCCoGenerator(λ=Λ, opt=opt, use_class_loss=use_class_loss, nsamples=nsamples, nmin=nmin, niter=niter_eccco), "ECCCo (no CP)" => ECCCoGenerator(λ=[λâ‚, 0.0, λ₃], opt=opt, use_class_loss=use_class_loss, nsamples=nsamples, nmin=nmin, niter=niter_eccco), "ECCCo (no EBM)" => ECCCoGenerator(λ=[λâ‚, λ₂, 0.0], opt=opt, use_class_loss=use_class_loss, nsamples=nsamples, nmin=nmin, niter=niter_eccco), diff --git a/experiments/mnist.jl b/experiments/mnist.jl index 4ceef7669849da1ea0eb53e011a913c1a50fd64d..9f7ab1bdbff64245b52185f8d7f5f2f5b60f78d3 100644 --- a/experiments/mnist.jl +++ b/experiments/mnist.jl @@ -31,7 +31,7 @@ ce_measures = [CE_MEASURES..., ECCCo.distance_from_energy_ssim, ECCCo.distance_f # Parameter choices: params = ( - n_individuals=N_IND_SPECIFIED ? N_IND : 5, + n_individuals=N_IND_SPECIFIED ? N_IND : 10, builder=default_builder(n_hidden=128, n_layers=1, activation=Flux.swish), ð’Ÿx=Uniform(-1.0, 1.0), α=[1.0, 1.0, 1e-2], @@ -44,9 +44,9 @@ params = ( nsamples=10, nmin=1, niter_eccco=10, - Λ=[0.1, 0.25, 0.25], - Λ_Δ=[0.1, 0.1, 1.0], - opt=Flux.Optimise.Descent(0.25), + Λ=[0.01, 0.25, 0.25], + Λ_Δ=[0.01, 0.1, 1.0], + opt=Flux.Optimise.Descent(0.1), reg_strength = 0.01, ce_measures=ce_measures, )