X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2Fscoremodels%2FScoreModelsTest.java;h=4e8575dfe258a7d8a76263c163157421ba8ab36e;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=ffcd1a8cfa327b90ecce505169351a30cd1f17bf;hpb=aba253e57b22ce7d1f4fe376935e42aeb4f6d591;p=jalview.git diff --git a/test/jalview/analysis/scoremodels/ScoreModelsTest.java b/test/jalview/analysis/scoremodels/ScoreModelsTest.java index ffcd1a8..4e8575d 100644 --- a/test/jalview/analysis/scoremodels/ScoreModelsTest.java +++ b/test/jalview/analysis/scoremodels/ScoreModelsTest.java @@ -32,29 +32,31 @@ public class ScoreModelsTest assertTrue(sm instanceof PairwiseScoreModelI); assertFalse(sm instanceof DistanceScoreModel); assertEquals(sm.getName(), "BLOSUM62"); - assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('I', 'R'), -3f); + assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('I', 'R'), + -3f); sm = models.next(); assertTrue(sm instanceof SimilarityScoreModel); assertTrue(sm instanceof PairwiseScoreModelI); assertFalse(sm instanceof DistanceScoreModel); assertEquals(sm.getName(), "PAM250"); - assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), -4f); + assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), + -4f); sm = models.next(); assertTrue(sm instanceof SimilarityScoreModel); assertTrue(sm instanceof PairwiseScoreModelI); assertFalse(sm instanceof DistanceScoreModel); - assertEquals(sm.getName(), "PID"); - assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f); - assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f); + assertEquals(sm.getName(), "DNA"); + assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f); sm = models.next(); assertTrue(sm instanceof SimilarityScoreModel); assertTrue(sm instanceof PairwiseScoreModelI); assertFalse(sm instanceof DistanceScoreModel); - assertEquals(sm.getName(), "DNA"); - assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('c', 'x'), 1f); + assertEquals(sm.getName(), "PID"); + assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'C'), 0f); + assertEquals(((PairwiseScoreModelI) sm).getPairwiseScore('R', 'r'), 1f); sm = models.next(); assertFalse(sm instanceof SimilarityScoreModel);