Changeset 36863 for gs3-extensions

Timestamp:

2022-10-23T00:00:08+13:00 (18 months ago)

Author:

davidb

Message:

Further improvements to performing AV recommendation

Location:

gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/util

Files:

• WekaDBWrapper.java (modified) (2 diffs)
• WekaFindInstanceKNN.java (modified) (2 diffs)

gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/util/WekaDBWrapper.java

@@ -41 +41 @@
 public class WekaDBWrapper
 {
+    public final static double AV_SEGMENT_LENGTH_SECS = 6.0;
+    
     /** the query result, filled in by runQuery */
     protected Vector query_result_;
@@ -190 +192 @@
 
         String matching_doc_id = m.group(1);
-        int matching_segment_offset = Integer.parseInt(m.group(2));
-
+        int end_of_matching_segment_offset = Integer.parseInt(m.group(2));
+        int matching_segment_offset = end_of_matching_segment_offset - (int)AV_SEGMENT_LENGTH_SECS;
+        
         if (matching_doc_id.equals(doc_id)) {
             continue;

gs3-extensions/mars-src/trunk/src/java/org/greenstone/gsdl3/util/WekaFindInstanceKNN.java

@@ -94 +94 @@
     {
     System.err.println("**** wekaFindInstnaceKNN::kNearestNeighbours() called with:");
-    System.err.print(  "**** doc_id_segment = " + doc_id_segment);
-    System.err.print(  " arousal_val = "   + arousal_val);
-    System.err.print(  " valence_val = "   + valence_val);
-    System.err.println(" k_nearest_num = " + k_nearest_num);
+    System.err.print(  "  doc_id_segment = " + doc_id_segment);
+    System.err.print(  "  arousal_val = "   + arousal_val);
+    System.err.print(  "  valence_val = "   + valence_val);
+    System.err.println("  k_nearest_num = " + k_nearest_num);
     
     Instance sample_instance = new DenseInstance(3);
@@ -117 +117 @@
     try {
         nearest_instances = knn_.kNearestNeighbours(sample_instance, k_nearest_num);
-        System.err.println("**** nearest_instances len = " + nearest_instances.numInstances());
+        System.err.println("**** Expanded to include instances that are equidistant, nearest_instances len = " + nearest_instances.numInstances());
 
         //printNearestKNN(sample_instance,nearest_instances, k_nearest_num);