Changeset 34802

Timestamp:

2021-02-02T23:51:46+13:00 (3 years ago)

Author:

davidb

Message:

Saving instances changed to a DataSink, and located in WekaUtil

Location:

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars

Files:

• WekaApplyAVModels.java (modified) (3 diffs)
• WekaApplyArousalModel.java (modified) (4 diffs)
• WekaApplyValenceModel.java (modified) (4 diffs)
• WekaUtil.java (modified) (2 diffs)

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaApplyAVModels.java

@@ -5 +5 @@
 //
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileReader;
-import java.io.FileWriter;
-
-import weka.core.converters.ConverterUtils.DataSource;
-import weka.core.Attribute;
-import weka.core.Instance;
 import weka.core.Instances;
-import weka.core.SerializationHelper;
-
-import weka.filters.Filter;
-import weka.filters.unsupervised.attribute.Remove;
 
 import weka.classifiers.Classifier;
@@ -54 +39 @@
     Instances av_labeled_instances = WekaUtil.makePredictions(valence_classifier, arousal_labeled_instances, null);
 
+    /*
     try {
         // Save labeled data
@@ -70 +56 @@
         e.printStackTrace();
     }
+    */
+
+    /*
+    try {
+        System.out.println("Saving labeled instances: " + classified_data_output_filename);     
+        DataSink.write(classified_data_output_filename, av_labeled_instances);
+    }
+    catch (Exception e) {
+        System.err.println("Failed to save data to: " + classified_data_output_filename);
+        e.printStackTrace();
+    }
+    */
+    
+    WekaUtil.saveInstancesAsDataSink(av_labeled_instances,classified_data_output_filename);
         
     }

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaApplyArousalModel.java

@@ -1 +1 @@
 package org.greenstone.mars;
 
+/*
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -12 +13 @@
 import weka.core.Attribute;
 import weka.core.Instance;
+*/
+
 import weka.core.Instances;
+/*
 import weka.core.SerializationHelper;
 
 import weka.filters.Filter;
 import weka.filters.unsupervised.attribute.Remove;
+*/
 
 import weka.classifiers.Classifier;
@@ -58 +63 @@
     System.out.println("Predicting arousal:");
     Instances labeled_instances = WekaUtil.makePredictions(classifier, filtered_unlabeled_instances, groundtruth_instances);
-        
+
+    /*
     try {
         // Save labeled data
@@ -75 +81 @@
         e.printStackTrace();
     }
-        
+    */
+    
+    WekaUtil.saveInstancesAsDataSink(labeled_instances,classified_data_output_filename);
     }
 }

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaApplyValenceModel.java

@@ -1 +1 @@
 package org.greenstone.mars;
 
+/*
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -12 +13 @@
 import weka.core.Attribute;
 import weka.core.Instance;
+*/
+
 import weka.core.Instances;
+/*
 import weka.core.SerializationHelper;
 
 import weka.filters.Filter;
 import weka.filters.unsupervised.attribute.Remove;
+*/
 
 import weka.classifiers.Classifier;
@@ -59 +64 @@
     System.out.println("Predicting valence:");
     Instances labeled_instances = WekaUtil.makePredictions(classifier, filtered_unlabeled_instances, groundtruth_instances);
-        
+
+    /*
     try {
         // Save labeled data
@@ -76 +82 @@
         e.printStackTrace();
     }
-        
+    */
+    
+    WekaUtil.saveInstancesAsDataSink(labeled_instances,classified_data_output_filename);
     }
 }

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaUtil.java

@@ -11 +11 @@
 import java.util.Random;
 
-import weka.core.converters.ConverterUtils.DataSource;
 import weka.core.Attribute;
 import weka.core.Instance;
 import weka.core.Instances;
 import weka.core.SerializationHelper;
+import weka.core.converters.ConverterUtils.DataSource;
+import weka.core.converters.ConverterUtils.DataSink;
 
 import weka.filters.Filter;
@@ -343 +344 @@
     }
 
-
+    //
     // https://waikato.github.io/weka-wiki/formats_and_processing/save_instances_to_arff/
+    //
+    public static void saveInstancesAsDataSink(Instances data_instances, String output_filename)
+    {
+        try {
+        System.out.println("Saving labeled instances: " + output_filename);     
+        DataSink.write(output_filename, data_instances);
+    }
+    catch (Exception e) {
+        System.err.println("Failed to save data to: " + output_filename);
+        e.printStackTrace();
+        System.exit(1);
+    }
+    }
+
 }