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

Timestamp:

09/11/19 21:35:59 (5 years ago)

Author:

abeham

Message:

#2521: working on TSP refactoring

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Data/3.3

Files:

• DoubleMatrix.cs (modified) (2 diffs)
• ValueTypeMatrix.cs (modified) (3 diffs)

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Text;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Data {
@@ -39 +39 @@
     public DoubleMatrix(int rows, int columns, IEnumerable<string> columnNames) : base(rows, columns, columnNames) { }
     public DoubleMatrix(int rows, int columns, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(rows, columns, columnNames, rowNames) { }
-    public DoubleMatrix(double[,] elements) : base(elements) { }
-    public DoubleMatrix(double[,] elements, IEnumerable<string> columnNames) : base(elements, columnNames) { }
-    public DoubleMatrix(double[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames) : base(elements, columnNames, rowNames) { }
+    public DoubleMatrix(double[,] elements, bool @readonly = false) : base(elements, @readonly) { }
+    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 override IDeepCloneable Clone(Cloner cloner) {

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

@@ -26 +26 @@
 using System.Linq;
 using System.Text;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Data {
@@ -172 +172 @@
       RowNames = rowNames;
     }
-    protected ValueTypeMatrix(T[,] elements) {
+    protected ValueTypeMatrix(T[,] elements, bool @readonly = false) {
       if (elements == null) throw new ArgumentNullException();
       matrix = (T[,])elements.Clone();
@@ -178 +178 @@
       rowNames = new List<string>();
       sortableView = false;
-      readOnly = false;
-    }
-    protected ValueTypeMatrix(T[,] elements, IEnumerable<string> columnNames)
-      : this(elements) {
+      readOnly = @readonly;
+    }
+    protected ValueTypeMatrix(T[,] elements, IEnumerable<string> columnNames, bool @readonly = false)
+      : this(elements, @readonly) {
       ColumnNames = columnNames;
     }
-    protected ValueTypeMatrix(T[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames)
-      : this(elements, columnNames) {
+    protected ValueTypeMatrix(T[,] elements, IEnumerable<string> columnNames, IEnumerable<string> rowNames, bool @readonly = false)
+      : this(elements, columnNames, @readonly) {
       RowNames = rowNames;
     }