Changeset 2325 for trunk/sources/HeuristicLab.CEDMA.Core/3.3

Timestamp:

09/02/09 12:03:13 (15 years ago)

Author:

mkommend

Message:

changed SparseMatrix.Matrix and MatrixRow to a generic type (ticket #701)

File:

• trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs

@@ -56 +56 @@
     }
 
-    private Matrix matrix;
-    public Matrix Matrix {
+    private Matrix<string,object> matrix;
+    public Matrix<string,object> Matrix {
       get {
         if (matrix == null) LoadResults();
@@ -82 +82 @@
 
     private void LoadResults() {
-      matrix = new Matrix();
+      matrix = new Matrix<string,object>();
       DatabaseService db = new DatabaseService(sqlServerCompactConnectionString + database);
       db.Connect();
 
       foreach (var model in db.GetAllModels()) {
-        MatrixRow row = new MatrixRow();
+        MatrixRow<string, object> row = new MatrixRow<string, object>();
         foreach (var modelResult in db.GetModelResults(model)) {
           row.Set(modelResult.Result.Name, modelResult.Value);
         }
-        Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow> inputVariableResultsEntries =
-          new Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow>();
+        Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow<string, object>> inputVariableResultsEntries =
+          new Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow<string, object>>();
         foreach (IInputVariableResult inputVariableResult in db.GetInputVariableResults(model)) {
           if (!inputVariableResultsEntries.ContainsKey(inputVariableResult.Variable)) {
-            inputVariableResultsEntries[inputVariableResult.Variable] = new MatrixRow();
+            inputVariableResultsEntries[inputVariableResult.Variable] = new MatrixRow<string, object>();
             inputVariableResultsEntries[inputVariableResult.Variable].Set("InputVariableName", inputVariableResult.Variable.Name);
           }