diff --git a/artifacts/results/images/mnist_eccco.png b/artifacts/results/images/mnist_eccco.png index c431d9d92a993d066d7053e2d771f522bd2e333d..acc03a90aac1bb5cd322167b79a0c53df280a939 100644 Binary files a/artifacts/results/images/mnist_eccco.png and b/artifacts/results/images/mnist_eccco.png differ diff --git a/artifacts/results/images/mnist_generated_JEM Ensemble.png b/artifacts/results/images/mnist_generated_JEM Ensemble.png index dc03f1c252fd1c91c0cbce49f1edc9ef7ba414f1..c1ab0d749b8ea897bef690a675f588a484cad775 100644 Binary files a/artifacts/results/images/mnist_generated_JEM Ensemble.png and b/artifacts/results/images/mnist_generated_JEM Ensemble.png differ diff --git a/artifacts/results/images/mnist_generated_JEM.png b/artifacts/results/images/mnist_generated_JEM.png index ba4a42f4d9903ae16108eeceee2be2e8d19ed8e1..55986532a9d3fb152e7a0d30f06c4c16465cfdfb 100644 Binary files a/artifacts/results/images/mnist_generated_JEM.png and b/artifacts/results/images/mnist_generated_JEM.png differ diff --git a/artifacts/results/images/mnist_generated_MLP Ensemble.png b/artifacts/results/images/mnist_generated_MLP Ensemble.png index 32e1c35d94ef76dcc1fac95e1b4d50f40b203b85..4b61caf6a16da195d882ebb4f58b7822497bd08b 100644 Binary files a/artifacts/results/images/mnist_generated_MLP Ensemble.png and b/artifacts/results/images/mnist_generated_MLP Ensemble.png differ diff --git a/artifacts/results/images/mnist_generated_MLP.png b/artifacts/results/images/mnist_generated_MLP.png index 24333578aa201ee4e90e1a2bda87c58bd08bfb00..3a12c44c406fb2495e6f9534e4f77cd659e9ab08 100644 Binary files a/artifacts/results/images/mnist_generated_MLP.png and b/artifacts/results/images/mnist_generated_MLP.png differ diff --git a/artifacts/results/mnist_architectures.jls b/artifacts/results/mnist_architectures.jls index 3b5e1755cb6ab5c7c2ef31eb799ed1ff27020615..ff591e713aa432da892c1adead65f15de1c253b7 100644 Binary files a/artifacts/results/mnist_architectures.jls and b/artifacts/results/mnist_architectures.jls differ diff --git a/artifacts/results/mnist_model_performance.csv b/artifacts/results/mnist_model_performance.csv index 6fcf69754ab576fde6c523972f2249f1b16aeb15..c61e7d1849d84f1250982e1555348ad85433b9f5 100644 --- a/artifacts/results/mnist_model_performance.csv +++ b/artifacts/results/mnist_model_performance.csv @@ -1,5 +1,5 @@ acc,precision,f1score,mod_name,dataname -0.8973,0.8966409231713075,0.8961958418891548,JEM Ensemble,MNIST -0.9103,0.912803491500963,0.9091350554105558,MLP,MNIST -0.9304,0.9296691361848305,0.9296246536238468,MLP Ensemble,MNIST -0.8399,0.8454738316353376,0.8378058821466077,JEM,MNIST +0.9154,0.9156058593092286,0.9144154048006502,JEM Ensemble,MNIST +0.9651,0.9649131785895403,0.9647206151544168,MLP,MNIST +0.9745,0.9743410428044881,0.9743191770867725,MLP Ensemble,MNIST +0.8533999999999999,0.8673648922304751,0.8529767185660582,JEM,MNIST diff --git a/artifacts/results/mnist_model_performance.jls b/artifacts/results/mnist_model_performance.jls index dd9b278e3725e7ad0170f2ddffb6a5b5686d4d47..f5b4a01a9f26fb26505c1bd1e01d82743b7072a5 100644 Binary files a/artifacts/results/mnist_model_performance.jls and b/artifacts/results/mnist_model_performance.jls differ diff --git a/artifacts/results/mnist_models.jls b/artifacts/results/mnist_models.jls index db297da029f486bc913c7de89fabf652e50cfe12..4e21686abb0795da0f7f11bc292baf289706df3b 100644 Binary files a/artifacts/results/mnist_models.jls and b/artifacts/results/mnist_models.jls differ diff --git a/artifacts/results/mnist_vae.jls b/artifacts/results/mnist_vae.jls index 466833f9cd357876419d6e054b4ebe4160f3ef91..a1705aec7bdda962a4147b6aae68f8c2a3991828 100644 Binary files a/artifacts/results/mnist_vae.jls and b/artifacts/results/mnist_vae.jls differ diff --git a/artifacts/results/mnist_vae_weak.jls b/artifacts/results/mnist_vae_weak.jls index ebd07d30a83332c40c823b8399ca1760ef72fb0f..c0d6c2a6eb82fa5d9dfc10d86de3aaca234bf441 100644 Binary files a/artifacts/results/mnist_vae_weak.jls and b/artifacts/results/mnist_vae_weak.jls differ diff --git a/notebooks/mnist.qmd b/notebooks/mnist.qmd index c3774a14083b13774be4e6da99c8b4025e6c2d18..bc4da42932630634e0381dec321c57f7e098abe5 100644 --- a/notebooks/mnist.qmd +++ b/notebooks/mnist.qmd @@ -164,11 +164,11 @@ end ```{julia} # Hyper: -_retrain = false -_regen = false +_retrain = true +_regen = true # Data: -n_obs = 10000 +n_obs = nothing counterfactual_data = load_mnist(n_obs) counterfactual_data.X = pre_process.(counterfactual_data.X) counterfactual_data.generative_model = vae @@ -185,7 +185,7 @@ First, let's create a couple of image classifier architectures: ```{julia} # Model parameters: -epochs = 10 +epochs = 25 batch_size = minimum([Int(round(n_obs/10)), 128]) n_hidden = 128 activation = Flux.swish @@ -207,7 +207,7 @@ sampler = ConditionalSampler( input_size=(input_dim,), batch_size=10, ) -α = [1.0,1.0,1e-2] # penalty strengths +α = [1.0,1.0,25e-3] # penalty strengths ``` ```{julia} @@ -496,7 +496,7 @@ end # Final model: lenet = NeuralNetworkClassifier( builder=LeNetBuilder(5, 6, 16), - epochs=epochs, + epochs=50, batch_size=batch_size, finaliser=_finaliser, loss=_loss,