Changeset 1619

Timestamp:

07/20/14 20:43:00 (10 years ago)

Author:

rkrimmel

Message:

Detecting matches in other matches

Location:

branches/ralph

Files:

• .classpath (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/SmithWatermanRepeated.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (2 diffs)

branches/ralph/.classpath

@@ -18 +18 @@
                 </attributes>
         </classpathentry>
-        <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
                 <attributes>
                         <attribute name="maven.pomderived" value="true"/>

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/algorithms/NumberSequence.java

@@ -62 +62 @@
                                         if (sequence[i + j] != pat1[j]
                                                         && sequence[i + j] != pat2[j]) {
+                                                i++;
                                                 continue notmatched;
                                         }

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

@@ -4 +4 @@
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.logging.Level;
+
 
 import de.ugoe.cs.autoquest.tasktrees.alignment.matrix.SubstitutionMatrix;
 import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.Constants;
-import de.ugoe.cs.util.console.Console;
+
 
 public class SmithWatermanRepeated implements AlignmentAlgorithm {

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java

@@ -164 +164 @@
                 Console.traceln(Level.INFO,"retrieving significant sequence pieces");
                 for (int i=0; i< numberseqs.size();i++) {
+                        Console.traceln(Level.FINEST,"retrieving significant sequence pieces:  " + Math.round((float)i/(float)numberseqs.size()*100) + "%");
                         for(int j=0; j< numberseqs.size();j++) {
                                 if(i != j) {
@@ -171 +172 @@
                         }
                 }
+                Console.traceln(Level.FINEST,"retrieving significant sequence pieces:  100%");
                 
                 Console.traceln(Level.INFO, "searching for patterns occuring most");
+
                 //search this match in every other sequence
                 for(int i=0; i < matchseqs.size();i++) {
+                        int occurencecount = 0;
+                        Console.traceln(Level.FINEST, "searching for patterns occuring most: " + Math.round((float)i/(float)matchseqs.size()*100) + "%");
                         for(int j=0; j < matchseqs.size();j++) {
                                 if(i>j) {
                                         if(matchseqs.get(j).get(0).containsPattern(matchseqs.get(i)) > 0 || matchseqs.get(j).get(1).containsPattern(matchseqs.get(i)) > 0) {
-                                                System.out.println("Found something!");
+                                                occurencecount++;
                                         }
                                 }
                         }
-                                
+                        if(occurencecount > 1) {
+                                System.out.println("Found pattern \n "); 
+                                matchseqs.get(i).get(0).printSequence(); 
+                                matchseqs.get(i).get(1).printSequence(); 
+                                System.out.println(occurencecount + " times");
+                                System.out.println();
+                        }
                 }