Changeset 17690 for branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3

Timestamp:

07/21/20 17:06:15 (4 years ago)

Author:

abeham

Message:

#2521: worked on multi-objective test function

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3

Files:

• DoubleMatrix.cs (modified) (1 diff)
• ValueTypeMatrix.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3/DoubleMatrix.cs

@@ -42 +42 @@
     public DoubleMatrix(double[,] elements, IEnumerable<string> columnNames, bool @readonly = false) : base(elements, columnNames, @readonly) { }
     public DoubleMatrix(double[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames, bool @readonly = false) : base(elements, columnNames, rowNames, @readonly) { }
+    
+    public static DoubleMatrix FromRows(IList<double[]> elements, bool @readonly = false, IEnumerable<string> columnNames = null, IEnumerable<string> rowNames = null) {
+      if (elements.Count == 0) return new DoubleMatrix(0, 0);
+      var mat = new double[elements.Count, elements[0].Length];
+      for (var r = 0; r < mat.GetLength(0); r++)
+        for (var c = 0; c < mat.GetLength(1); c++)
+          mat[r, c] = elements[r][c];
+      // TODO: We should avoid the memory copy in this case
+      return new DoubleMatrix(mat, columnNames, rowNames, @readonly);
+    }
+    public static DoubleMatrix FromColumns(IList<double[]> elements, bool @readonly = false, IEnumerable<string> columnNames = null, IEnumerable<string> rowNames = null) {
+      if (elements.Count == 0) return new DoubleMatrix(0, 0);
+      var mat = new double[elements[0].Length, elements.Count];
+      for (var c = 0; c < mat.GetLength(1); c++)
+        for (var r = 0; r < mat.GetLength(0); r++)
+          mat[r, c] = elements[c][r];
+      // TODO: We should avoid the memory copy in this case
+      return new DoubleMatrix(mat, columnNames, rowNames, @readonly);
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3/ValueTypeMatrix.cs

@@ -202 +202 @@
     }
 
+    public IEnumerable<T[]> CloneByRows() {
+      for (var r = 0; r < matrix.GetLength(0); r++)
+        yield return GetRow(r).ToArray();
+    }
+
+    public IEnumerable<T[]> CloneByColumn() {
+      for (var c = 0; c < matrix.GetLength(1); c++)
+        yield return GetColumn(c).ToArray();
+    }
+
     public virtual IEnumerable<T> GetRow(int row) {
       for (var col = 0; col < Columns; col++) {