Changeset 1585 for branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/FengDoolittleNode.java

Timestamp:

06/29/14 11:11:30 (10 years ago)

Author:

rkrimmel

Message:

Multiple Alignment first version

File:

• branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/FengDoolittleNode.java (modified) (3 diffs)

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

@@ -344 +344 @@
          * @param n2 number of second child
          */
-        public void joinChildren( int n1, int n2) {
+        public Node joinChildren( int n1, int n2) {
 
                 if (n1 == n2) {
@@ -376 +376 @@
                 //System.out.println("Merging " + child1.getIdentifier() + " with " + child2.getIdentifier());
                 
-                if(newNode instanceof FengDoolittleNode) {
-                        newNode.setSequences(((FengDoolittleNode) newNode).alignSequences());
-                }
-                
+                return newNode;
         }
         
@@ -397 +394 @@
 
 
-        private ArrayList<NumberSequence> alignSequences() {
-                ArrayList<NumberSequence> alignment = new ArrayList<NumberSequence>();
-                if(this.getChildCount()<3) {
-                        
-                        Node node1 = getChild(0);
-                        Node node2 = getChild(1);
-                        
-                        int seqCount1 = node1.getSequences().size();
-                        int seqCount2 = node2.getSequences().size();
-                        
-                        //Align 2 sequences
-                        if(seqCount1 == 1 && seqCount2 == 1) {
-                        }
-                        //Align a sequence to a group
-                        else if( seqCount1 > 1 && seqCount2 == 1) {
-                        
-                        }
-                        //Align a sequence to a group
-                        else if(seqCount1 == 1 && seqCount2 > 1) {
-                                
-                        }
-                        //Align 2 groups
-                        else if((seqCount1 > 1) && (seqCount2 > 1)){
-                                        
-                        }
-                        else {
-                                Console.traceln(Level.INFO,"No sequences to align while merging two nodes.");
-                        }
-                }
-                else {
-                        Console.traceln(Level.WARNING,"More than 2 children! This should never happen, it's a binary tree.");
-                }
-                return alignment;
-        }
-
         public void setSequences(ArrayList<NumberSequence> alignSequences) {
                 this.sequences = alignSequences;
         }
         
+        
+        
 }