Merge branch 'master' into neural-network

src/main/java/be/cylab/java/wowa/training/Utils.java

@@ -472,40 +472,40 @@ final class Utils {
             final double wowa_accuracy,
             final double wowa_f_1) {
         try (OutputStreamWriter writer = new OutputStreamWriter(
-                new FileOutputStream(filename),
+                new FileOutputStream(filename, true),
                 StandardCharsets.UTF_8)) {
 
-            writer.write("___________________________________________");
-            writer.write("|TRIGGER VALUE       :" + trigger_value);
-            writer.write("|_________________________________________|");
-            writer.write("WOWA");
+            writer.write("___________________________________________\n");
+            writer.write("|TRIGGER VALUE       :" + trigger_value + "\n");
+            writer.write("|_________________________________________|\n");
+            writer.write("WOWA\n\n");
 
             writer.write("Wowa true positive : "
-                    + wowa_true_positive_counter);
+                    + wowa_true_positive_counter + "\n");
             writer.write("Wowa true negative : "
-                    + wowa_true_negative_counter);
+                    + wowa_true_negative_counter + "\n");
             writer.write("Wowa false positive : "
-                    + wowa_false_positive_counter);
+                    + wowa_false_positive_counter + "\n");
             writer.write("Wowa false negative : "
-                    + wowa_false_negative_counter);
+                    + wowa_false_negative_counter + "\n");
 
             writer.write("Wowa true positive rate : "
-                    + wowa_true_positive_rate);
+                    + wowa_true_positive_rate + "\n");
             writer.write("Wowa true negative rate : "
-                    + wowa_true_negative_rate);
+                    + wowa_true_negative_rate + "\n");
             writer.write("Wowa false positive rate : "
-                    + wowa_false_positive_rate);
+                    + wowa_false_positive_rate + "\n");
             writer.write("Wowa false negative rate : "
-                    + wowa_false_negative_rate);
+                    + wowa_false_negative_rate + "\n");
 
-            writer.write("Wowa precision : " + wowa_precision);
+            writer.write("Wowa precision : " + wowa_precision + "\n");
             writer.write("Wowa negative predictive value : "
-                    + wowa_negative_prediction_value);
+                    + wowa_negative_prediction_value + "\n");
             writer.write("Wowa false discovery rate : "
-                    + wowa_false_discovery_rate);
+                    + wowa_false_discovery_rate + "\n");
             writer.write("Wowa false omission rate : "
-                    + wowa_false_omission_rate);
-            writer.write("Wowa accuracy : " + wowa_accuracy);
+                    + wowa_false_omission_rate + "\n");
+            writer.write("Wowa accuracy : " + wowa_accuracy + "\n");
             writer.write("Wowa F1 score : " + wowa_f_1 + "\n");
 
         } catch (IOException e) {
@@ -531,40 +531,40 @@ final class Utils {
             final double average_accuracy,
             final double average_f_1) {
         try (OutputStreamWriter writer = new OutputStreamWriter(
-                new FileOutputStream(filename),
+                new FileOutputStream(filename, true),
                 StandardCharsets.UTF_8)) {
 
-            writer.write("___________________________________________");
-            writer.write("|TRIGGER VALUE       :" + trigger_value);
-            writer.write("|_________________________________________|");
-            writer.write("AVERAGE");
+            writer.write("___________________________________________\n");
+            writer.write("|TRIGGER VALUE       :" + trigger_value + "\n");
+            writer.write("|_________________________________________|\n");
+            writer.write("AVERAGE\n\n");
             writer.write("Average true positive : "
-                    + average_true_positive_counter);
+                    + average_true_positive_counter + "\n");
             writer.write("Average true negative : "
-                    + average_true_negative_counter);
+                    + average_true_negative_counter + "\n");
             writer.write("Average false positive : "
-                    + average_false_positive_counter);
+                    + average_false_positive_counter + "\n");
             writer.write("Average false negative : "
-                    + average_false_negative_counter);
+                    + average_false_negative_counter + "\n");
 
             writer.write("Average true positive rate : "
-                    + average_true_positive_rate);
+                    + average_true_positive_rate + "\n");
             writer.write("Average true negative rate : "
-                    + average_true_negative_rate);
+                    + average_true_negative_rate + "\n");
             writer.write("Average false positive rate : "
-                    + average_false_positive_rate);
+                    + average_false_positive_rate + "\n");
             writer.write("Average false negative rate : "
-                    + average_false_negative_rate);
+                    + average_false_negative_rate + "\n");
 
-            writer.write("Average precision : " + average_precision);
+            writer.write("Average precision : " + average_precision + "\n");
             writer.write("Average negative predictive value : "
-                    + average_negative_prediction_value);
+                    + average_negative_prediction_value + "\n");
             writer.write("Average false discovery rate : "
-                    + average_false_discovery_rate);
+                    + average_false_discovery_rate + "\n");
             writer.write("Average false omission rate : "
-                    + average_false_omission_rate);
-            writer.write("Average accuracy : " + average_accuracy);
-            writer.write("Average F1 score : " + average_f_1);
+                    + average_false_omission_rate + "\n");
+            writer.write("Average accuracy : " + average_accuracy + "\n");
+            writer.write("Average F1 score : " + average_f_1 + "\n");
         } catch (IOException e) {
             e.printStackTrace();
         }