Changeset 1557 for branches

Timestamp:

05/28/14 11:28:12 (10 years ago)

Author:

rkrimmel

Message:

Smith-Waterman adjustments

Location:

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• alignment/algorithms/FengDoolittle.java (modified) (1 diff)
• alignment/algorithms/ProgressiveMultiAlignment.java (deleted)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package de.ugoe.cs.autoquest.tasktrees.alignment.algorithms;
+
+import de.ugoe.cs.autoquest.tasktrees.alignment.substitution.TriangleMatrix;
 
 public class FengDoolittle {
 
+        private TriangleMatrix scoreDistance;
+        
+        
+        
+        public FengDoolittle() {
+                
+        
+                
+                
+        }
+        
 }

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

@@ -25 +25 @@
 import java.util.logging.Level;
 
+import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.FengDoolittle;
 import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.NumberSequence;
 import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.SmithWaterman;
@@ -150 +151 @@
         submat.generate();
         
-        SmithWaterman sm = new SmithWaterman(numberseqs.get(1).getSequence(), numberseqs.get(1).getSequence(), submat);
-        sm.printDPMatrix();
+        SmithWaterman sw = new SmithWaterman(numberseqs.get(1).getSequence(), numberseqs.get(1).getSequence(), submat);
+        
+   
+        
+        
       
         
         
         //Hier mein kram hin
-        /*do {
+        do {
             System.out.println();
+            FengDoolittle fd = new FengDoolittle();
+            
             
             appData.getStopWatch().start("whole loop");
@@ -167 +173 @@
             appData.getStopWatch().stop("whole loop");
             
-            //((TaskTreeNodeComparator) taskComparator).getStopWatch().dumpStatistics(System.out);
-            //((TaskTreeNodeComparator) taskComparator).getStopWatch().reset();
             
             appData.getStopWatch().dumpStatistics(System.out);
@@ -174 +178 @@
             
         }
-        while (appData.detectedAndReplacedTasks());*/
+        while (appData.detectedAndReplacedTasks());
         
         Console.println