X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;fp=test%2Fjalview%2Fschemes%2FScoreMatrixPrinter.java;h=2830918ae3947805de369d817e553ef08e2d86af;hb=27b77d2219147d3741d4af7377e13918a8ae972a;hp=a472951e33053abaa4c5665ad6156c767e48b092;hpb=949ead42100232b0a3654a19ed9f4d93b5e807c6;p=jalview.git diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java index a472951..2830918 100644 --- a/test/jalview/schemes/ScoreMatrixPrinter.java +++ b/test/jalview/schemes/ScoreMatrixPrinter.java @@ -18,6 +18,8 @@ */ package jalview.schemes; +import jalview.api.analysis.ScoreModelI; + import java.util.Map; import org.junit.Test; @@ -28,7 +30,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 +39,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)); + } } }