From f32b50d8656d3fc400137e87e8ebad199ded47a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Dr=C3=A4ger?= <andreas.draeger@uni-tuebingen.de>
Date: Tue, 29 Nov 2011 07:09:44 +0000
Subject: [PATCH] Minor changes.

---
 src/eva2/tools/math/Jama/Matrix.java | 31 +++++++++++++++++++---------
 src/eva2/tools/math/Mathematics.java |  1 -
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/eva2/tools/math/Jama/Matrix.java b/src/eva2/tools/math/Jama/Matrix.java
index 953ae7a1..fb6e7ad7 100644
--- a/src/eva2/tools/math/Jama/Matrix.java
+++ b/src/eva2/tools/math/Jama/Matrix.java
@@ -3,12 +3,14 @@ package eva2.tools.math.Jama;
 
 import java.io.BufferedReader;
 import java.io.PrintWriter;
+import java.io.Serializable;
 import java.io.StreamTokenizer;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Vector;
 
 import eva2.gui.BeanInspector;
 import eva2.tools.Pair;
@@ -59,13 +61,18 @@ import eva2.tools.math.Jama.util.Maths;
 @version 5 August 1998
 */
 
-public class Matrix implements Cloneable, java.io.Serializable {
+public class Matrix implements Cloneable, Serializable {
 
-/* ------------------------
-   Class variables
- * ------------------------ */
+  /**
+   * Generated serial version identifier. 
+   */
+  private static final long serialVersionUID = 3672826349694248499L;
 
-   /** Array for internal storage of elements.
+  /* ------------------------
+     Class variables
+   * ------------------------ */
+  
+  /** Array for internal storage of elements.
    @serial internal array storage.
    */
    private double[][] A;
@@ -114,13 +121,18 @@ public class Matrix implements Cloneable, java.io.Serializable {
    @see        #constructWithCopy
    */
 
-   public Matrix (double[][] A) {
+   public Matrix(double[][] A) {
       this(A, true);
    }
 
-   public Matrix (double[][] A, boolean checkDims) {
+   /**
+    * 
+    * @param A
+    * @param checkDims
+    */
+   public Matrix(double[][] A, boolean checkDims) {
 	   m = A.length;
-	   n = A[0].length;
+	   n = m == 0 ? 0 : A[0].length;
 	   if (checkDims) {
 		   for (int i = 0; i < m; i++) {
 			   if (A[i].length != n) {
@@ -355,7 +367,6 @@ public class Matrix implements Cloneable, java.io.Serializable {
    @return     A(i0:i1,j0:j1)
    @exception  ArrayIndexOutOfBoundsException Submatrix indices
    */
-
    public Matrix getMatrix (int i0, int i1, int j0, int j1) {
       Matrix X = new Matrix(i1-i0+1,j1-j0+1);
       double[][] B = X.getArray();
@@ -1202,7 +1213,7 @@ public class Matrix implements Cloneable, java.io.Serializable {
       tokenizer.wordChars(0,255);
       tokenizer.whitespaceChars(0, ' ');
       tokenizer.eolIsSignificant(true);
-      java.util.Vector v = new java.util.Vector();
+      Vector<Object> v = new Vector<Object>();
 
       // Ignore initial empty lines
       while (tokenizer.nextToken() == StreamTokenizer.TT_EOL);
diff --git a/src/eva2/tools/math/Mathematics.java b/src/eva2/tools/math/Mathematics.java
index 195ee617..9a5038c8 100644
--- a/src/eva2/tools/math/Mathematics.java
+++ b/src/eva2/tools/math/Mathematics.java
@@ -1,6 +1,5 @@
 package eva2.tools.math;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;