Merge remote-tracking branch 'origin/main'

# Conflicts:
#	EIANN/network.py

Author: neurosutras

.gitignore

@@ -22,4 +22,5 @@ EIANN/data/datasets/
 EIANN/data/mnist/*
 manuscript/
 
-EIANN/data/mnist
+EIANN/data/mnist
+EIANN/data/EIANN/*

EIANN/data/Table_S6_mnist_hyperparams_all.xlsx

@@ -6,28 +6,29 @@ vanBP_fixed_hidden,20250108_EIANN_2_hidden_mnist_van_bp_relu_SGD_config_G_fixed_
 bpDale_learned,20240419_EIANN_2_hidden_mnist_bpDale_relu_SGD_config_F_complete_optimized.yaml,Backprop \n(learned SomaI),Backprop (EIANN),royalblue,EIANN,2,Backprop,Gradient descent,Symmetric ($B=W^T$),Zero
 bpDale_fixed,20231129_EIANN_2_hidden_mnist_bpDale_relu_SGD_config_G_complete_optimized.yaml,Backprop \n(fixed SomaI),Backprop (EIANN),cornflowerblue,EIANN,2,Backprop,Gradient descent,Symmetric ($B=W^T$),Zero
 bpDale_noI,20240919_EIANN_2_hidden_mnist_bpDale_noI_relu_SGD_config_G_complete_optimized.yaml,Backprop \n(no SomaI),"Backprop (EIANN, no SomaI)",royalblue,EIANN,2,Backprop,Gradient descent,Symmetric ($B=W^T$),Zero
-bpLike_WT_hebbdend,20241009_EIANN_2_hidden_mnist_BP_like_config_5J_complete_optimized.yaml,Dendritic \nTarget Propagation,Dend. Target Prop.,red,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
+bpLike_WT_hebbdend,20241009_EIANN_2_hidden_mnist_BP_like_config_5J_complete_optimized.yaml,"Dend. Target Prop\n(Learned DendI, Hebb)",Dend. Target Prop.,red,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
 bpLike_WT_hebbdend_eq,20240516_EIANN_2_hidden_mnist_BP_like_config_2L_complete_optimized.yaml,bpLike_WT_hebbdend_eq,bpLike_WT_hebbdend_eq,red,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
 bpLike_WT_tempcont,20240508_EIANN_2_hidden_mnist_BP_like_config_1J_complete_optimized.yaml,bpLike_WT_tempcont,BP-like (temp. cont.),red,Dend EIANN,2,Dend Temp Contrast,LDS,Symmetric ($B=W^T$),Zero
-bpLike_WT_localBP,20241113_EIANN_2_hidden_mnist_BP_like_config_5M_complete_optimized.yaml,Learned DendI \n(local backprop),Learned (Backprop),black,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
+bpLike_WT_localBP,20241113_EIANN_2_hidden_mnist_BP_like_config_5M_complete_optimized.yaml,"Dend. Target Prop.\n(Learned DendI, BP)",Learned (Backprop),black,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
 bpLike_WT_localBP_eq,20240628_EIANN_2_hidden_mnist_BP_like_config_3M_complete_optimized.yaml,bpLike_WT_localBP_eq,bpLike_WT_localBP_eq,black,Dend EIANN,2,Backprop/Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
-bpLike_WT_fixedDend,20241113_EIANN_2_hidden_mnist_BP_like_config_5K_complete_optimized.yaml,Fixed DendI \n(random),Fixed (random),gray,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
+bpLike_WT_fixedDend,20241113_EIANN_2_hidden_mnist_BP_like_config_5K_complete_optimized.yaml,Dend. Target Prop.\n(Fixed DendI),Fixed (Random),gray,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
 bpLike_WT_fixedDend_eq,20240508_EIANN_2_hidden_mnist_BP_like_config_2K_complete_optimized.yaml,bpLike_WT_fixedDend_eq,bpLike_WT_fixedDend_eq,gray,Dend EIANN,2,Dend Target Prop,LDS,Symmetric ($B=W^T$),Zero
-bpLike_fixedTD_hebbdend,20241114_EIANN_2_hidden_mnist_BP_like_config_5J_fixed_TD_complete_optimized.yaml,"LDS, \nfixed top-down",Fixed random B,gray,Dend EIANN,2,Dend Target Prop,LDS,Fixed random,Zero
+bpLike_fixedTD_hebbdend,20241114_EIANN_2_hidden_mnist_BP_like_config_5J_fixed_TD_complete_optimized.yaml,"LDS, \nfixed top-down",Fixed Random B,gray,Dend EIANN,2,Dend Target Prop,LDS,Fixed random,Zero
 bpLike_TCWN_hebbdend,20241120_EIANN_2_hidden_mnist_BP_like_config_5J_learn_TD_HTCWN_2_complete_optimized.yaml,"LDS, \nlearned top-down",Learned B: Contr. \nHebb + W Norm.,green,Dend EIANN,2,Dend Target Prop,LDS,Contr. Hebb + W Norm.,Zero
 bpLike_fixedTD_hebbdend_eq,20240830_EIANN_2_hidden_mnist_BP_like_config_2L_fixed_TD_complete_optimized.yaml,bpLike_fixedTD_hebbdend_eq,bpLike_fixedTD_hebbdend_eq,lightgray,Dend EIANN,2,Dend Target Prop,LDS,Fixed random,Zero
 bpLike_hebbTD_hebbdend,20241009_EIANN_2_hidden_mnist_BP_like_config_5J_learn_TD_HWN_1_complete_optimized.yaml,bpLike_hebbTD_hebbdend,bpLike_hebbTD_hebbdend,blue,Dend EIANN,2,Dend Target Prop,LDS,Hebb + Weight Norm.,Zero
 bpLike_hebbTD_hebbdend_eq,20240830_EIANN_2_hidden_mnist_BP_like_config_2L_learn_TD_HWN_3_complete_optimized.yaml,bpLike_hebbTD_hebbdend_eq,bpLike_hebbTD_hebbdend_eq,magenta,Dend EIANN,2,Dend Target Prop,LDS,Hebb + Weight Norm.,Zero
-dend_temp_contrast_WT,20240508_EIANN_2_hidden_mnist_BP_like_config_1J_complete_optimized.yaml,Dendritic Temporal \nContrast,Dend Temp \nContr,deeppink,Dend EIANN,2,Dend Temp Contrast,LDS,Symmetric ($B=W^T$),Zero
-dend_temp_contrast_fixedTD,20251014_EIANN_2_hidden_mnist_BP_like_config_1J_fixed_TD_complete_optimized.yaml,Dendritic Temporal \nContrast (fixed TD),Dendritic Temporal \nContrast (fixed TD),palevioletred,Dend EIANN,2,Dend Temp Contrast,LDS,Fixed random,Zero
-HebbWN_topsup,20241105_EIANN_2_hidden_mnist_Top_Layer_Supervised_Hebb_WeightNorm_config_7_complete_optimized.yaml,Hebbian,Hebb (EIANN),green,EIANN,2,Unsupervised,Hebb \n+ Weight Norm.,-,Zero
-HebbWN_topsup_lrf,20250923_EIANN_2_hidden_lrf_wide_2_mnist_Top_Layer_Supervised_Hebb_WeightNorm_config_7_complete_optimized.yaml,Hebb (Local RF),Hebb (Local RF),green,EIANN,2,Unsupervised,Hebb \n+ Weight Norm.,-,Zero
+dend_temp_contrast_WT,20240508_EIANN_2_hidden_mnist_BP_like_config_1J_complete_optimized.yaml,Dend. Temp. Contr.,Dend. Temp. Contr.,deeppink,Dend EIANN,2,Dend Temp Contrast,LDS,Symmetric ($B=W^T$),Zero
+dend_temp_contrast_fixedTD,20251014_EIANN_2_hidden_mnist_BP_like_config_1J_fixed_TD_complete_optimized.yaml,Dend. Temp. Cont.  (fixed TD),Dend. Temp. Cont.  (fixed TD),palevioletred,Dend EIANN,2,Dend Temp Contrast,LDS,Fixed random,Zero
+HebbWN_topsup,20241105_EIANN_2_hidden_mnist_Top_Layer_Supervised_Hebb_WeightNorm_config_7_complete_optimized.yaml,Unsup. Hebb,Hebb,green,EIANN,2,Unsupervised,Hebb \n+ Weight Norm.,-,Zero
+HebbWN_topsup_lrf,20250923_EIANN_2_hidden_lrf_wide_2_mnist_Top_Layer_Supervised_Hebb_WeightNorm_config_7_complete_optimized.yaml,Unsup. Hebb\n(Wide H1 + Local RF),Hebb (Local RF),green,EIANN,2,Unsupervised,Hebb \n+ Weight Norm.,-,Zero
 Supervised_HebbWN_WT_hebbdend,20240714_EIANN_2_hidden_mnist_Supervised_Hebb_WeightNorm_config_4_complete_optimized.yaml,Sup. Hebb + W Norm.,Sup. Hebb + W Norm.,olive,Dend EIANN,2,Dend Target Prop,Hebb \n+ Weight Norm.,Symmetric ($B=W^T$),Zero
-SupHebbTempCont_WT_hebbdend,20241125_EIANN_2_hidden_mnist_Hebb_Temp_Contrast_config_2_complete_optimized.yaml,Temp. Contrastive \nHebb,TCH,mediumaquamarine,Dend EIANN,2,Dend Target Prop,TCH,Symmetric ($B=W^T$),Zero
+SupHebbTempCont_WT_hebbdend,20241125_EIANN_2_hidden_mnist_Hebb_Temp_Contrast_config_2_complete_optimized.yaml,Sup. TCH,TCH,mediumaquamarine,Dend EIANN,2,Dend Target Prop,TCH,Symmetric ($B=W^T$),Zero
 Supervised_HebbWN_learned_somaI,20240919_EIANN_2_hidden_mnist_Supervised_Hebb_WeightNorm_learn_somaI_config_4_complete_optimized.yaml,Supervised HebbWN learned somaI,Supervised HebbWN learned somaI,lime,Dend EIANN,2,Dend Target Prop,Hebb \n+ Weight Norm.,Symmetric ($B=W^T$),Zero
-Supervised_BCM_WT_hebbdend,20240723_EIANN_2_hidden_mnist_Supervised_BCM_config_4_complete_optimized.yaml,BCM,BCM,plum,Dend EIANN,2,Dend Target Prop,BCM,Symmetric ($B=W^T$),Zero
-BTSP_WT_hebbdend,20241212_EIANN_2_hidden_mnist_BTSP_config_5L_complete_optimized.yaml,BTSP,Symmetric B=W,orange,Dend EIANN,2,Dend Target Prop,BTSP,Symmetric ($B=W^T$),Zero
-BTSP_fixedTD_hebbdend,20241216_EIANN_2_hidden_mnist_BTSP_config_5L_fixed_TD_complete_optimized.yaml,"BTSP, \nfixed top-down",Fixed random B,gray,Dend EIANN,2,Dend Target Prop,BTSP,Fixed random,Zero
+Supervised_BCM_WT_hebbdend,20240723_EIANN_2_hidden_mnist_Supervised_BCM_config_4_complete_optimized.yaml,Sup. BCM,BCM,plum,Dend EIANN,2,Dend Target Prop,BCM,Symmetric ($B=W^T$),Zero
+BCM_topsup,20251102_EIANN_2_hidden_mnist_Top_Layer_Supervised_BCM_config_7_complete_optimized.yaml,Unsup. BCM,BCM,plum,Dend EIANN,2,Dend Target Prop,BCM,Symmetric ($B=W^T$),Zero
+BTSP_WT_hebbdend,20241212_EIANN_2_hidden_mnist_BTSP_config_5L_complete_optimized.yaml,Sup. BTSP,Symmetric B=W,orange,Dend EIANN,2,Dend Target Prop,BTSP,Symmetric ($B=W^T$),Zero
+BTSP_fixedTD_hebbdend,20241216_EIANN_2_hidden_mnist_BTSP_config_5L_fixed_TD_complete_optimized.yaml,"BTSP, \nfixed top-down",Fixed Random B,gray,Dend EIANN,2,Dend Target Prop,BTSP,Fixed random,Zero
 BTSP_TCWN_hebbdend,20241216_EIANN_2_hidden_mnist_BTSP_config_5L_learn_TD_HTCWN_3_complete_optimized.yaml,"BTSP, \nlearned top-down",Learned B: Contr. \nHebb + W Norm.,green,Dend EIANN,2,Dend Target Prop,BTSP,Contr. Hebb + W Norm.,Zero
 ,,,,,,,,,,
 fmnist_DTP_TCWN_hebbdend,20250619_EIANN_2_hidden_fmnist_DTP_config_5J_learn_TD_HTCWN_2_zero_bias_complete_optimized.yaml,Dend Target Prop,Dend. Target Prop. (learned bias),black,Dend EIANN,2,Dend Target Prop,LDS,Contr. Hebb + W Norm.,Zero