Changeset 1630 for branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment

Timestamp:

07/30/14 17:06:47 (12 years ago)

Author:

rkrimmel

Message:

Generated Model of matches.

Location:

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

Files:

• algorithms/GenerateTask.java (modified) (3 diffs)
• algorithms/Match.java (modified) (2 diffs)
• matrix/PairwiseAlignmentGenerator.java (modified) (1 diff)
• pal/tree/UPGMAAligningTree.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package de.ugoe.cs.autoquest.tasktrees.alignment.algorithms;
 
+/*
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory;
-
+*/
 public class GenerateTask {
         
         
-        private ITaskFactory taskFactory;
+        //private ITaskFactory taskFactory;
         /**
          * <p>
@@ -16 +18 @@
          * </p>
          */
+        /*
         private ITaskBuilder taskBuilder;
         
@@ -30 +33 @@
         }
         
+        void optional() {
+                IOptional optional = taskFactory.createNewOptional();
+                //taskBuilder.setChild(optional, child);
+                
+        }
         
+        */
         
 }

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedList;
+
+
 
 public class Match {
@@ -64 +65 @@
                 occurences.addAll(occ);
         }
+        
+   
 
 }

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/PairwiseAlignmentGenerator.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.logging.Level;
 

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/UPGMAAligningTree.java

@@ -56 +56 @@
         
                 this.numberseqs = numberseqs;
-                this.alignments = alignments;
                 this.submat = submat;
                 init(alignments.getDistanceMatrix());
@@ -82 +81 @@
         //
         private ArrayList<NumberSequence> numberseqs;
-        private PairwiseAlignmentStorage alignments;
         private ObjectDistanceSubstitionMatrix submat;
         private int numClusters;