Browse Source

Update of run param for optimization attributes

Jérôme BUISINE 9 months ago
parent
commit
8b6c09895e

+ 8 - 4
data_processing/generateAndTrain_maxwell_custom_optimization.sh

@@ -37,14 +37,16 @@ filter=$4
 
 # selection of four scenes (only maxwell)
 scenes="A, D, G, H"
-
+result_filename="results/optimization_comparisons_${filter}.csv"
 start=0
 end=$size
 
-for nb_zones in {4,6,8,10,12}; do
+#for nb_zones in {4,6,8,10,12}; do
+for nb_zones in {10,12}; do
 
     for mode in {"svd","svdn","svdne"}; do
-        for model in {"svm_model","ensemble_model","ensemble_model_v2"}; do
+        #for model in {"svm_model","ensemble_model",""}; do
+        model="svm_model"
 
             FILENAME="data/${model}_N${size}_B${start}_E${end}_nb_zones_${nb_zones}_${feature}_${mode}_${data}_${filter}"
             MODEL_NAME="${model}_N${size}_B${start}_E${end}_nb_zones_${nb_zones}_${feature}_${mode}_${data}_${filter}"
@@ -58,8 +60,10 @@ for nb_zones in {4,6,8,10,12}; do
                 echo "${MODEL_NAME} results already generated..."
             else
                 python generate/generate_data_model_random_${data}.py --output ${FILENAME} --interval "${start},${end}" --kind ${mode} --feature ${feature} --scenes "${scenes}" --nb_zones "${nb_zones}" --percent 1 --renderer "maxwell" --step 40 --random 1 --custom ${CUSTOM_MIN_MAX_FILENAME}
+                
+                echo "Train ${MODEL_NAME}"
                 python find_best_${filter}.py --data ${FILENAME} --choice ${model}
             fi
-        done
+        #done
     done
 done

+ 1 - 1
run/runAll_maxwell_custom_optimization_filters.sh

@@ -21,7 +21,7 @@ data=$1
 erased=$2
 
 if [ "${erased}" == "Y" ]; then
-    echo "Previous data file erased..."
+    echo "Previous results file erased..."
     rm ${file_path}
     mkdir -p results
     touch ${file_path}