X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModels.java;h=ebc9a26d0a0c9260f9f7b9ee16a2122aec2b886a;hb=7723baa88fa4f365c01e9f0ee9551e278219d2e5;hp=71463831af62474f4bfc07113133979c4f9e36c8;hpb=e5c87d2dd1d3ebceea890ef92c8a6374c62d3c83;p=jalview.git
diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java
index 7146383..ebc9a26 100644
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -1,8 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.analysis.scoremodels;
import jalview.api.AlignmentViewPanel;
import jalview.api.analysis.ScoreModelI;
-import jalview.api.analysis.ViewBasedAnalysisI;
import jalview.io.DataSourceType;
import jalview.io.FileParse;
import jalview.io.ScoreMatrixFile;
@@ -22,12 +41,22 @@ public class ScoreModels
private final ScoreMatrix DNA;
- private static ScoreModels instance = new ScoreModels();
+ private static ScoreModels instance;
private Map models;
+ /**
+ * Answers the singleton instance of this class, with lazy initialisation
+ * (built-in score models are loaded on the first call to this method)
+ *
+ * @return
+ */
public static ScoreModels getInstance()
{
+ if (instance == null)
+ {
+ instance = new ScoreModels();
+ }
return instance;
}
@@ -47,11 +76,11 @@ public class ScoreModels
/*
* using LinkedHashMap keeps models ordered as added
*/
- models = new LinkedHashMap();
+ models = new LinkedHashMap<>();
BLOSUM62 = loadScoreMatrix("scoreModel/blosum62.scm");
PAM250 = loadScoreMatrix("scoreModel/pam250.scm");
- registerScoreModel(new PIDModel());
DNA = loadScoreMatrix("scoreModel/dna.scm");
+ registerScoreModel(new PIDModel());
registerScoreModel(new FeatureDistanceModel());
}
@@ -69,14 +98,15 @@ public class ScoreModels
/*
* delegate parsing to ScoreMatrixFile
*/
- FileParse fp = new FileParse(resourcePath, DataSourceType.CLASSLOADER);
+ FileParse fp = new FileParse(resourcePath,
+ DataSourceType.CLASSLOADER);
ScoreMatrix sm = new ScoreMatrixFile(fp).parseMatrix();
registerScoreModel(sm);
return sm;
} catch (IOException e)
{
- System.err.println("Error reading " + resourcePath + ": "
- + e.getMessage());
+ System.err.println(
+ "Error reading " + resourcePath + ": " + e.getMessage());
}
return null;
}
@@ -105,20 +135,7 @@ public class ScoreModels
public ScoreModelI getScoreModel(String name, AlignmentViewPanel avp)
{
ScoreModelI model = models.get(name);
- if (model instanceof ViewBasedAnalysisI)
- {
- try
- {
- model = model.getClass().newInstance();
- ((ViewBasedAnalysisI) model).configureFromAlignmentView(avp);
- } catch (IllegalAccessException | InstantiationException e)
- {
- System.err.println("Error creating score model " + name + ": "
- + e.getMessage());
- return null;
- }
- }
- return model;
+ return model == null ? null : model.getInstance(avp);
}
public void registerScoreModel(ScoreModelI sm)
@@ -132,6 +149,14 @@ public class ScoreModels
}
/**
+ * Resets to just the built-in score models
+ */
+ public void reset()
+ {
+ instance = new ScoreModels();
+ }
+
+ /**
* Returns the default peptide or nucleotide score model, currently BLOSUM62
* or DNA
*