X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fmath%2FMatrix.java;h=bb7ed37abb89353c55ca4b49f998691bc6a3b070;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=87b0ef3ca31de93a49ebc86a339ad90a9f9a0d95;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/math/Matrix.java b/src/jalview/math/Matrix.java index 87b0ef3..bb7ed37 100755 --- a/src/jalview/math/Matrix.java +++ b/src/jalview/math/Matrix.java @@ -1,26 +1,29 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * 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. + * 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.math; -import java.io.*; +import jalview.util.Format; +import jalview.util.MessageManager; -import jalview.util.*; +import java.io.PrintStream; /** * DOCUMENT ME! @@ -48,7 +51,7 @@ public class Matrix public double[] e; // off diagonal /** - * maximum number of iterations for tqli + * maximum number of iterations for tqli * */ int maxIter = 45; // fudge - add 15 iterations, just in case @@ -348,7 +351,7 @@ public class Matrix } } } - + /** * DOCUMENT ME! */ @@ -401,7 +404,9 @@ public class Matrix if (iter == maxIter) { - throw new Exception("Too many iterations in tqli ("+maxIter+")"); + throw new Exception(MessageManager.formatMessage( + "exception.matrix_too_many_iteration", new String[] { + "tqli", Integer.valueOf(maxIter).toString() })); } else { @@ -650,7 +655,9 @@ public class Matrix if (iter == maxIter) { - throw new Exception ("Too many iterations in tqli2 (max is "+maxIter+")"); + throw new Exception(MessageManager.formatMessage( + "exception.matrix_too_many_iteration", new String[] { + "tqli2", Integer.valueOf(maxIter).toString() })); } else {