- Timestamp:
- 06/23/14 00:05:33 (10 years ago)
- Location:
- branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix
- Files:
-
- 1 deleted
- 5 edited
- 1 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/DifferenceSubstitutionMatrix.java
r1568 r1572 2 2 * 3 3 */ 4 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;4 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 5 5 6 6 import java.util.Collection; -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/NearbySubstitutionMatrix.java
r1568 r1572 2 2 * 3 3 */ 4 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;4 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 5 5 6 6 import java.util.Collection; -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java
r1570 r1572 1 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;1 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 2 2 3 3 -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/SubstitutionMatrix.java
r1570 r1572 1 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;1 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 2 2 3 3 -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/TriangleMatrix.java
r1570 r1572 1 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;1 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 2 2 3 3 public class TriangleMatrix { 4 4 5 5 private double[] matrix; 6 pr ivateint size;6 protected int size; 7 7 8 8 -
branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/UPGMAMatrix.java
r1571 r1572 1 package de.ugoe.cs.autoquest.tasktrees.alignment. substitution;1 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix; 2 2 3 public class FitchMargoliashMatrix extends TriangleMatrix { 3 import de.ugoe.cs.autoquest.tasktrees.alignment.pal.misc.Identifier; 4 4 5 public FitchMargoliashMatrix(int size) { 5 6 public class UPGMAMatrix extends TriangleMatrix { 7 8 public UPGMAMatrix(int size) { 6 9 super(size); 7 10 } 8 9 11 12 public int size() { 13 return size; 14 } 15 16 public String toString() { 17 String result = ""; 18 for (int i = 0; i < size; i++) { 19 result = result + String.format("%8d", i); 20 } 21 result += "\n"; 22 23 for (int i = 0; i < size; i++) { 24 for(int j = 0; j< size; j++) { 25 if(i<j) { 26 if(Double.isInfinite(this.get(i,j))) { 27 result = result + " -------"; 28 } 29 else { 30 result = result + String.format("%+8.2f",this.get(i,j)); 31 } 32 } 33 else { 34 result = result + (" "); 35 } 36 } 37 result = result + " " + i + "\n"; 38 } 39 return result; 40 } 41 10 42 11 43
Note: See TracChangeset
for help on using the changeset viewer.