Changeset 1654 for branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe

Timestamp:

08/08/14 22:43:30 (10 years ago)

Author:

rkrimmel

Message:

Adding Debug output to find this freaking damn error.

Location:

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

Files:

• alignment/algorithms/Match.java (modified) (1 diff)
• alignment/algorithms/SmithWatermanRepeated.java (modified) (2 diffs)
• temporalrelation/RuleUtils.java (modified) (2 diffs)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (6 diffs)

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

@@ -60 +60 @@
         }
 
-        
+        /*
         public void addOccurencesOf(Match m) {
                 LinkedList<MatchOccurence> occ = m.getOccurences();
                 occurences.addAll(occ);
         }
+        */
         
    

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

@@ -227 +227 @@
                 }
 
+                
                 NumberSequence ns1 = new NumberSequence(reversed1.length);
                 NumberSequence ns2 = new NumberSequence(reversed2.length);
@@ -304 +305 @@
                                 tmpal.setFirstSequence(tmpns1);
                                 tmpal.setSecondSequence(tmpns2);
-                                tmpal.addOccurence(new MatchOccurence(start,alignment.get(0).getId()));
-                                tmpal.addOccurence(new MatchOccurence(start,alignment.get(1).getId()));
+                                //tmpal.addOccurence(new MatchOccurence(start,alignment.get(0).getId()));
+                                //tmpal.addOccurence(new MatchOccurence(start,alignment.get(1).getId()));
                                 result.add(tmpal);
                         }

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

@@ -14 +14 @@
 
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation;
+
+import java.util.Iterator;
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -93 +95 @@
         ISequenceInstance subsequence = taskFactory.createNewTaskInstance(model);
         
-       
+       for (Iterator<ITaskInstance> it = subsequence.iterator();it.hasNext();) {
+           ITaskInstance foo =  it.next();
+           System.out.println(foo);
+       }
         
         System.out.println("Got model: " + model.toString());
-        
-       
         
        

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

@@ -203 +203 @@
                                 if (startpositions.size() > 0) {
                                         NumberSequence tempns = appData.getNumberSequences().get(j);
-                                        for(int k=0;k<tempns.getSequence().length;k++) {
-                                                System.out.println(k + ": " + tempns.getSequence()[k]);
-                                        }
+                                        
                                         for (Iterator<Integer> jt = startpositions.iterator(); jt
                                                         .hasNext();) {
                                                 int start = jt.next();
+                                                //TODO: Debug Output
                                                 System.out.println("Found match ");
                                                 pattern.getFirstSequence().printSequence();
                                                 pattern.getSecondSequence().printSequence(); 
                                                 System.out.println("in sequence " + (j+1) + " at position " + start);
+                                                for(int k=0;k<tempns.getSequence().length;k++) {
+                                                        System.out.print(k + ": " + tempns.getSequence()[k] + " ");
+                                                        System.out.println(appData.getNumber2Task().get(tempns.getSequence()[k]));
+                                                }
                                                 pattern.addOccurence(
                                                                 new MatchOccurence(start, j));
@@ -225 +228 @@
                 Comparator<Match> comparator = new Comparator<Match>() {
                         public int compare(Match m1, Match m2) {
-                                return m2.occurenceCount() - m1.occurenceCount(); // use your
-                                                                                                                                        // logic
+                                return m2.occurenceCount() - m1.occurenceCount(); 
+                                                                                                                                        
                         }
                 };
-                Collections.sort(matchseqs, comparator);
+                //Collections.sort(matchseqs, comparator);
                 
 
@@ -276 +279 @@
                                         matchseqs.get(i).getFirstSequence().printSequence();
                                         matchseqs.get(i).getSecondSequence().printSequence();
-                                        System.out.println(" in session number: " + (oc.getSequenceId()+1) + " at position " + oc.getStartindex() + "-" + (oc.getStartindex()+matchseqs.get(i).getFirstSequence().size()));
+                                        System.out.println(" in session number: " + (oc.getSequenceId()+1) + " at position " + (oc.getStartindex()) + "-" + (oc.getStartindex()+matchseqs.get(i).getFirstSequence().size()));
                                         System.out.println("Printing session: ");
                                         for(int j=0;j<sessions.get(oc.getSequenceId()).size();j++) {
@@ -356 +359 @@
                 ITask task;
                 List<IUserSession> sessions = appData.getSessions();
-                int sessionNo = 0;
-                for (IUserSession session : sessions) {
-                        Console.traceln(Level.FINE, "handling " + (++sessionNo) + ". "
-                                        + session);
+                for (int j = 0; j< sessions.size();j++) {
+                        IUserSession session = sessions.get(j);
+        
                         NumberSequence templist = new NumberSequence(session.size());
 
@@ -380 +382 @@
                         }
                         //Each NumberSequence is identified by its id, beginning to count at zero
-                        templist.setId(sessionNo-1);
+                        templist.setId(j);
                         appData.getNumberSequences().add(templist);
                         comparator.clearBuffers();
@@ -562 +564 @@
                         }
                 }
+                
+                //TODO: Debug output
                 for (int i =0;i<sequence.getChildren().size();i++) {
                         System.out.println(sequence.getChildren().get(i));