Author: Emmanuel Bourg <ebourg@apache.org>
        Andreas Tille <tille@debian.org>
Last-Update: Sat, 07 Mar 2015 10:44:34 +0100
Description: Try to get rid of remainings requiring non-free hep aida code
 See https://lists.debian.org/debian-med/2015/02/msg00174.html
 .
 This patch does the second part of this mail commenting the toString() and 
 viewSorted() methods from
    src/cern/colt/matrix/DoubleMatrix1D.java
    src/cern/colt/matrix/DoubleMatrix2D.java
    src/cern/colt/matrix/DoubleMatrix3D.java
 .
 FIXME: I have no idea how to deal with
    src/cern/colt/matrix/linalg/Property.java

--- a/src/cern/colt/matrix/DoubleMatrix1D.java
+++ b/src/cern/colt/matrix/DoubleMatrix1D.java
@@ -543,9 +543,11 @@ public void toArray(double[] values) {
  * Returns a string representation using default formatting.
  * @see cern.colt.matrix.doublealgo.Formatter
  */
+/* freehep-jaida
 public String toString() {
 	return new cern.colt.matrix.doublealgo.Formatter().toString(this);
 }
+*/
 /**
  * Constructs and returns a new view equal to the receiver.
  * The view is a shallow clone. Calls <code>clone()</code> and casts the result.
@@ -673,9 +675,11 @@ For further information, see {@link cern
 For more advanced sorting functionality, see {@link cern.colt.matrix.doublealgo.Sorting}.
 @return a new sorted vector (matrix) view.
 */
+/* freehep-jaida
 public DoubleMatrix1D viewSorted() {
 	return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this);
 }
+*/
 /**
 Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell.
 More specifically, the view has size <tt>this.size()/stride</tt> holding cells <tt>this.get(i*stride)</tt> for all <tt>i = 0..size()/stride - 1</tt>.
--- a/src/cern/colt/matrix/DoubleMatrix2D.java
+++ b/src/cern/colt/matrix/DoubleMatrix2D.java
@@ -489,9 +489,11 @@ public double[][] toArray() {
  * Returns a string representation using default formatting.
  * @see cern.colt.matrix.doublealgo.Formatter
  */
+/* freehep-jaida
 public String toString() {
 	return new cern.colt.matrix.doublealgo.Formatter().toString(this);
 }
+*/
 /**
  * Constructs and returns a new view equal to the receiver.
  * The view is a shallow clone. Calls <code>clone()</code> and casts the result.
@@ -784,9 +786,11 @@ For more advanced sorting functionality,
 @return a new sorted vector (matrix) view.
 @throws IndexOutOfBoundsException if <tt>column < 0 || column >= columns()</tt>.
 */
+/* freehep-jaida
 public DoubleMatrix2D viewSorted(int column) {
 	return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this,column);
 }
+*/
 /**
 Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell.
 More specifically, the view has <tt>this.rows()/rowStride</tt> rows and <tt>this.columns()/columnStride</tt> columns holding cells <tt>this.get(i*rowStride,j*columnStride)</tt> for all <tt>i = 0..rows()/rowStride - 1, j = 0..columns()/columnStride - 1</tt>.
--- a/src/cern/colt/matrix/DoubleMatrix3D.java
+++ b/src/cern/colt/matrix/DoubleMatrix3D.java
@@ -483,9 +483,11 @@ public double[][][] toArray() {
  * Returns a string representation using default formatting.
  * @see cern.colt.matrix.doublealgo.Formatter
  */
+/* freehep-jaida
 public String toString() {
 	return new cern.colt.matrix.doublealgo.Formatter().toString(this);
 }
+*/
 /**
  * Constructs and returns a new view equal to the receiver.
  * The view is a shallow clone. Calls <code>clone()</code> and casts the result.
@@ -749,9 +751,11 @@ For more advanced sorting functionality,
 @return a new sorted vector (matrix) view.
 @throws IndexOutOfBoundsException if <tt>row < 0 || row >= rows() || column < 0 || column >= columns()</tt>.
 */
+/* freehep-jaida
 public DoubleMatrix3D viewSorted(int row, int column) {
 	return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this,row,column);
 }
+*/
 /**
 Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell.
 More specifically, the view has <tt>this.slices()/sliceStride</tt> slices and <tt>this.rows()/rowStride</tt> rows and <tt>this.columns()/columnStride</tt> columns 
--- a/src/cern/colt/matrix/linalg/Property.java
+++ b/src/cern/colt/matrix/linalg/Property.java
@@ -214,7 +214,7 @@ protected static String blanks(int lengt
  */
 public void checkRectangular(DoubleMatrix2D A) {
 	if (A.rows() < A.columns()) {
-		throw new IllegalArgumentException("Matrix must be rectangular: "+cern.colt.matrix.doublealgo.Formatter.shape(A));
+		throw new IllegalArgumentException("Matrix must be rectangular: "+this/*cern.colt.matrix.doublealgo.Formatter.shape(A)*/);
 	}
 }
 /**
@@ -222,7 +222,7 @@ public void checkRectangular(DoubleMatri
  * @throws IllegalArgumentException if <tt>A.rows() != A.columns()</tt>.
  */
 public void checkSquare(DoubleMatrix2D A) {
-	if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+cern.colt.matrix.doublealgo.Formatter.shape(A));
+	if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+this/*cern.colt.matrix.doublealgo.Formatter.shape(A)*/);
 }
 /**
  * Returns the matrix's fraction of non-zero cells; <tt>A.cardinality() / A.size()</tt>.