Changeset 6740 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering

Timestamp:

09/12/11 13:48:31 (13 years ago)

Author:

mkommend

Message:

#1597, #1609, #1640:

• Corrected TableFileParser to handle empty rows correctly.
• Refactored DataSet to store values in List<List> instead of a two-dimensional array.
• Enable importing and storing string and datetime values.
• Changed data access methods in dataset and adapted all concerning classes.
• Changed interpreter to store the variable values for all rows during the compilation step.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionEstimatedClusterView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionEstimatedClusterView.cs

@@ -85 +85 @@
           int[] clusters = Content.Model.GetClusterValues(Content.ProblemData.Dataset, Enumerable.Range(0, Content.ProblemData.Dataset.Rows)).ToArray();
           var dataset = Content.ProblemData.Dataset;
-          int columns = Content.ProblemData.AllowedInputVariables.Count() + 1;
-          var columnsIndixes = Content.ProblemData.AllowedInputVariables.Select(x => dataset.GetVariableIndex(x)).ToList();
+          int columns = Content.ProblemData.AllowedInputVariables.Count() + 1;          
 
           double[,] values = new double[dataset.Rows, columns];
@@ -93 +92 @@
 
             int column = 1;
-            foreach (int columnIndex in columnsIndixes) {
-              values[row, column] = dataset[row, columnIndex];
+            foreach (var columnName in Content.ProblemData.AllowedInputVariables) {
+              values[row, column] = dataset.GetDoubleValue(columnName, row);
               column++;
             }