Changeset 1577 for branches/ralph/src/main
- Timestamp:
- 06/25/14 16:31:25 (10 years ago)
- Location:
- branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/FengDoolittleNode.java
r1573 r1577 165 165 } 166 166 167 public void addSequence(NumberSequence s) { 168 sequences.add(s); 169 } 170 171 167 172 /** 168 173 * Returns the sequence at this node, in the form of a String. … … 424 429 newNode.addChild(child1); 425 430 newNode.addChild(child2); 431 newNode.setIdentifier(new Identifier(child1.getIdentifier().getName() + " " + child2.getIdentifier().getName())); 432 System.out.println("Merging " + child1.getIdentifier() + " with " + child2.getIdentifier()); 426 433 427 434 if(newNode instanceof FengDoolittleNode) { -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/Node.java
r1573 r1577 137 137 void joinChildren( int n1, int n2); 138 138 139 void addSequence(NumberSequence numberSequence); 140 139 141 140 142 -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/pal/tree/UPGMATree.java
r1573 r1577 48 48 } 49 49 50 50 this.numberseqs = numberseqs; 51 51 init(m); 52 52 … … 104 104 Node tmp = NodeFactory.createNode(); 105 105 tmp.setIdentifier(new Identifier(Integer.toString(i))); 106 tmp. setSequence(0,numberseqs.get(i));106 tmp.addSequence(numberseqs.get(i)); 107 107 getRoot().addChild(tmp); 108 108 } … … 147 147 abi = alias[besti]; 148 148 abj = alias[bestj]; 149 System.out.println("Found best pair: " + abi + "/" +abj + " - "+ besti+ "/"+bestj +" with distance " + dmin);149 //System.out.println("Found best pair: " + abi + "/" +abj + " - "+ besti+ "/"+bestj +" with distance " + dmin); 150 150 151 151 }
Note: See TracChangeset
for help on using the changeset viewer.