X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;h=d058c244b7bcd3f790868af942299ebdf62c4e0b;hb=47168f025aefdaa044802bd5f8f510ffe43a4808;hp=a472951e33053abaa4c5665ad6156c767e48b092;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index a472951..d058c24 100644
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -1,23 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 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.
+ * 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 .
+ * 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.schemes;
+import jalview.api.analysis.ScoreModelI;
+
import java.util.Map;
import org.junit.Test;
@@ -28,7 +32,7 @@ public class ScoreMatrixPrinter
@Test
public void printAllMatrices()
{
- for (Map.Entry sm:((Map) ResidueProperties.scoreMatrices).entrySet())
+ for (Map.Entry sm: ResidueProperties.scoreMatrices.entrySet())
{
System.out.println("Matrix "+sm.getKey());
System.out.println(sm.getValue().toString());
@@ -37,10 +41,14 @@ public class ScoreMatrixPrinter
@Test
public void printHTMLMatrices()
{
- for (Map.Entry sm:((Map) ResidueProperties.scoreMatrices).entrySet())
+ for (Map.Entry _sm: ResidueProperties.scoreMatrices.entrySet())
{
- System.out.println("Matrix "+sm.getKey());
- System.out.println(sm.getValue().outputMatrix(true));
+ if (_sm.getValue() instanceof ScoreMatrix)
+ {
+ ScoreMatrix sm = (ScoreMatrix) _sm.getValue();
+ System.out.println("Matrix "+_sm.getKey());
+ System.out.println(sm.outputMatrix(true));
+ }
}
}