From 7bd7c460de77f50f269176ba2492dc96ba2c0896 Mon Sep 17 00:00:00 2001
From: Gaspard Goupy <gaspard.goupy@univ-lille.fr>
Date: Thu, 20 Jul 2023 15:45:53 +0200
Subject: [PATCH] Rename configs with the paper naming conventions
---
.../config/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/config/{sstdp-og.json => s2stdp.json} | 2 +-
scripts/config/CIFAR10/analysis/config/sstdp.json | 2 +-
.../analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../CIFAR10/analysis/lr/{sstdp-og.json => s2stdp.json} | 8 ++++----
scripts/config/CIFAR10/analysis/lr/sstdp.json | 8 ++++----
.../analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/t_gap/{sstdp-og.json => s2stdp.json} | 8 ++++----
scripts/config/CIFAR10/analysis/t_gap/sstdp.json | 8 ++++----
scripts/config/CIFAR10/{csnn-3 => csnn-128}/csnn.json | 0
.../pcn-sstdp.json => csnn-128/pcn-s2stdp.json} | 0
.../config/CIFAR10/{csnn-3 => csnn-128}/rstdp-20n.json | 0
scripts/config/CIFAR10/{csnn-3 => csnn-128}/rstdp.json | 0
.../{csnn-3/sstdp.json => csnn-128/s2stdp.json} | 0
.../{csnn-3/sstdp-og.json => csnn-128/sstdp.json} | 0
scripts/config/CIFAR10/{csnn-1 => csnn-16}/csnn.json | 0
.../{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} | 0
.../config/CIFAR10/{csnn-1 => csnn-16}/rstdp-20n.json | 0
scripts/config/CIFAR10/{csnn-1 => csnn-16}/rstdp.json | 0
.../CIFAR10/{csnn-1/sstdp.json => csnn-16/s2stdp.json} | 0
.../{csnn-1/sstdp-og.json => csnn-16/sstdp.json} | 0
scripts/config/CIFAR10/{csnn-2 => csnn-64}/csnn.json | 0
.../{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} | 0
.../config/CIFAR10/{csnn-2 => csnn-64}/rstdp-20n.json | 0
scripts/config/CIFAR10/{csnn-2 => csnn-64}/rstdp.json | 0
.../CIFAR10/{csnn-2/sstdp.json => csnn-64/s2stdp.json} | 0
.../{csnn-2/sstdp-og.json => csnn-64/sstdp.json} | 0
.../gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../CIFAR10/gridsearch/{sstdp-og.json => s2stdp.json} | 8 ++++----
scripts/config/CIFAR10/gridsearch/sstdp.json | 8 ++++----
.../config/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/config/{sstdp-og.json => s2stdp.json} | 2 +-
scripts/config/F-MNIST/analysis/config/sstdp.json | 2 +-
.../analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../sstdp-og.json => F-MNIST/analysis/lr/s2stdp.json} | 8 ++++----
scripts/config/F-MNIST/analysis/lr/sstdp.json | 8 ++++----
.../analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/t_gap/{sstdp-og.json => s2stdp.json} | 10 +++++-----
scripts/config/F-MNIST/analysis/t_gap/sstdp.json | 10 +++++-----
scripts/config/F-MNIST/{csnn-3 => csnn-128}/csnn.json | 0
.../pcn-sstdp.json => csnn-128/pcn-s2stdp.json} | 0
.../config/F-MNIST/{csnn-3 => csnn-128}/rstdp-20n.json | 0
scripts/config/F-MNIST/{csnn-3 => csnn-128}/rstdp.json | 0
.../{csnn-3/sstdp.json => csnn-128/s2stdp.json} | 0
.../{csnn-3/sstdp-og.json => csnn-128/sstdp.json} | 0
scripts/config/F-MNIST/{csnn-1 => csnn-16}/csnn.json | 0
.../{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} | 0
.../config/F-MNIST/{csnn-1 => csnn-16}/rstdp-20n.json | 0
scripts/config/F-MNIST/{csnn-1 => csnn-16}/rstdp.json | 0
.../F-MNIST/{csnn-1/sstdp.json => csnn-16/s2stdp.json} | 0
.../{csnn-1/sstdp-og.json => csnn-16/sstdp.json} | 0
scripts/config/F-MNIST/{csnn-2 => csnn-64}/csnn.json | 0
.../{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} | 0
.../config/F-MNIST/{csnn-2 => csnn-64}/rstdp-20n.json | 0
scripts/config/F-MNIST/{csnn-2 => csnn-64}/rstdp.json | 0
.../F-MNIST/{csnn-2/sstdp.json => csnn-64/s2stdp.json} | 0
.../{csnn-2/sstdp-og.json => csnn-64/sstdp.json} | 0
.../gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../F-MNIST/gridsearch/{sstdp-og.json => s2stdp.json} | 4 ++--
scripts/config/F-MNIST/gridsearch/sstdp.json | 4 ++--
.../config/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/config/{sstdp-og.json => s2stdp.json} | 2 +-
scripts/config/MNIST/analysis/config/sstdp.json | 2 +-
.../analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../lr/sstdp-og.json => MNIST/analysis/lr/s2stdp.json} | 6 +++---
scripts/config/MNIST/analysis/lr/sstdp.json | 8 ++++----
.../analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../analysis/t_gap/{sstdp-og.json => s2stdp.json} | 10 +++++-----
scripts/config/MNIST/analysis/t_gap/sstdp.json | 10 +++++-----
scripts/config/MNIST/{csnn-3 => csnn-128}/csnn.json | 0
.../pcn-sstdp.json => csnn-128/pcn-s2stdp.json} | 0
.../config/MNIST/{csnn-3 => csnn-128}/rstdp-20n.json | 0
scripts/config/MNIST/{csnn-3 => csnn-128}/rstdp.json | 0
.../MNIST/{csnn-3/sstdp.json => csnn-128/s2stdp.json} | 0
.../{csnn-3/sstdp-og.json => csnn-128/sstdp.json} | 0
scripts/config/MNIST/{csnn-1 => csnn-16}/csnn.json | 0
.../{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} | 0
.../config/MNIST/{csnn-1 => csnn-16}/rstdp-20n.json | 0
scripts/config/MNIST/{csnn-1 => csnn-16}/rstdp.json | 0
.../MNIST/{csnn-1/sstdp.json => csnn-16/s2stdp.json} | 0
.../MNIST/{csnn-1/sstdp-og.json => csnn-16/sstdp.json} | 0
scripts/config/MNIST/{csnn-2 => csnn-64}/csnn.json | 0
.../{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} | 0
.../config/MNIST/{csnn-2 => csnn-64}/rstdp-20n.json | 0
scripts/config/MNIST/{csnn-2 => csnn-64}/rstdp.json | 0
.../MNIST/{csnn-2/sstdp.json => csnn-64/s2stdp.json} | 0
.../MNIST/{csnn-2/sstdp-og.json => csnn-64/sstdp.json} | 0
.../gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} | 0
.../MNIST/gridsearch/{sstdp-og.json => s2stdp.json} | 8 ++++----
scripts/config/MNIST/gridsearch/sstdp.json | 8 ++++----
90 files changed, 77 insertions(+), 77 deletions(-)
rename scripts/config/CIFAR10/analysis/config/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/analysis/config/{sstdp-og.json => s2stdp.json} (97%)
rename scripts/config/CIFAR10/analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/analysis/lr/{sstdp-og.json => s2stdp.json} (91%)
rename scripts/config/CIFAR10/analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/analysis/t_gap/{sstdp-og.json => s2stdp.json} (90%)
rename scripts/config/CIFAR10/{csnn-3 => csnn-128}/csnn.json (100%)
rename scripts/config/CIFAR10/{csnn-3/pcn-sstdp.json => csnn-128/pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-3 => csnn-128}/rstdp-20n.json (100%)
rename scripts/config/CIFAR10/{csnn-3 => csnn-128}/rstdp.json (100%)
rename scripts/config/CIFAR10/{csnn-3/sstdp.json => csnn-128/s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-3/sstdp-og.json => csnn-128/sstdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-1 => csnn-16}/csnn.json (100%)
rename scripts/config/CIFAR10/{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-1 => csnn-16}/rstdp-20n.json (100%)
rename scripts/config/CIFAR10/{csnn-1 => csnn-16}/rstdp.json (100%)
rename scripts/config/CIFAR10/{csnn-1/sstdp.json => csnn-16/s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-1/sstdp-og.json => csnn-16/sstdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-2 => csnn-64}/csnn.json (100%)
rename scripts/config/CIFAR10/{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-2 => csnn-64}/rstdp-20n.json (100%)
rename scripts/config/CIFAR10/{csnn-2 => csnn-64}/rstdp.json (100%)
rename scripts/config/CIFAR10/{csnn-2/sstdp.json => csnn-64/s2stdp.json} (100%)
rename scripts/config/CIFAR10/{csnn-2/sstdp-og.json => csnn-64/sstdp.json} (100%)
rename scripts/config/CIFAR10/gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/CIFAR10/gridsearch/{sstdp-og.json => s2stdp.json} (84%)
rename scripts/config/F-MNIST/analysis/config/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/analysis/config/{sstdp-og.json => s2stdp.json} (97%)
rename scripts/config/F-MNIST/analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/{MNIST/analysis/lr/sstdp-og.json => F-MNIST/analysis/lr/s2stdp.json} (91%)
rename scripts/config/F-MNIST/analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/analysis/t_gap/{sstdp-og.json => s2stdp.json} (87%)
rename scripts/config/F-MNIST/{csnn-3 => csnn-128}/csnn.json (100%)
rename scripts/config/F-MNIST/{csnn-3/pcn-sstdp.json => csnn-128/pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-3 => csnn-128}/rstdp-20n.json (100%)
rename scripts/config/F-MNIST/{csnn-3 => csnn-128}/rstdp.json (100%)
rename scripts/config/F-MNIST/{csnn-3/sstdp.json => csnn-128/s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-3/sstdp-og.json => csnn-128/sstdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-1 => csnn-16}/csnn.json (100%)
rename scripts/config/F-MNIST/{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-1 => csnn-16}/rstdp-20n.json (100%)
rename scripts/config/F-MNIST/{csnn-1 => csnn-16}/rstdp.json (100%)
rename scripts/config/F-MNIST/{csnn-1/sstdp.json => csnn-16/s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-1/sstdp-og.json => csnn-16/sstdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-2 => csnn-64}/csnn.json (100%)
rename scripts/config/F-MNIST/{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-2 => csnn-64}/rstdp-20n.json (100%)
rename scripts/config/F-MNIST/{csnn-2 => csnn-64}/rstdp.json (100%)
rename scripts/config/F-MNIST/{csnn-2/sstdp.json => csnn-64/s2stdp.json} (100%)
rename scripts/config/F-MNIST/{csnn-2/sstdp-og.json => csnn-64/sstdp.json} (100%)
rename scripts/config/F-MNIST/gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/F-MNIST/gridsearch/{sstdp-og.json => s2stdp.json} (91%)
rename scripts/config/MNIST/analysis/config/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/analysis/config/{sstdp-og.json => s2stdp.json} (97%)
rename scripts/config/MNIST/analysis/lr/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/{F-MNIST/analysis/lr/sstdp-og.json => MNIST/analysis/lr/s2stdp.json} (93%)
rename scripts/config/MNIST/analysis/t_gap/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/analysis/t_gap/{sstdp-og.json => s2stdp.json} (87%)
rename scripts/config/MNIST/{csnn-3 => csnn-128}/csnn.json (100%)
rename scripts/config/MNIST/{csnn-3/pcn-sstdp.json => csnn-128/pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-3 => csnn-128}/rstdp-20n.json (100%)
rename scripts/config/MNIST/{csnn-3 => csnn-128}/rstdp.json (100%)
rename scripts/config/MNIST/{csnn-3/sstdp.json => csnn-128/s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-3/sstdp-og.json => csnn-128/sstdp.json} (100%)
rename scripts/config/MNIST/{csnn-1 => csnn-16}/csnn.json (100%)
rename scripts/config/MNIST/{csnn-1/pcn-sstdp.json => csnn-16/pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-1 => csnn-16}/rstdp-20n.json (100%)
rename scripts/config/MNIST/{csnn-1 => csnn-16}/rstdp.json (100%)
rename scripts/config/MNIST/{csnn-1/sstdp.json => csnn-16/s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-1/sstdp-og.json => csnn-16/sstdp.json} (100%)
rename scripts/config/MNIST/{csnn-2 => csnn-64}/csnn.json (100%)
rename scripts/config/MNIST/{csnn-2/pcn-sstdp.json => csnn-64/pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-2 => csnn-64}/rstdp-20n.json (100%)
rename scripts/config/MNIST/{csnn-2 => csnn-64}/rstdp.json (100%)
rename scripts/config/MNIST/{csnn-2/sstdp.json => csnn-64/s2stdp.json} (100%)
rename scripts/config/MNIST/{csnn-2/sstdp-og.json => csnn-64/sstdp.json} (100%)
rename scripts/config/MNIST/gridsearch/{pcn-sstdp.json => pcn-s2stdp.json} (100%)
rename scripts/config/MNIST/gridsearch/{sstdp-og.json => s2stdp.json} (81%)
diff --git a/scripts/config/CIFAR10/analysis/config/pcn-sstdp.json b/scripts/config/CIFAR10/analysis/config/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/analysis/config/pcn-sstdp.json
rename to scripts/config/CIFAR10/analysis/config/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/analysis/config/sstdp-og.json b/scripts/config/CIFAR10/analysis/config/s2stdp.json
similarity index 97%
rename from scripts/config/CIFAR10/analysis/config/sstdp-og.json
rename to scripts/config/CIFAR10/analysis/config/s2stdp.json
index f085462..b37d2ee 100644
--- a/scripts/config/CIFAR10/analysis/config/sstdp-og.json
+++ b/scripts/config/CIFAR10/analysis/config/s2stdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.01, 0.001, 0.005, 0.01, 0.005, 0.01, 0.001, 0.01, 0.001, 0.005 ],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/CIFAR10/analysis/config/sstdp.json b/scripts/config/CIFAR10/analysis/config/sstdp.json
index b37d2ee..f085462 100644
--- a/scripts/config/CIFAR10/analysis/config/sstdp.json
+++ b/scripts/config/CIFAR10/analysis/config/sstdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.01, 0.001, 0.005, 0.01, 0.005, 0.01, 0.001, 0.01, 0.001, 0.005 ],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/CIFAR10/analysis/lr/pcn-sstdp.json b/scripts/config/CIFAR10/analysis/lr/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/analysis/lr/pcn-sstdp.json
rename to scripts/config/CIFAR10/analysis/lr/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/analysis/lr/sstdp-og.json b/scripts/config/CIFAR10/analysis/lr/s2stdp.json
similarity index 91%
rename from scripts/config/CIFAR10/analysis/lr/sstdp-og.json
rename to scripts/config/CIFAR10/analysis/lr/s2stdp.json
index be63b4f..ca69aa5 100644
--- a/scripts/config/CIFAR10/analysis/lr/sstdp-og.json
+++ b/scripts/config/CIFAR10/analysis/lr/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 200,
+ "firing_threshold": 500,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": 0.0005,
+ "t_gap": 0.005,
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/CIFAR10/analysis/lr/sstdp.json b/scripts/config/CIFAR10/analysis/lr/sstdp.json
index ca69aa5..be63b4f 100644
--- a/scripts/config/CIFAR10/analysis/lr/sstdp.json
+++ b/scripts/config/CIFAR10/analysis/lr/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 500,
+ "firing_threshold": 200,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": 0.005,
+ "t_gap": 0.0005,
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/CIFAR10/analysis/t_gap/pcn-sstdp.json b/scripts/config/CIFAR10/analysis/t_gap/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/analysis/t_gap/pcn-sstdp.json
rename to scripts/config/CIFAR10/analysis/t_gap/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/analysis/t_gap/sstdp-og.json b/scripts/config/CIFAR10/analysis/t_gap/s2stdp.json
similarity index 90%
rename from scripts/config/CIFAR10/analysis/t_gap/sstdp-og.json
rename to scripts/config/CIFAR10/analysis/t_gap/s2stdp.json
index 6461a8e..c0f779e 100644
--- a/scripts/config/CIFAR10/analysis/t_gap/sstdp-og.json
+++ b/scripts/config/CIFAR10/analysis/t_gap/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 200,
+ "firing_threshold": 500,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [ 0.2, 0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001 ],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,7 +27,7 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.075,
+ "stdp_ap": 0.001,
"stdp_am": -0.075,
"stdp_anti_ap": null,
"stdp_anti_am": null,
diff --git a/scripts/config/CIFAR10/analysis/t_gap/sstdp.json b/scripts/config/CIFAR10/analysis/t_gap/sstdp.json
index c0f779e..6461a8e 100644
--- a/scripts/config/CIFAR10/analysis/t_gap/sstdp.json
+++ b/scripts/config/CIFAR10/analysis/t_gap/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 500,
+ "firing_threshold": 200,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [ 0.2, 0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001 ],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,7 +27,7 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.001,
+ "stdp_ap": 0.075,
"stdp_am": -0.075,
"stdp_anti_ap": null,
"stdp_anti_am": null,
diff --git a/scripts/config/CIFAR10/csnn-3/csnn.json b/scripts/config/CIFAR10/csnn-128/csnn.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/csnn.json
rename to scripts/config/CIFAR10/csnn-128/csnn.json
diff --git a/scripts/config/CIFAR10/csnn-3/pcn-sstdp.json b/scripts/config/CIFAR10/csnn-128/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/pcn-sstdp.json
rename to scripts/config/CIFAR10/csnn-128/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-3/rstdp-20n.json b/scripts/config/CIFAR10/csnn-128/rstdp-20n.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/rstdp-20n.json
rename to scripts/config/CIFAR10/csnn-128/rstdp-20n.json
diff --git a/scripts/config/CIFAR10/csnn-3/rstdp.json b/scripts/config/CIFAR10/csnn-128/rstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/rstdp.json
rename to scripts/config/CIFAR10/csnn-128/rstdp.json
diff --git a/scripts/config/CIFAR10/csnn-3/sstdp.json b/scripts/config/CIFAR10/csnn-128/s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/sstdp.json
rename to scripts/config/CIFAR10/csnn-128/s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-3/sstdp-og.json b/scripts/config/CIFAR10/csnn-128/sstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-3/sstdp-og.json
rename to scripts/config/CIFAR10/csnn-128/sstdp.json
diff --git a/scripts/config/CIFAR10/csnn-1/csnn.json b/scripts/config/CIFAR10/csnn-16/csnn.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/csnn.json
rename to scripts/config/CIFAR10/csnn-16/csnn.json
diff --git a/scripts/config/CIFAR10/csnn-1/pcn-sstdp.json b/scripts/config/CIFAR10/csnn-16/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/pcn-sstdp.json
rename to scripts/config/CIFAR10/csnn-16/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-1/rstdp-20n.json b/scripts/config/CIFAR10/csnn-16/rstdp-20n.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/rstdp-20n.json
rename to scripts/config/CIFAR10/csnn-16/rstdp-20n.json
diff --git a/scripts/config/CIFAR10/csnn-1/rstdp.json b/scripts/config/CIFAR10/csnn-16/rstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/rstdp.json
rename to scripts/config/CIFAR10/csnn-16/rstdp.json
diff --git a/scripts/config/CIFAR10/csnn-1/sstdp.json b/scripts/config/CIFAR10/csnn-16/s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/sstdp.json
rename to scripts/config/CIFAR10/csnn-16/s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-1/sstdp-og.json b/scripts/config/CIFAR10/csnn-16/sstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-1/sstdp-og.json
rename to scripts/config/CIFAR10/csnn-16/sstdp.json
diff --git a/scripts/config/CIFAR10/csnn-2/csnn.json b/scripts/config/CIFAR10/csnn-64/csnn.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/csnn.json
rename to scripts/config/CIFAR10/csnn-64/csnn.json
diff --git a/scripts/config/CIFAR10/csnn-2/pcn-sstdp.json b/scripts/config/CIFAR10/csnn-64/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/pcn-sstdp.json
rename to scripts/config/CIFAR10/csnn-64/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-2/rstdp-20n.json b/scripts/config/CIFAR10/csnn-64/rstdp-20n.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/rstdp-20n.json
rename to scripts/config/CIFAR10/csnn-64/rstdp-20n.json
diff --git a/scripts/config/CIFAR10/csnn-2/rstdp.json b/scripts/config/CIFAR10/csnn-64/rstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/rstdp.json
rename to scripts/config/CIFAR10/csnn-64/rstdp.json
diff --git a/scripts/config/CIFAR10/csnn-2/sstdp.json b/scripts/config/CIFAR10/csnn-64/s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/sstdp.json
rename to scripts/config/CIFAR10/csnn-64/s2stdp.json
diff --git a/scripts/config/CIFAR10/csnn-2/sstdp-og.json b/scripts/config/CIFAR10/csnn-64/sstdp.json
similarity index 100%
rename from scripts/config/CIFAR10/csnn-2/sstdp-og.json
rename to scripts/config/CIFAR10/csnn-64/sstdp.json
diff --git a/scripts/config/CIFAR10/gridsearch/pcn-sstdp.json b/scripts/config/CIFAR10/gridsearch/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/CIFAR10/gridsearch/pcn-sstdp.json
rename to scripts/config/CIFAR10/gridsearch/pcn-s2stdp.json
diff --git a/scripts/config/CIFAR10/gridsearch/sstdp-og.json b/scripts/config/CIFAR10/gridsearch/s2stdp.json
similarity index 84%
rename from scripts/config/CIFAR10/gridsearch/sstdp-og.json
rename to scripts/config/CIFAR10/gridsearch/s2stdp.json
index d625cec..0f8ae4a 100644
--- a/scripts/config/CIFAR10/gridsearch/sstdp-og.json
+++ b/scripts/config/CIFAR10/gridsearch/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": false,
"n_neurons": 10,
- "firing_threshold": [150, 200, 250, 300, 350],
+ "firing_threshold": [350, 400, 450, 500, 550],
"leak_tau": null,
"decision_making": "single",
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001],
+ "t_gap": [0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,7 +27,7 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": [0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.001],
+ "stdp_ap": [0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001],
"stdp_am": [-0.3, -0.2, -0.1, -0.075, -0.05],
"stdp_anti_ap": null,
"stdp_anti_am": null,
diff --git a/scripts/config/CIFAR10/gridsearch/sstdp.json b/scripts/config/CIFAR10/gridsearch/sstdp.json
index 0f8ae4a..d625cec 100644
--- a/scripts/config/CIFAR10/gridsearch/sstdp.json
+++ b/scripts/config/CIFAR10/gridsearch/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": false,
"n_neurons": 10,
- "firing_threshold": [350, 400, 450, 500, 550],
+ "firing_threshold": [150, 200, 250, 300, 350],
"leak_tau": null,
"decision_making": "single",
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005],
+ "t_gap": [0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,7 +27,7 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": [0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001],
+ "stdp_ap": [0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.001],
"stdp_am": [-0.3, -0.2, -0.1, -0.075, -0.05],
"stdp_anti_ap": null,
"stdp_anti_am": null,
diff --git a/scripts/config/F-MNIST/analysis/config/pcn-sstdp.json b/scripts/config/F-MNIST/analysis/config/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/analysis/config/pcn-sstdp.json
rename to scripts/config/F-MNIST/analysis/config/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/analysis/config/sstdp-og.json b/scripts/config/F-MNIST/analysis/config/s2stdp.json
similarity index 97%
rename from scripts/config/F-MNIST/analysis/config/sstdp-og.json
rename to scripts/config/F-MNIST/analysis/config/s2stdp.json
index 5dc53b2..63df1af 100644
--- a/scripts/config/F-MNIST/analysis/config/sstdp-og.json
+++ b/scripts/config/F-MNIST/analysis/config/s2stdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.02, 0.005, 0.01, 0.02, 0.01, 0.02, 0.005, 0.02, 0.005, 0.01 ],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/F-MNIST/analysis/config/sstdp.json b/scripts/config/F-MNIST/analysis/config/sstdp.json
index 63df1af..5dc53b2 100644
--- a/scripts/config/F-MNIST/analysis/config/sstdp.json
+++ b/scripts/config/F-MNIST/analysis/config/sstdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.02, 0.005, 0.01, 0.02, 0.01, 0.02, 0.005, 0.02, 0.005, 0.01 ],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/F-MNIST/analysis/lr/pcn-sstdp.json b/scripts/config/F-MNIST/analysis/lr/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/analysis/lr/pcn-sstdp.json
rename to scripts/config/F-MNIST/analysis/lr/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/analysis/lr/sstdp-og.json b/scripts/config/F-MNIST/analysis/lr/s2stdp.json
similarity index 91%
rename from scripts/config/MNIST/analysis/lr/sstdp-og.json
rename to scripts/config/F-MNIST/analysis/lr/s2stdp.json
index 573ea4d..d2d503c 100644
--- a/scripts/config/MNIST/analysis/lr/sstdp-og.json
+++ b/scripts/config/F-MNIST/analysis/lr/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 200,
+ "firing_threshold": 300,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": 0.06,
+ "t_gap": 0.02,
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/F-MNIST/analysis/lr/sstdp.json b/scripts/config/F-MNIST/analysis/lr/sstdp.json
index d2d503c..c31d278 100644
--- a/scripts/config/F-MNIST/analysis/lr/sstdp.json
+++ b/scripts/config/F-MNIST/analysis/lr/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 300,
+ "firing_threshold": 350,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": 0.02,
+ "t_gap": 0.03,
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/F-MNIST/analysis/t_gap/pcn-sstdp.json b/scripts/config/F-MNIST/analysis/t_gap/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/analysis/t_gap/pcn-sstdp.json
rename to scripts/config/F-MNIST/analysis/t_gap/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/analysis/t_gap/sstdp-og.json b/scripts/config/F-MNIST/analysis/t_gap/s2stdp.json
similarity index 87%
rename from scripts/config/F-MNIST/analysis/t_gap/sstdp-og.json
rename to scripts/config/F-MNIST/analysis/t_gap/s2stdp.json
index b769593..8c82c16 100644
--- a/scripts/config/F-MNIST/analysis/t_gap/sstdp-og.json
+++ b/scripts/config/F-MNIST/analysis/t_gap/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 350,
+ "firing_threshold": 300,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.001,
- "stdp_am": -0.2,
+ "stdp_ap": 0.005,
+ "stdp_am": -0.075,
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
diff --git a/scripts/config/F-MNIST/analysis/t_gap/sstdp.json b/scripts/config/F-MNIST/analysis/t_gap/sstdp.json
index 8c82c16..b769593 100644
--- a/scripts/config/F-MNIST/analysis/t_gap/sstdp.json
+++ b/scripts/config/F-MNIST/analysis/t_gap/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 300,
+ "firing_threshold": 350,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.005,
- "stdp_am": -0.075,
+ "stdp_ap": 0.001,
+ "stdp_am": -0.2,
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
diff --git a/scripts/config/F-MNIST/csnn-3/csnn.json b/scripts/config/F-MNIST/csnn-128/csnn.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/csnn.json
rename to scripts/config/F-MNIST/csnn-128/csnn.json
diff --git a/scripts/config/F-MNIST/csnn-3/pcn-sstdp.json b/scripts/config/F-MNIST/csnn-128/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/pcn-sstdp.json
rename to scripts/config/F-MNIST/csnn-128/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-3/rstdp-20n.json b/scripts/config/F-MNIST/csnn-128/rstdp-20n.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/rstdp-20n.json
rename to scripts/config/F-MNIST/csnn-128/rstdp-20n.json
diff --git a/scripts/config/F-MNIST/csnn-3/rstdp.json b/scripts/config/F-MNIST/csnn-128/rstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/rstdp.json
rename to scripts/config/F-MNIST/csnn-128/rstdp.json
diff --git a/scripts/config/F-MNIST/csnn-3/sstdp.json b/scripts/config/F-MNIST/csnn-128/s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/sstdp.json
rename to scripts/config/F-MNIST/csnn-128/s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-3/sstdp-og.json b/scripts/config/F-MNIST/csnn-128/sstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-3/sstdp-og.json
rename to scripts/config/F-MNIST/csnn-128/sstdp.json
diff --git a/scripts/config/F-MNIST/csnn-1/csnn.json b/scripts/config/F-MNIST/csnn-16/csnn.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/csnn.json
rename to scripts/config/F-MNIST/csnn-16/csnn.json
diff --git a/scripts/config/F-MNIST/csnn-1/pcn-sstdp.json b/scripts/config/F-MNIST/csnn-16/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/pcn-sstdp.json
rename to scripts/config/F-MNIST/csnn-16/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-1/rstdp-20n.json b/scripts/config/F-MNIST/csnn-16/rstdp-20n.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/rstdp-20n.json
rename to scripts/config/F-MNIST/csnn-16/rstdp-20n.json
diff --git a/scripts/config/F-MNIST/csnn-1/rstdp.json b/scripts/config/F-MNIST/csnn-16/rstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/rstdp.json
rename to scripts/config/F-MNIST/csnn-16/rstdp.json
diff --git a/scripts/config/F-MNIST/csnn-1/sstdp.json b/scripts/config/F-MNIST/csnn-16/s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/sstdp.json
rename to scripts/config/F-MNIST/csnn-16/s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-1/sstdp-og.json b/scripts/config/F-MNIST/csnn-16/sstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-1/sstdp-og.json
rename to scripts/config/F-MNIST/csnn-16/sstdp.json
diff --git a/scripts/config/F-MNIST/csnn-2/csnn.json b/scripts/config/F-MNIST/csnn-64/csnn.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/csnn.json
rename to scripts/config/F-MNIST/csnn-64/csnn.json
diff --git a/scripts/config/F-MNIST/csnn-2/pcn-sstdp.json b/scripts/config/F-MNIST/csnn-64/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/pcn-sstdp.json
rename to scripts/config/F-MNIST/csnn-64/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-2/rstdp-20n.json b/scripts/config/F-MNIST/csnn-64/rstdp-20n.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/rstdp-20n.json
rename to scripts/config/F-MNIST/csnn-64/rstdp-20n.json
diff --git a/scripts/config/F-MNIST/csnn-2/rstdp.json b/scripts/config/F-MNIST/csnn-64/rstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/rstdp.json
rename to scripts/config/F-MNIST/csnn-64/rstdp.json
diff --git a/scripts/config/F-MNIST/csnn-2/sstdp.json b/scripts/config/F-MNIST/csnn-64/s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/sstdp.json
rename to scripts/config/F-MNIST/csnn-64/s2stdp.json
diff --git a/scripts/config/F-MNIST/csnn-2/sstdp-og.json b/scripts/config/F-MNIST/csnn-64/sstdp.json
similarity index 100%
rename from scripts/config/F-MNIST/csnn-2/sstdp-og.json
rename to scripts/config/F-MNIST/csnn-64/sstdp.json
diff --git a/scripts/config/F-MNIST/gridsearch/pcn-sstdp.json b/scripts/config/F-MNIST/gridsearch/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/F-MNIST/gridsearch/pcn-sstdp.json
rename to scripts/config/F-MNIST/gridsearch/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/gridsearch/sstdp-og.json b/scripts/config/F-MNIST/gridsearch/s2stdp.json
similarity index 91%
rename from scripts/config/F-MNIST/gridsearch/sstdp-og.json
rename to scripts/config/F-MNIST/gridsearch/s2stdp.json
index 079cad4..7cab0e5 100644
--- a/scripts/config/F-MNIST/gridsearch/sstdp-og.json
+++ b/scripts/config/F-MNIST/gridsearch/s2stdp.json
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.08, 0.07, 0.06, 0.05, 0.04, 0.03, 0.02, 0.01],
+ "t_gap": [0.05, 0.04, 0.03, 0.02, 0.01, 0.005],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/F-MNIST/gridsearch/sstdp.json b/scripts/config/F-MNIST/gridsearch/sstdp.json
index 7cab0e5..079cad4 100644
--- a/scripts/config/F-MNIST/gridsearch/sstdp.json
+++ b/scripts/config/F-MNIST/gridsearch/sstdp.json
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.05, 0.04, 0.03, 0.02, 0.01, 0.005],
+ "t_gap": [0.08, 0.07, 0.06, 0.05, 0.04, 0.03, 0.02, 0.01],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/MNIST/analysis/config/pcn-sstdp.json b/scripts/config/MNIST/analysis/config/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/analysis/config/pcn-sstdp.json
rename to scripts/config/MNIST/analysis/config/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/analysis/config/sstdp-og.json b/scripts/config/MNIST/analysis/config/s2stdp.json
similarity index 97%
rename from scripts/config/MNIST/analysis/config/sstdp-og.json
rename to scripts/config/MNIST/analysis/config/s2stdp.json
index 1a09e45..6647bbf 100644
--- a/scripts/config/MNIST/analysis/config/sstdp-og.json
+++ b/scripts/config/MNIST/analysis/config/s2stdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.02, 0.005, 0.01, 0.02, 0.01, 0.02, 0.005, 0.02, 0.005, 0.01 ],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/MNIST/analysis/config/sstdp.json b/scripts/config/MNIST/analysis/config/sstdp.json
index 6647bbf..1a09e45 100644
--- a/scripts/config/MNIST/analysis/config/sstdp.json
+++ b/scripts/config/MNIST/analysis/config/sstdp.json
@@ -19,7 +19,7 @@
"loss_type": "mean",
"t_gap": [ 0.02, 0.005, 0.01, 0.02, 0.01, 0.02, 0.005, 0.02, 0.005, 0.01 ],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/MNIST/analysis/lr/pcn-sstdp.json b/scripts/config/MNIST/analysis/lr/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/analysis/lr/pcn-sstdp.json
rename to scripts/config/MNIST/analysis/lr/pcn-s2stdp.json
diff --git a/scripts/config/F-MNIST/analysis/lr/sstdp-og.json b/scripts/config/MNIST/analysis/lr/s2stdp.json
similarity index 93%
rename from scripts/config/F-MNIST/analysis/lr/sstdp-og.json
rename to scripts/config/MNIST/analysis/lr/s2stdp.json
index c31d278..7d7e2e0 100644
--- a/scripts/config/F-MNIST/analysis/lr/sstdp-og.json
+++ b/scripts/config/MNIST/analysis/lr/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 350,
+ "firing_threshold": 250,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": 0.03,
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/MNIST/analysis/lr/sstdp.json b/scripts/config/MNIST/analysis/lr/sstdp.json
index 7d7e2e0..573ea4d 100644
--- a/scripts/config/MNIST/analysis/lr/sstdp.json
+++ b/scripts/config/MNIST/analysis/lr/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 250,
+ "firing_threshold": 200,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": 0.03,
+ "t_gap": 0.06,
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
diff --git a/scripts/config/MNIST/analysis/t_gap/pcn-sstdp.json b/scripts/config/MNIST/analysis/t_gap/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/analysis/t_gap/pcn-sstdp.json
rename to scripts/config/MNIST/analysis/t_gap/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/analysis/t_gap/sstdp-og.json b/scripts/config/MNIST/analysis/t_gap/s2stdp.json
similarity index 87%
rename from scripts/config/MNIST/analysis/t_gap/sstdp-og.json
rename to scripts/config/MNIST/analysis/t_gap/s2stdp.json
index 6190146..3c5bc50 100644
--- a/scripts/config/MNIST/analysis/t_gap/sstdp-og.json
+++ b/scripts/config/MNIST/analysis/t_gap/s2stdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 200,
+ "firing_threshold": 250,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.2,
+ "w_mean_norm": 0.3,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [ 0.2, 0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001 ],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.01,
- "stdp_am": -0.05,
+ "stdp_ap": 0.005,
+ "stdp_am": -0.1,
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
diff --git a/scripts/config/MNIST/analysis/t_gap/sstdp.json b/scripts/config/MNIST/analysis/t_gap/sstdp.json
index 3c5bc50..6190146 100644
--- a/scripts/config/MNIST/analysis/t_gap/sstdp.json
+++ b/scripts/config/MNIST/analysis/t_gap/sstdp.json
@@ -2,7 +2,7 @@
"full_logs": true,
"n_neurons": 10,
- "firing_threshold": 250,
+ "firing_threshold": 200,
"leak_tau": null,
"decision_making": "single",
@@ -12,14 +12,14 @@
"w_init_mean": 0.5,
"w_init_std": 0.01,
"normalize_weights": true,
- "w_mean_norm": 0.3,
+ "w_mean_norm": 0.2,
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
"t_gap": [ 0.2, 0.1, 0.075, 0.05, 0.025, 0.01, 0.0075, 0.005, 0.0025, 0.001, 0.00075, 0.0005, 0.00025, 0.0001 ],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": 0.005,
- "stdp_am": -0.1,
+ "stdp_ap": 0.01,
+ "stdp_am": -0.05,
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
diff --git a/scripts/config/MNIST/csnn-3/csnn.json b/scripts/config/MNIST/csnn-128/csnn.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/csnn.json
rename to scripts/config/MNIST/csnn-128/csnn.json
diff --git a/scripts/config/MNIST/csnn-3/pcn-sstdp.json b/scripts/config/MNIST/csnn-128/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/pcn-sstdp.json
rename to scripts/config/MNIST/csnn-128/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/csnn-3/rstdp-20n.json b/scripts/config/MNIST/csnn-128/rstdp-20n.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/rstdp-20n.json
rename to scripts/config/MNIST/csnn-128/rstdp-20n.json
diff --git a/scripts/config/MNIST/csnn-3/rstdp.json b/scripts/config/MNIST/csnn-128/rstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/rstdp.json
rename to scripts/config/MNIST/csnn-128/rstdp.json
diff --git a/scripts/config/MNIST/csnn-3/sstdp.json b/scripts/config/MNIST/csnn-128/s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/sstdp.json
rename to scripts/config/MNIST/csnn-128/s2stdp.json
diff --git a/scripts/config/MNIST/csnn-3/sstdp-og.json b/scripts/config/MNIST/csnn-128/sstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-3/sstdp-og.json
rename to scripts/config/MNIST/csnn-128/sstdp.json
diff --git a/scripts/config/MNIST/csnn-1/csnn.json b/scripts/config/MNIST/csnn-16/csnn.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/csnn.json
rename to scripts/config/MNIST/csnn-16/csnn.json
diff --git a/scripts/config/MNIST/csnn-1/pcn-sstdp.json b/scripts/config/MNIST/csnn-16/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/pcn-sstdp.json
rename to scripts/config/MNIST/csnn-16/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/csnn-1/rstdp-20n.json b/scripts/config/MNIST/csnn-16/rstdp-20n.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/rstdp-20n.json
rename to scripts/config/MNIST/csnn-16/rstdp-20n.json
diff --git a/scripts/config/MNIST/csnn-1/rstdp.json b/scripts/config/MNIST/csnn-16/rstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/rstdp.json
rename to scripts/config/MNIST/csnn-16/rstdp.json
diff --git a/scripts/config/MNIST/csnn-1/sstdp.json b/scripts/config/MNIST/csnn-16/s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/sstdp.json
rename to scripts/config/MNIST/csnn-16/s2stdp.json
diff --git a/scripts/config/MNIST/csnn-1/sstdp-og.json b/scripts/config/MNIST/csnn-16/sstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-1/sstdp-og.json
rename to scripts/config/MNIST/csnn-16/sstdp.json
diff --git a/scripts/config/MNIST/csnn-2/csnn.json b/scripts/config/MNIST/csnn-64/csnn.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/csnn.json
rename to scripts/config/MNIST/csnn-64/csnn.json
diff --git a/scripts/config/MNIST/csnn-2/pcn-sstdp.json b/scripts/config/MNIST/csnn-64/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/pcn-sstdp.json
rename to scripts/config/MNIST/csnn-64/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/csnn-2/rstdp-20n.json b/scripts/config/MNIST/csnn-64/rstdp-20n.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/rstdp-20n.json
rename to scripts/config/MNIST/csnn-64/rstdp-20n.json
diff --git a/scripts/config/MNIST/csnn-2/rstdp.json b/scripts/config/MNIST/csnn-64/rstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/rstdp.json
rename to scripts/config/MNIST/csnn-64/rstdp.json
diff --git a/scripts/config/MNIST/csnn-2/sstdp.json b/scripts/config/MNIST/csnn-64/s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/sstdp.json
rename to scripts/config/MNIST/csnn-64/s2stdp.json
diff --git a/scripts/config/MNIST/csnn-2/sstdp-og.json b/scripts/config/MNIST/csnn-64/sstdp.json
similarity index 100%
rename from scripts/config/MNIST/csnn-2/sstdp-og.json
rename to scripts/config/MNIST/csnn-64/sstdp.json
diff --git a/scripts/config/MNIST/gridsearch/pcn-sstdp.json b/scripts/config/MNIST/gridsearch/pcn-s2stdp.json
similarity index 100%
rename from scripts/config/MNIST/gridsearch/pcn-sstdp.json
rename to scripts/config/MNIST/gridsearch/pcn-s2stdp.json
diff --git a/scripts/config/MNIST/gridsearch/sstdp-og.json b/scripts/config/MNIST/gridsearch/s2stdp.json
similarity index 81%
rename from scripts/config/MNIST/gridsearch/sstdp-og.json
rename to scripts/config/MNIST/gridsearch/s2stdp.json
index 15dce5a..f8f7439 100644
--- a/scripts/config/MNIST/gridsearch/sstdp-og.json
+++ b/scripts/config/MNIST/gridsearch/s2stdp.json
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.08, 0.07, 0.06, 0.05, 0.04, 0.03, 0.02, 0.01],
+ "t_gap": [0.05, 0.04, 0.03, 0.02, 0.01],
"adjust_t_gap": true,
- "loss_bounds": true,
+ "loss_bounds": false,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": [0.05, 0.025, 0.01, 0.0075, 0.005],
- "stdp_am": [-0.1, -0.075, -0.05, -0.025, -0.01],
+ "stdp_ap": [0.01, 0.0075, 0.005, 0.0025, 0.001],
+ "stdp_am": [-0.3, -0.2, -0.1, -0.075, -0.05],
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
diff --git a/scripts/config/MNIST/gridsearch/sstdp.json b/scripts/config/MNIST/gridsearch/sstdp.json
index f8f7439..15dce5a 100644
--- a/scripts/config/MNIST/gridsearch/sstdp.json
+++ b/scripts/config/MNIST/gridsearch/sstdp.json
@@ -17,9 +17,9 @@
"n_epochs": 100,
"training_method": "sstdp",
"loss_type": "mean",
- "t_gap": [0.05, 0.04, 0.03, 0.02, 0.01],
+ "t_gap": [0.08, 0.07, 0.06, 0.05, 0.04, 0.03, 0.02, 0.01],
"adjust_t_gap": true,
- "loss_bounds": false,
+ "loss_bounds": true,
"class_wta": true,
"early_stopping": true,
"early_stop_patience": 10,
@@ -27,8 +27,8 @@
"stdp_type": "multiplicative",
"stdp_soft_bound": false,
"stdp_ignore_silent": false,
- "stdp_ap": [0.01, 0.0075, 0.005, 0.0025, 0.001],
- "stdp_am": [-0.3, -0.2, -0.1, -0.075, -0.05],
+ "stdp_ap": [0.05, 0.025, 0.01, 0.0075, 0.005],
+ "stdp_am": [-0.1, -0.075, -0.05, -0.025, -0.01],
"stdp_anti_ap": null,
"stdp_anti_am": null,
"stdp_ltp_win": 1,
--
GitLab