Changeset 8424

Timestamp:

08/07/12 12:13:04 (12 years ago)

Author:

abeham

Message:

#1913: corrected tests and fixed bugs

Location:

branches/NCA

Files:

• HeuristicLab.Algorithms.NCA.Tests/MatrixTest.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.NCA/3.3/Matrix.cs (modified) (3 diffs)

branches/NCA/HeuristicLab.Algorithms.NCA.Tests/MatrixTest.cs

@@ -60 +60 @@
     private bool IsEqual(Matrix_Accessor a, Matrix_Accessor b) {
       var i1 = a.GetEnumerator();
-      var i2 = a.GetEnumerator();
+      var i2 = b.GetEnumerator();
       bool f, g;
       do {
@@ -223 +223 @@
       result = new double[,] { { 3, 5 }, { 4, 6 } };
       Assert.IsTrue(IsEqual(new Matrix_Accessor(mat1).Transpose(), new Matrix_Accessor(result)));
+      var enumMat = new double[] { 3, 4, 5, 6 };
+      Assert.IsTrue(IsEqual(new Matrix_Accessor(enumMat, 2, 2).Transpose(), new Matrix_Accessor(result)));
+      mat1 = new double[,] { { 3, 4 }, { 5, 6 }, { 7, 8 }, { 9, 10 }, { 11, 12 } };
+      result = new double[,] { { 3, 5, 7, 9, 11 }, { 4, 6, 8, 10, 12 } };
+      Assert.IsTrue(IsEqual(new Matrix_Accessor(mat1).Transpose(), new Matrix_Accessor(result)));
     }
   }

branches/NCA/HeuristicLab.Algorithms.NCA/3.3/Matrix.cs

@@ -32 +32 @@
 
     private IEnumerable<double> values;
-    private bool isTransposed;
-    private int rows, columns;
-    public int Rows {
-      get {
-        if (!isTransposed) return rows;
-        else return columns;
-      }
-      private set {
-        if (!isTransposed) rows = value;
-        else columns = value;
-      }
-    }
-    public int Columns {
-      get {
-        if (!isTransposed) return columns;
-        else return rows;
-      }
-      private set {
-        if (!isTransposed) columns = value;
-        else rows = value;
-      }
-    }
+    public int Rows { get; private set; }
+    public int Columns { get; private set; }
 
     protected Matrix(Matrix original, Cloner cloner) {
       this.values = original.values.ToArray();
-      this.isTransposed = original.isTransposed;
-      this.rows = original.rows;
-      this.columns = original.columns;
+      this.Rows = original.Rows;
+      this.Columns = original.Columns;
       cloner.RegisterClonedObject(original, this);
     }
@@ -91 +70 @@
 
     public Matrix Transpose() {
-      var result = new Matrix(values, Rows, Columns);
-      result.isTransposed = true;
+      var result = new Matrix(Transpose(values, Columns, Rows), Columns, Rows);
       return result;
+    }
+
+    private IEnumerable<double> Transpose(IEnumerable<double> values, int rows, int columns) {
+      // vectors don't need to be transposed
+      if (rows == 1 || columns == 1) {
+        foreach (var v in values) yield return v;
+        yield break;
+      }
+
+      int skip = 0;
+      var iter = values.GetEnumerator();
+      if (!iter.MoveNext()) yield break;
+      while (skip < rows) {
+        for (int i = 0; i < skip; i++) iter.MoveNext();
+        yield return iter.Current;
+        for (int j = 0; j < columns - 1; j++) {
+          for (int i = 0; i < rows; i++) iter.MoveNext();
+          yield return iter.Current;
+        }
+        skip++;
+        if (skip < rows) {
+          iter = values.GetEnumerator();
+          iter.MoveNext();
+        }
+      }
     }
 
@@ -197 +200 @@
 
     private IEnumerable<double> GetOnlineValues(double[,] matrix) {
-      if (!isTransposed) {
-        for (int i = 0; i < matrix.GetLength(0); i++)
-          for (int j = 0; j < matrix.GetLength(1); j++) {
-            yield return matrix[i, j];
-          }
-      } else {
-        for (int j = 0; j < matrix.GetLength(1); j++)
-          for (int i = 0; i < matrix.GetLength(0); i++) {
-            yield return matrix[i, j];
-          }
-      }
+      for (int i = 0; i < matrix.GetLength(0); i++)
+        for (int j = 0; j < matrix.GetLength(1); j++) {
+          yield return matrix[i, j];
+        }
     }
   }