diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_all_videos.csv
index d8ebb5a57208e54ae666bde2fc79fe38fd078c05..01a4070df8eac6d90a11ad5ce15b49a296e328df 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_all_videos.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_all_videos.csv
@@ -1,2 +1,2 @@
AUROC:r(all_videos),AUPR:r(all_videos)
-0.86,0.2
+0.87,0.21
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..7f1d40378b82487d242e0627bceead4b21b5540e
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.85,0.19
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_per_video.csv
new file mode 100644
index 0000000000000000000000000000000000000000..5a2f548d1fe355e40b43961e8208aa1091a37756
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_mu_per_video.csv
@@ -0,0 +1,38 @@
+AUROC:r_mu(per_video),AUPR:r_mu(per_video)
+0.987,0.762
+0.887,0.152
+0.977,0.752
+0.896,0.106
+0.796,0.097
+0.921,0.11
+0.947,0.419
+0.983,0.336
+0.945,0.709
+0.796,0.423
+0.99,0.798
+0.976,0.677
+0.965,0.575
+0.872,0.454
+0.748,0.105
+0.815,0.38
+0.977,0.279
+0.968,0.268
+0.868,0.144
+0.845,0.089
+0.927,0.242
+0.773,0.214
+0.844,0.206
+0.954,0.74
+0.95,0.515
+0.881,0.062
+0.835,0.62
+0.82,0.459
+0.846,0.446
+0.886,0.456
+0.944,0.763
+0.934,0.725
+0.857,0.51
+0.924,0.646
+0.974,0.485
+Average (Std),
+0.90(0.07),0.42(0.23)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_per_video.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4828e8dee451565c03429b7b63deddf0081347a6
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_per_video.csv
@@ -0,0 +1,38 @@
+AUROC:r(per_video),AUPR:r(per_video)
+0.972,0.509
+0.837,0.142
+0.942,0.426
+0.882,0.12
+0.879,0.139
+0.922,0.113
+0.944,0.362
+0.979,0.315
+0.914,0.555
+0.732,0.35
+0.988,0.677
+0.971,0.52
+0.958,0.421
+0.934,0.394
+0.754,0.111
+0.891,0.42
+0.981,0.321
+0.965,0.253
+0.858,0.152
+0.899,0.115
+0.912,0.242
+0.812,0.202
+0.937,0.165
+0.965,0.731
+0.964,0.467
+0.897,0.111
+0.907,0.675
+0.839,0.498
+0.896,0.514
+0.901,0.432
+0.96,0.772
+0.932,0.761
+0.852,0.576
+0.909,0.693
+0.972,0.56
+Average (Std),
+0.91(0.06),0.40(0.21)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..183bc58739a632310dcc9745c17639eea80c6045
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.95,0.25
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_per_video.csv
new file mode 100644
index 0000000000000000000000000000000000000000..9ba73c675a893dde3562af7e26f64c6a24a30e0d
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-r_sigma_per_video.csv
@@ -0,0 +1,38 @@
+AUROC:r_sigma(per_video),AUPR:r_sigma(per_video)
+0.983,0.492
+0.938,0.167
+0.974,0.521
+0.934,0.144
+0.941,0.371
+0.93,0.121
+0.95,0.431
+0.972,0.253
+0.965,0.481
+0.895,0.411
+0.988,0.71
+0.953,0.434
+0.956,0.326
+0.944,0.301
+0.938,0.151
+0.967,0.537
+0.978,0.295
+0.953,0.201
+0.936,0.155
+0.947,0.142
+0.955,0.218
+0.938,0.191
+0.949,0.152
+0.961,0.829
+0.961,0.314
+0.992,0.743
+0.988,0.687
+0.933,0.518
+0.894,0.573
+0.977,0.281
+0.987,0.824
+0.999,0.956
+0.997,0.938
+0.999,0.987
+0.95,0.576
+Average (Std),
+0.96(0.03),0.44(0.26)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_mean_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_mean_all_videos.csv
deleted file mode 100644
index c3598d0deb546f0e649d3ccc5c5e721f935fbc41..0000000000000000000000000000000000000000
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_mean_all_videos.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-AUROC:x_mean(all_videos),AUPR:x_mean(all_videos)
-0.85,0.19
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_std_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_std_all_videos.csv
deleted file mode 100644
index 28e423488a2c853b5f660e8c74351189104ccd6d..0000000000000000000000000000000000000000
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_C3D-x_std_all_videos.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-AUROC:x_std(all_videos),AUPR:x_std(all_videos)
-0.94,0.25
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_all_videos.csv
index 4df6e68285757e830b7a0126c6513511ad812124..e1f5908801b2b8cbabacb8958020f3f92c25bc3a 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_all_videos.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_all_videos.csv
@@ -1,2 +1,2 @@
AUROC:r(all_videos),AUPR:r(all_videos)
-0.88,0.2
+0.89,0.21
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..16acc40a83cddcbbc01327999304cddc990c2dc4
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.88,0.23
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_per_video.csv
similarity index 84%
rename from AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_per_video.csv
rename to AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_per_video.csv
index cfe7a42e0e115ec13ac1a536cd18182d08674ff6..8021a4bd1f54f6fd5fcf7b0da19627d44ea6bca0 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_per_video.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_mu_per_video.csv
@@ -1,38 +1,38 @@
-AUROC:x_mean(per_video),AUPR:x_mean(per_video)
-0.966,0.477
-0.94,0.211
-0.966,0.735
-0.921,0.118
-0.852,0.093
-0.922,0.111
-0.939,0.404
-0.974,0.322
-0.963,0.572
-0.942,0.464
-0.994,0.861
-0.959,0.578
-0.962,0.559
-0.932,0.487
-0.93,0.152
-0.92,0.286
-0.978,0.478
-0.964,0.243
-0.901,0.143
-0.822,0.084
-0.883,0.171
-0.849,0.163
-0.921,0.172
-0.958,0.731
-0.981,0.627
-0.932,0.352
-0.931,0.396
-0.938,0.496
-0.874,0.451
-0.959,0.506
-0.984,0.786
-0.987,0.844
-0.98,0.731
-0.998,0.946
-0.967,0.507
-Average (Std),
-0.94(0.04),0.44(0.24)
+AUROC:r_mu(per_video),AUPR:r_mu(per_video)
+0.966,0.477
+0.94,0.211
+0.966,0.735
+0.921,0.118
+0.852,0.093
+0.922,0.111
+0.939,0.404
+0.974,0.322
+0.963,0.572
+0.942,0.464
+0.994,0.861
+0.959,0.578
+0.962,0.559
+0.932,0.487
+0.93,0.152
+0.92,0.286
+0.978,0.478
+0.964,0.243
+0.901,0.143
+0.822,0.084
+0.883,0.171
+0.849,0.163
+0.921,0.172
+0.958,0.731
+0.981,0.627
+0.932,0.352
+0.931,0.396
+0.938,0.496
+0.874,0.451
+0.959,0.506
+0.984,0.786
+0.987,0.844
+0.98,0.731
+0.998,0.946
+0.967,0.507
+Average (Std),
+0.94(0.04),0.44(0.24)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..68a395c9012dd8efe6cc1003b04ea4f2ed7d9a9c
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.96,0.27
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_per_video.csv
similarity index 84%
rename from AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_per_video.csv
rename to AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_per_video.csv
index 21b780892a71b723726f9bf02d310a5106ee4051..21d6e447fc8dfbf97d2cc2338c4a58c130e4cc5a 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_per_video.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-r_sigma_per_video.csv
@@ -1,38 +1,38 @@
-AUROC:x_std(per_video),AUPR:x_std(per_video)
-0.965,0.433
-0.941,0.189
-0.973,0.662
-0.943,0.135
-0.926,0.137
-0.918,0.107
-0.937,0.389
-0.973,0.274
-0.965,0.551
-0.943,0.461
-0.993,0.837
-0.956,0.452
-0.956,0.476
-0.94,0.393
-0.93,0.138
-0.939,0.309
-0.976,0.365
-0.954,0.192
-0.928,0.144
-0.94,0.128
-0.955,0.216
-0.928,0.166
-0.951,0.154
-0.987,0.838
-0.961,0.391
-0.997,0.878
-0.966,0.521
-0.961,0.454
-0.939,0.406
-0.97,0.471
-0.986,0.795
-0.996,0.899
-0.998,0.964
-0.998,0.908
-0.981,0.536
-Average (Std),
-0.96(0.02),0.44(0.26)
+AUROC:r_sigma(per_video),AUPR:r_sigma(per_video)
+0.965,0.433
+0.941,0.189
+0.973,0.662
+0.943,0.135
+0.926,0.137
+0.918,0.107
+0.937,0.389
+0.973,0.274
+0.965,0.551
+0.943,0.461
+0.993,0.837
+0.956,0.452
+0.956,0.476
+0.94,0.393
+0.93,0.138
+0.939,0.309
+0.976,0.365
+0.954,0.192
+0.928,0.144
+0.94,0.128
+0.955,0.216
+0.928,0.166
+0.951,0.154
+0.987,0.838
+0.961,0.391
+0.997,0.878
+0.966,0.521
+0.961,0.454
+0.939,0.406
+0.97,0.471
+0.986,0.795
+0.996,0.899
+0.998,0.964
+0.998,0.908
+0.981,0.536
+Average (Std),
+0.96(0.02),0.44(0.26)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_all_videos.csv
deleted file mode 100644
index 17fc59d9249bd804cbf6ca1f1dcec5c20dd2343e..0000000000000000000000000000000000000000
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_mean_all_videos.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-AUROC:x_mean(all_videos),AUPR:x_mean(all_videos)
-0.88,0.22
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_all_videos.csv
deleted file mode 100644
index dabbad5faa6dc727227367c5c0c4b2413bca9d10..0000000000000000000000000000000000000000
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_Deconv-x_std_all_videos.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-AUROC:x_std(all_videos),AUPR:x_std(all_videos)
-0.95,0.27
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_all_videos.csv
index e3861e4f14bcafafb8df838d2d3bcfc884757d6d..339c4c100ce57da56b9d7e8b9e02b99c8e75d9b2 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_all_videos.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_all_videos.csv
@@ -1,2 +1,2 @@
-AUROC:r(all_videos),AUPR:r(all_videos)
-0.89,0.23
+AUROC:r(all_videos),AUPR:r(all_videos)
+0.89,0.24
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..16acc40a83cddcbbc01327999304cddc990c2dc4
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.88,0.23
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_per_video.csv
similarity index 84%
rename from AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_per_video.csv
rename to AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_per_video.csv
index 8438afa188ec73d4501d6f3ce00b9160b9bd6061..6eb0e3c71ea88562b1bbfe339b72481acc8bb58f 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_per_video.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_mu_per_video.csv
@@ -1,38 +1,38 @@
-AUROC:x_mean(per_video),AUPR:x_mean(per_video)
-0.967,0.469
-0.94,0.196
-0.968,0.733
-0.897,0.098
-0.829,0.086
-0.92,0.108
-0.945,0.437
-0.975,0.312
-0.969,0.627
-0.908,0.444
-0.993,0.844
-0.964,0.612
-0.962,0.557
-0.924,0.499
-0.912,0.145
-0.923,0.365
-0.978,0.36
-0.962,0.249
-0.933,0.153
-0.871,0.097
-0.94,0.215
-0.854,0.185
-0.928,0.204
-0.964,0.771
-0.984,0.667
-0.944,0.303
-0.942,0.431
-0.888,0.533
-0.885,0.475
-0.967,0.566
-0.989,0.83
-0.997,0.911
-0.991,0.859
-0.98,0.891
-0.973,0.544
-Average (Std),
-0.94(0.04),0.45(0.25)
+AUROC:r_mu(per_video),AUPR:r_mu(per_video)
+0.967,0.469
+0.94,0.196
+0.968,0.733
+0.897,0.098
+0.829,0.086
+0.92,0.108
+0.945,0.437
+0.975,0.312
+0.969,0.627
+0.908,0.444
+0.993,0.844
+0.964,0.612
+0.962,0.557
+0.924,0.499
+0.912,0.145
+0.923,0.365
+0.978,0.36
+0.962,0.249
+0.933,0.153
+0.871,0.097
+0.94,0.215
+0.854,0.185
+0.928,0.204
+0.964,0.771
+0.984,0.667
+0.944,0.303
+0.942,0.431
+0.888,0.533
+0.885,0.475
+0.967,0.566
+0.989,0.83
+0.997,0.911
+0.991,0.859
+0.98,0.891
+0.973,0.544
+Average (Std),
+0.94(0.04),0.45(0.25)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..fb982c0f0885b56e06e90f2bd875c64eccb3d9ed
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.96,0.29
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_std_per_video.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_per_video.csv
similarity index 84%
rename from AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_std_per_video.csv
rename to AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_per_video.csv
index c2717da30a2bb3653f4ff04875da57c904d9ce23..e7f962d45fe0ffb4990e273803edf4de26e4cb73 100644
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_std_per_video.csv
+++ b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-r_sigma_per_video.csv
@@ -1,38 +1,38 @@
-AUROC:x_std(per_video),AUPR:x_std(per_video)
-0.963,0.368
-0.951,0.337
-0.982,0.795
-0.939,0.127
-0.913,0.142
-0.914,0.104
-0.949,0.473
-0.978,0.274
-0.969,0.578
-0.949,0.488
-0.994,0.818
-0.974,0.572
-0.962,0.49
-0.946,0.438
-0.934,0.144
-0.948,0.321
-0.975,0.352
-0.953,0.187
-0.928,0.141
-0.934,0.119
-0.953,0.211
-0.926,0.156
-0.96,0.188
-0.988,0.88
-0.976,0.436
-0.996,0.792
-0.971,0.523
-0.969,0.551
-0.932,0.265
-0.978,0.628
-0.991,0.836
-0.998,0.933
-0.997,0.94
-0.996,0.855
-0.985,0.535
-Average (Std),
-0.96(0.02),0.46(0.26)
+AUROC:r_sigma(per_video),AUPR:r_sigma(per_video)
+0.963,0.368
+0.951,0.337
+0.982,0.795
+0.939,0.127
+0.913,0.142
+0.914,0.104
+0.949,0.473
+0.978,0.274
+0.969,0.578
+0.949,0.488
+0.994,0.818
+0.974,0.572
+0.962,0.49
+0.946,0.438
+0.934,0.144
+0.948,0.321
+0.975,0.352
+0.953,0.187
+0.928,0.141
+0.934,0.119
+0.953,0.211
+0.926,0.156
+0.96,0.188
+0.988,0.88
+0.976,0.436
+0.996,0.792
+0.971,0.523
+0.969,0.551
+0.932,0.265
+0.978,0.628
+0.991,0.836
+0.998,0.933
+0.997,0.94
+0.996,0.855
+0.985,0.535
+Average (Std),
+0.96(0.02),0.46(0.26)
diff --git a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_all_videos.csv b/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_all_videos.csv
deleted file mode 100644
index 17fc59d9249bd804cbf6ca1f1dcec5c20dd2343e..0000000000000000000000000000000000000000
--- a/AEComparisons/scores/Thermal_Fall/DSTCAE_UpSamp-x_mean_all_videos.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-AUROC:x_mean(all_videos),AUPR:x_mean(all_videos)
-0.88,0.22
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_all_videos.csv
index 39ea9203a13cc7e4db6e833336af4e46b6aff42d..b3e18c44570c9b14c24e4115af670d74159d781b 100644
--- a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_all_videos.csv
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_all_videos.csv
@@ -1,2 +1,2 @@
AUROC:r(all_videos),AUPR:r(all_videos)
-0.91,0.81
+0.91,0.82
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..232b1ef1e6f7a42ba09e44c2f05cfd7c144952b8
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.91,0.8
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..3412067c4054fbc61dd6447ba105f0f0afd0114f
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_C3D-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.9,0.81
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b3e18c44570c9b14c24e4115af670d74159d781b
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r(all_videos),AUPR:r(all_videos)
+0.91,0.82
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..232b1ef1e6f7a42ba09e44c2f05cfd7c144952b8
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.91,0.8
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..9bfe4a09953e73bb938ec0d2afcd9101593ae82c
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_Deconv-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.93,0.86
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_all_videos.csv
index 964516f6600ae9849a12aa57ee2e8ac6de675e9a..25fa9c8361727b6bfac03f94503a658741f64291 100644
--- a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_all_videos.csv
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_all_videos.csv
@@ -1,2 +1,2 @@
-AUROC:r(all_videos),AUPR:r(all_videos)
-0.91,0.83
+AUROC:r(all_videos),AUPR:r(all_videos)
+0.92,0.83
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_mu_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_mu_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..3a3070900c56b4a7e530e028604ed26094b7da65
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_mu_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_mu(all_videos),AUPR:r_mu(all_videos)
+0.91,0.81
diff --git a/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_sigma_all_videos.csv b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_sigma_all_videos.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4aeaeed0b2ad6ef604a5e89cf53faa9a4ebbddb0
--- /dev/null
+++ b/AEComparisons/scores/Thermal_Intrusion/DSTCAE_UpSamp-r_sigma_all_videos.csv
@@ -0,0 +1,2 @@
+AUROC:r_sigma(all_videos),AUPR:r_sigma(all_videos)
+0.93,0.88
diff --git a/seq_exp.py b/seq_exp.py
index df3a9e27584486adf97f71682afb918bdb8b5350..24e316c1f952ce7c50f6a4f096e2791dd3229be2 100644
--- a/seq_exp.py
+++ b/seq_exp.py
@@ -139,7 +139,7 @@ class SeqExp(ImgExp):
return data_flip
- def get_MSE(self, test_data, agg_type='x_std'):
+ def get_MSE(self, test_data, agg_type='r_sigma'):
'''
MSE for sequential data (video). Uses data chunking with memap for SDU-Filled.
Assumes windowed
@@ -147,7 +147,7 @@ class SeqExp(ImgExp):
Params:
ndarray test_data: data used to test model (reconstrcut). Of
shape (samples, window length, img_width, img_height)
- agg_type: how to aggregate windowde scores
+ agg_type: how to aggregate windowed scores
Returns:
ndarray: Mean squared error between test_data windows and reconstructed windows,
@@ -181,14 +181,14 @@ class SeqExp(ImgExp):
def get_MSE_all_agg(self, test_data):
"""
- Gets MSE for all aggregate types 'x_std', 'x_mean', 'in_std', 'in_mean'.
+ Gets MSE for all aggregate types 'r_sigma', 'r_mu', 'in_std', 'in_mean'.
Params:
ndarray test_data: data used to test model (reconstruct).
shape (samples(windows), window length, img_width, img_height, 1)
Returns:
- dictionary with keys 'x_std', 'x_mean', 'in_std', 'in_mean', and values
+ dictionary with keys 'r_sigma', 'r_mu', 'in_std', 'in_mean', and values
ndarrays of shape (samples,)
"""
@@ -209,7 +209,7 @@ class SeqExp(ImgExp):
RE = np.mean(np.power(error, 2), axis=2) # (samples-win_len+1, win_len)
RE_dict = {}
- agg_type_list = ['x_std', 'x_mean', 'in_std', 'in_mean', 'r']
+ agg_type_list = ['r_sigma', 'r_mu', 'in_std', 'in_mean', 'r']
# Get various per frame RE score
for agg_type in agg_type_list:
@@ -361,7 +361,7 @@ class SeqExp(ImgExp):
AUROC_std = np.std(ROC_mat, axis=0)
AUROC_avg_std = join_mean_std(AUROC_avg, AUROC_std)
- # Same for PR values# x_mean, I added
+ # Same for PR values
AUPR_avg = np.mean(PR_mat, axis=0)
AUPR_std = np.std(PR_mat, axis=0)
AUPR_avg_std = join_mean_std(AUPR_avg, AUPR_std)
diff --git a/stcae_test.py b/stcae_test.py
index 62f5e6e06e6119a2863e2ee18fc9b97afbd73e23..f3aa2486f51d49669c08e423e16e77cfb726c079 100644
--- a/stcae_test.py
+++ b/stcae_test.py
@@ -6,11 +6,11 @@ if __name__ == "__main__":
start_time = time.time()
##--Set path of learned model!
- # One of Fall Detection or Intrusion Detection
+ # Either Fall Detection or Intrusion Detection
##---Fall Detection----
- #pre_load = 'Models/Thermal_Fall/DSTCAE_UpSamp.h5'
- pre_load = 'Models/Thermal_Fall/DSTCAE_Deconv.h5'
+ pre_load = 'Models/Thermal_Fall/DSTCAE_UpSamp.h5'
+ #pre_load = 'Models/Thermal_Fall/DSTCAE_Deconv.h5'
#pre_load = 'Models/Thermal_Fall/DSTCAE_C3D.h5'
##---Intrusion Detection----
@@ -24,9 +24,9 @@ if __name__ == "__main__":
dset = 'Thermal_Fall'
##--Choose evaluation measure
- #RE = 'r'
- RE = 'x_mean' # for cross context mean: r\mu in paper
- #RE = 'x_std' # for cross context std: r\sigma in paper
+ #RE = 'r_sigma'
+ #RE = 'r_mu'
+ RE = 'r'
##--Evaluation type : per_video or all videos
## per-video not allowed for Intrusion detection -> because we have videos with only non-intrusion also.
@@ -34,8 +34,8 @@ if __name__ == "__main__":
## calculate AUROC/AUPR
## Note: should be used in case of animation of a intrusion video
- #evaluation_type = 'per_video' # not for intrusion case (except if you want an animation of video)
- evaluation_type = 'all_videos'
+ evaluation_type = 'per_video' # not for intrusion case (except if you want an animation of video)
+ #evaluation_type = 'all_videos'
## Optional: Animation per video
do_animate = False
diff --git a/util.py b/util.py
index 87bcd6426f554922dbb695d86e083995d3500c1f..d41145fdbc824d1be6a2318c0f5683eb9609bd8b 100644
--- a/util.py
+++ b/util.py
@@ -78,19 +78,6 @@ def get_output(labels, predictions, get_thres=False, to_plot=False, data_option=
if not os.path.isdir(score_dir):
os.makedirs(score_dir)
print('saving ind. scores to {}'.format(score_dir))
-
- # plot_fpr_tpr(thresholds_roc, tpr, fpr, [fpr_thres, tpr_thres, optimal_roc_threshold], data_option, score_dir, True )
- #
- # plot_ROC_AUC(fpr, tpr, AUROC, data_option, thresholds_roc,
- # [fpr_thres, tpr_thres, optimal_roc_threshold], save_fig=True, save_dir = score_dir)
-
- # plot_ROC_AUC_3D(fpr, tpr, AUROC, data_option, thresholds_roc,
- # [fpr_thres, tpr_thres, optimal_roc_threshold],save_pickle=False, save_dir=score_dir)
-
- # no_skill = len(true_classes[true_classes==1]) / len(true_classes)
- # plot_PR_AUC(recall, precision, AUPR, no_skill, data_option, thresholds_pr,
- # [recal_thres, prec_thres, optimal_pr_threshold], save_fig=True, save_pickle=True, save_dir = score_dir)
- #
plot_RE_hist(labels, predictions, data_option, dir_name, save_dir=score_dir, save_fig=True)
return AUROC, conf_mat, g_mean, AUPR, optimal_roc_threshold, optimal_pr_threshold
else:
@@ -234,25 +221,9 @@ def plot_RE_hist(labels, predictions, data_option, dir_name, save_dir="", save_f
plt.title('{} Intrusion Frames: {}, Non-Intrusion: {}, Total: {}'.
format(dir_name, len(fall_preds), len(non_fall_preds), len(predictions)), fontsize=15)
plt.legend()
-
if save_fig != False:
plt.savefig(save_dir + '/' + data_option + '-hist.png')
- '''
- fall_mean = np.mean(fall_preds)
- fall_std = np.std(fall_preds)
- non_fall_mean = np.mean(non_fall_preds)
- non_fall_std = np.std(non_fall_preds)
- pred_mean = np.mean(predictions)
- pred_std = np.std(predictions)
-
- fig = plt.figure(figsize=(8, 5))
- plt.hist(predictions, bins='auto', histtype="step", lw=2)
- plt.xlabel('RE Score {}'.format(data_option), fontsize=14)
- plt.ylabel('Frames', fontsize=14)
- plt.title('Histogram for {}, Total Frames: {}'.format(dir_name, len(predictions)), fontsize=15)
- '''
-
def plot_fpr_tpr(thresholds, tpr, fpr, optimal_point, data_option, save_dir="", save_fig=False):
fig = plt.figure(figsize=(8, 5))
@@ -535,17 +506,13 @@ def agg_window(RE, agg_type):
return inwin_std
# Cross Context Anomaly Scores
- elif agg_type == 'x_mean':
+ elif agg_type == 'r_mu':
RE_xmat = make_cross_window_matrix(RE)
- #r stats = get_cross_window_stats(RE_xmat)
- #r x_mean = stats[:, 0]
x_mean = get_cross_window_mean(RE_xmat)
return x_mean
- elif agg_type == 'x_std':
+ elif agg_type == 'r_sigma':
RE_xmat = make_cross_window_matrix(RE)
- #r stats = get_cross_window_stats(RE_xmat)
- #r x_std = stats[:, 1]
x_std = get_cross_window_std(RE_xmat)
return x_std