X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fmath%2FMatrix.java;h=036d16a6819c6416dd33f2fad3483c204f0a0622;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=057bdbf850f51cb3c15184638ae7cdfdb30c7c09;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/math/Matrix.java b/src/jalview/math/Matrix.java
index 057bdbf..036d16a 100755
--- a/src/jalview/math/Matrix.java
+++ b/src/jalview/math/Matrix.java
@@ -1,19 +1,21 @@
/*
- * 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.math;
@@ -48,6 +50,12 @@ public class Matrix
public double[] e; // off diagonal
/**
+ * maximum number of iterations for tqli
+ *
+ */
+ int maxIter = 45; // fudge - add 15 iterations, just in case
+
+ /**
* Creates a new Matrix object.
*
* @param value
@@ -346,7 +354,7 @@ public class Matrix
/**
* DOCUMENT ME!
*/
- public void tqli()
+ public void tqli() throws Exception
{
int n = rows;
@@ -393,10 +401,10 @@ public class Matrix
{
iter++;
- if (iter == 30)
+ if (iter == maxIter)
{
- System.err.print("Too many iterations in tqli");
- System.exit(0); // JBPNote - should this really be here ???
+ throw new Exception("Too many iterations in tqli (" + maxIter
+ + ")");
}
else
{
@@ -596,7 +604,7 @@ public class Matrix
/**
* DOCUMENT ME!
*/
- public void tqli2()
+ public void tqli2() throws Exception
{
int n = rows;
@@ -643,10 +651,10 @@ public class Matrix
{
iter++;
- if (iter == 30)
+ if (iter == maxIter)
{
- System.err.print("Too many iterations in tqli");
- System.exit(0); // JBPNote - same as above - not a graceful exit!
+ throw new Exception("Too many iterations in tqli2 (max is "
+ + maxIter + ")");
}
else
{
@@ -780,7 +788,7 @@ public class Matrix
* @param args
* DOCUMENT ME!
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws Exception
{
int n = Integer.parseInt(args[0]);
double[][] in = new double[n][n];