X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModels.java;h=ebc9a26d0a0c9260f9f7b9ee16a2122aec2b886a;hb=406c75985c3585f3c6bf8d6f4778d9fb28c7bf2c;hp=ea7b30eea7798d238bcf2ad9b80616e256605fb2;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git
diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java
index ea7b30e..ebc9a26 100644
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -1,3 +1,23 @@
+/*
+ * 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;
@@ -21,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;
}
@@ -46,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());
}
@@ -119,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
*