Changeset 1740

Timestamp:

09/11/14 15:51:54 (10 years ago)

Author:

rkrimmel

Message:

Slight adjustments to object distance submat

Location:

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

Files:

• alignment/matrix/ObjectDistanceSubstitionMatrix.java (modified) (8 diffs)
• alignment/matrix/UPGMAMatrix.java (deleted)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (7 diffs)
• temporalrelation/TaskTreeValidator.java (modified) (1 diff)

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

@@ -49 +49 @@
         
         /** The calculate non task instances. */
-        private boolean calculateNonTaskInstances = true;
+        private boolean calculateNonEventTaskInstances = false;
         
         /** The first round max index. */
@@ -70 +70 @@
                 etisOfTasks = new HashMap<Integer, LinkedList<IEventTaskInstance>>();
                 this.gapPenalty = gapPenalty;
-                this.calculateNonTaskInstances = calculateNonTaskInstances;
+                this.calculateNonEventTaskInstances = calculateNonTaskInstances;
 
         }
@@ -152 +152 @@
         private float distanceBetweenTaskAndInstance(ITask task1,
                         IEventTaskInstance eti1) {
-                if (this.calculateNonTaskInstances) {
+                if (this.calculateNonEventTaskInstances) {
                         float tmpDistance = 0;
-                        // System.out.println(etisOfTasks);
-                        final LinkedList<IEventTaskInstance> eventTaskInstances = etisOfTasks
-                                        .get(task1.getId());
+                        final EventTaskInstancesListGenerator etlg = new EventTaskInstancesListGenerator();
+                        task1.accept(etlg);
+                        final LinkedList<IEventTaskInstance> eventTaskInstances = etlg
+                                        .getEventlist();
+                        
                         for (final Iterator<IEventTaskInstance> it = eventTaskInstances
                                         .iterator(); it.hasNext();) {
@@ -184 +186 @@
          */
         private float distanceBetweenTasks(ITask task1, ITask task2) {
-                if (this.calculateNonTaskInstances) {
-                        final LinkedList<IEventTaskInstance> eventTaskInstances = etisOfTasks
-                                        .get(task1.getId());
+                if (this.calculateNonEventTaskInstances) {
+                        final EventTaskInstancesListGenerator etlg = new EventTaskInstancesListGenerator();
+                        task1.accept(etlg);
+                        final LinkedList<IEventTaskInstance> eventTaskInstances = etlg
+                                        .getEventlist();
+                        
                         float tmpDistance = 0;
                         for (final Iterator<IEventTaskInstance> it = eventTaskInstances
@@ -206 +211 @@
         public void generate(HashSet<ITask> uniqueTasks) {
                 this.uniqueTasks = uniqueTasks;
-                if (this.calculateNonTaskInstances) {
+                if (this.calculateNonEventTaskInstances) {
                         matrix = new DynamicTriangleMatrix(uniqueTasks.size() + 1);
                         Console.traceln(Level.INFO, "searching EventTasks in Tasks");
-                        searchEventTaskInstances();
+                        //searchEventTaskInstances();
                 } else {
                         matrix = new StaticTriangleMatrix(uniqueTasks.size() + 1);
@@ -295 +300 @@
                                 || (taskId2 == Constants.UNMATCHED_SYMBOL)) {
                         return 0;
-                } else if ((this.calculateNonTaskInstances == false)
+                } else if ((this.calculateNonEventTaskInstances == false)
                                 && ((taskId1 > this.firstRoundMaxIndex) || (taskId2 > this.firstRoundMaxIndex))) {
                         return 0;
@@ -347 +352 @@
         public void update(LinkedList<ITask> newTasks) {
 
-                if (this.calculateNonTaskInstances) {
+                if (this.calculateNonEventTaskInstances) {
                         try {
                                 matrix.increaseSize(newTasks.size());
@@ -356 +361 @@
                                 Console.logException(e);
                         }
-                        this.updateEventTaskInstances(newTasks);
+                        //this.updateEventTaskInstances(newTasks);
                         for (final Iterator<ITask> it = newTasks.iterator(); it.hasNext();) {
                                 final ITask task1 = it.next();

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

@@ -385 +385 @@
                         appData.getStopWatch().stop("whole loop");
                         appData.getStopWatch().dumpStatistics(System.out);
-                        new TaskTreeValidator().validate(appData.getSessions());
                         appData.getStopWatch().reset();
 
@@ -401 +400 @@
                                         RuleApplicationStatus.FINISHED);
                 }
-
+                new TaskTreeValidator().validate(appData.getSessions());
                 return appData.getResult();
         }
@@ -534 +533 @@
                         final int from = i;
                         final int to = i + interval+offset-1;
-                        Console.traceln(Level.FINE, "Aligning: Creating thread for sessions " + from + " till " + to);
+                        Console.traceln(Level.FINER, "Aligning: Creating thread for sessions " + from + " till " + to);
                         final ParallelPairwiseAligner aligner = new ParallelPairwiseAligner(
                                         appData, from, to);
@@ -764 +763 @@
                                         taskBuilder.addChild(selection, subsequence2);
                                         taskBuilder.addChild(sequence, selection);
-                                        // TODO: We run not till the end!
+                                        // TODO: We may not run till the end!
                                         while ((i < (first.length - 1)) && selectionfound) {
                                                 selectionfound = false;
@@ -1024 +1023 @@
                 int rest = matchSeqSize % newThreads;
                 final ExecutorService executor = Executors.newFixedThreadPool(nThreads);
-                Console.traceln(Level.FINE, "Interval: " + interval + " Rest: " + rest);
+                Console.traceln(Level.FINER, "Interval: " + interval + " Rest: " + rest);
                 for (int i = 0; i <= (matchSeqSize-interval); i += interval) {
                         int offset = 0;
@@ -1101 +1100 @@
                         final int size = to - from;
 
-                        for (int i = from; i < to; i++) {
+                        for (int i = from; i <= to; i++) {
                                 final Match pattern = appData.getMatchseqs().get(i);
                                 count++;
@@ -1174 +1173 @@
                         final int size = to - from; 
 
-                        for (int i = from; i < to; i++) {
+                        for (int i = from; i <= to; i++) {
                                 final NumberSequence ns1 = appData.getNumberSequences().get(i);
                                 count++;

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

@@ -99 +99 @@
         if (taskInstance.getTask() instanceof ISequence) {
             ISequence task = (ISequence) taskInstance.getTask();
-            System.out.println("Task: " + task);
+            //System.out.println("Task: " + task);
             String instance="\n";
             String model="\n";