From 1056fcd42e4e4b6229b08834e762f9e2f9b3ecd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= <rmontanana@gmail.com>
Date: Tue, 28 Sep 2021 16:27:13 +0200
Subject: [PATCH] Update test.sh

---
 test.sh | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/test.sh b/test.sh
index 6070436..4a7a3c4 100755
--- a/test.sh
+++ b/test.sh
@@ -1,14 +1,30 @@
 #!/bin/bash
-for i in STree Wodt Cart SVC ExtraTree; do
-    for a in accuracy f1_macro; do
-        python src/main.py -s $a -P iMac27 -m $i -r 1
+echo "* Copying best hyperparameters into STree and SVC measures"
+for i in accuracy f1_micro f1_macro; do
+    cp src/best_results_STree-x.json "results/best_results_"$i"_STree.json"
+    cp src/best_results_SVC-x.json "results/best_results_"$i"_SVC.json"
+done
+echo "* Computing scores with best hyperparameters in STree"
+for a in accuracy f1_macro f1_micro; do
+    python src/main.py -s $a -P iMac27 -m STree -f 1
+done
+echo "* Computing scores with best hyperparameters in SVC"
+for a in accuracy f1_macro f1_micro; do
+    python src/main.py -s $a -P iMac27 -m SVC -f 1
+done
+echo "* Computing scores with the rest of models"
+for i in Wodt Cart ExtraTree; do
+    for a in accuracy f1_macro f1_micro; do
+        python src/main.py -s $a -P iMac27 -m $i
     done
 done
+echo "* Building best hyperaparameters files for models"
 for i in STree Wodt Cart SVC ExtraTree; do
-    for a in accuracy f1_macro; do
-        python src/build_best.py -s $a -m $i -r 1
+    for a in accuracy f1_macro f1_micro; do
+        python src/build_best.py -s $a -m $i
     done
 done
-for a in accuracy f1_macro; do
+echo "* Doing benchmark with all the results"
+for a in accuracy f1_macro f1_micro; do
     python src/benchmark.py -s $a
-done
\ No newline at end of file
+done