Changeset 1749

Timestamp:

09/16/14 18:31:46 (10 years ago)

Author:

rkrimmel

Message:

Code cleanup, removed dublicate storage of task items

Location:

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• alignment/matrix/ObjectDistanceSubstitionMatrix.java (modified) (1 diff)
• temporalrelation/RuleUtils.java (modified) (2 diffs)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (12 diffs)

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java

@@ -66 +66 @@
                 final ISequenceInstance subsequence = taskFactory
                                 .createNewTaskInstance(model);
-                
-                //System.out.println("STARTINDEX: " + startIndex);
-                //System.out.println("PRINTING SEQUENCE: ");
-                //for(int i =0; i< parent.size();i++) {
-                //    System.out.println(i + ": " +parent.get(i));
-                //}
+                /*
+                System.out.println("STARTINDEX: " + startIndex);
+                System.out.println("PRINTING SEQUENCE: ");
+                for(int i =0; i< parent.size();i++) {
+                    System.out.println(i + ": " +parent.get(i));
+                }
                 System.out.println();
                 
@@ -105 +105 @@
                 }
                 System.out.println();
-                
+                */
                 // TODO: This is dirty, return this in addition with the sequence
                 // instance instead

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java

@@ -25 +25 @@
 import java.util.List;
 import java.util.Map;
-import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.Set;
@@ -73 +72 @@
 
     /** The n threads. */
-    // public static int nThreads = Runtime.getRuntime().availableProcessors() - 1;
-    public static int nThreads = 1;
+    public static int nThreads = Runtime.getRuntime().availableProcessors() - 1;
+    //public static int nThreads = 1;
 
     /** The iteration. */
     private int iteration = 0;
 
-    private int maxIterations = 1;
+    private int maxIterations = 10
+            ;
 
     private static int alignmentThreshold = 9;
@@ -148 +148 @@
 
         Console.traceln(Level.INFO, "generating substitution matrix from " +
-            appData.getUniqueTasks().size() + " unique tasks");
+            appData.getNumber2Task().size() + " unique tasks");
         appData.getStopWatch().start("substitution matrix");
-        appData.getSubmat().generate(appData.getUniqueTasks());
+        appData.getSubmat().generate(appData.getNumber2Task().values());
         appData.getStopWatch().stop("substitution matrix");
 
@@ -358 +358 @@
                 if (task == null) {
                     uniqueTasks.addSymbol(taskInstance, taskInstance.getTask());
-                    appData.getUniqueTasks().add(taskInstance.getTask());
                     appData.getNumber2Task().put(taskInstance.getTask().getId(),
                                                  taskInstance.getTask());
@@ -372 +371 @@
         appData.getStopWatch().stop("harmonizing event tasks");
         Console.traceln(Level.INFO, "harmonized " + unifiedTasks + " task occurrences (still " +
-            appData.getUniqueTasks().size() + " different tasks)");
+            uniqueTasks.size() + " different tasks)");
 
         appData.getStopWatch().dumpStatistics(System.out);
@@ -708 +707 @@
             e.printStackTrace();
         }
+        appData.getPreparedTasks().clear();
     }
 
@@ -1008 +1008 @@
         public void run() {
             for (int i = from; i <= to; i++) {
-                System.out.println("Replacing in SEQUENCE " + i);
+                //System.out.println("Replacing in SEQUENCE " + i);
                 /*
                  * HashMap for keeping track in which sequence which replacement has been performed.
@@ -1062 +1062 @@
                    
 
-                    System.out.println("Replacing in Sequence " + oc.getSequenceId() +
-                        " at position " + oc.getStartindex() + " till " + oc.getEndindex());
+                    //System.out.println("Replacing in Sequence " + oc.getSequenceId() +
+                    //    " at position " + oc.getStartindex() + " till " + oc.getEndindex());
                     final ISequenceInstance sequenceInstances =
                         RuleUtils.createNewSubSequenceInRange(appData.getSessions()
@@ -1116 +1116 @@
         private final HashMap<Integer, ITask> number2task;
 
-        /**
-         * The unique tasks, keeps track about all unique tasks TODO: We Actually just need
-         * number2task here, this structure can be removed in the future.
-         */
-        private final HashSet<ITask> uniqueTasks;
 
         /**
@@ -1168 +1163 @@
             this.sessions = sessions;
             numberseqs = new ArrayList<NumberSequence>();
-            uniqueTasks = new HashSet<ITask>();
             number2task = new HashMap<Integer, ITask>();
             stopWatch = new StopWatch();
@@ -1271 +1265 @@
 
         /**
-         * Gets the unique tasks.
-         *
-         * @return the unique tasks
-         */
-        private HashSet<ITask> getUniqueTasks() {
-            return uniqueTasks;
-        }
-
-        /**
          * New task created.
          *
@@ -1295 +1280 @@
          */
         synchronized private void resetNewlyCreatedTasks() {
-            uniqueTasks.addAll(newTasks);
             newTasks.clear();
         }