X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FTreeAlgorithm.java;h=7aaa913bc1836cc19140e496d003333c7417426f;hb=c58f08345070f16bdc228c5e272db1bfd9cb6241;hp=55175f24e97efa7e6e339624975bd0ce935f8049;hpb=cc2b217e11a5ad7ae4d03c693ed7142e843fc0d3;p=jalview.git diff --git a/src/jalview/analysis/TreeAlgorithm.java b/src/jalview/analysis/TreeAlgorithm.java index 55175f2..7aaa913 100644 --- a/src/jalview/analysis/TreeAlgorithm.java +++ b/src/jalview/analysis/TreeAlgorithm.java @@ -2,13 +2,30 @@ package jalview.analysis; public enum TreeAlgorithm { - NEIGHBOUR_JOINING("NJ"), AVERAGE_DISTANCE("AV"), MAXIMUM_PARSIMONY("MP"), - MAXIMUM_LIKELIHOOD("ML"), BAYESIAN("BY"); + NEIGHBOUR_JOINING("NJ", "Neighbour Joining"), + AVERAGE_DISTANCE("AV", "Average Distance (UPGMA)"), + MAXIMUM_PARSIMONY("MP", ("Maximum Parsimony")), + MAXIMUM_LIKELIHOOD("ML", "Maximum Likelihood"), + BAYESIAN("BY", "Bayesian Inference"); private final String abbreviation; - TreeAlgorithm(String abbreviatedAlgorithm) + private final String name; + + TreeAlgorithm(String abbreviatedName, String fullName) + { + this.abbreviation = abbreviatedName; + this.name = fullName; + } + + public String getAbbreviation() { - this.abbreviation = abbreviatedAlgorithm; + return abbreviation; } + + public String getName() + { + return name; + } + }