X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModels.java;h=654136ac0cf498007a6bdc4ef9ef5e743ee78975;hb=3f62ab98313f836c9e0cdec277e2ec9a0c194801;hp=193d5f48e7d34ea0b02b60da9f9c3f84e8e802c0;hpb=6666fd8b18b395d444e7f4c76016231f5a4d3669;p=jalview.git diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java index 193d5f4..654136a 100644 --- a/src/jalview/analysis/scoremodels/ScoreModels.java +++ b/src/jalview/analysis/scoremodels/ScoreModels.java @@ -1,5 +1,6 @@ package jalview.analysis.scoremodels; +import jalview.api.AlignmentViewPanel; import jalview.api.analysis.ScoreModelI; import jalview.io.DataSourceType; import jalview.io.FileParse; @@ -35,10 +36,9 @@ public class ScoreModels * */ private ScoreModels() @@ -52,7 +52,6 @@ public class ScoreModels registerScoreModel(new PIDModel()); DNA = loadScoreMatrix("scoreModel/dna.scm"); registerScoreModel(new FeatureDistanceModel()); - // registerScoreModel(new PIDDistanceModel()); // superseded by PIDModel } /** @@ -92,9 +91,20 @@ public class ScoreModels return models.values(); } - public ScoreModelI forName(String s) + /** + * Returns an instance of a score model for the given name. If the model is of + * 'view dependent' type (e.g. feature similarity), instantiates a new + * instance configured for the given view. Otherwise returns a cached instance + * of the score model. + * + * @param name + * @param avp + * @return + */ + public ScoreModelI getScoreModel(String name, AlignmentViewPanel avp) { - return models.get(s); + ScoreModelI model = models.get(name); + return model == null ? null : model.getInstance(avp); } public void registerScoreModel(ScoreModelI sm)