Changeset 1215 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core

Timestamp:

02/11/09 13:39:30 (15 years ago)

Author:

gkronber

Message:

removed property VariableNames and added Get- and SetVariableName(index) methods instead. #419 (Refactor CEDMA plugins)

Location:

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core

Files:

• Problem.cs (modified) (3 diffs)
• ProblemView.cs (modified) (2 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/Problem.cs

@@ -52 +52 @@
     public HeuristicLab.DataAnalysis.Dataset DataSet {
       get { return dataset; }
-    }
-
-    public string[] VariableNames {
-      get { return DataSet.VariableNames; }
     }
 
@@ -123 +119 @@
     }
 
+
+    public string GetVariableName(int index) {
+      return dataset.GetVariableName(index);
+    }
+
     public override IView CreateView() {
       return new ProblemView(this);
@@ -177 +178 @@
       AutoRegressive = bool.Parse(node.Attributes["AutoRegressive"].Value);
       allowedTargetVariables.Clear();
-      foreach (string tok in node.SelectSingleNode("AllowedTargetVariables").InnerText.Split(new string[]{";"}, StringSplitOptions.RemoveEmptyEntries))
+      foreach (string tok in node.SelectSingleNode("AllowedTargetVariables").InnerText.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries))
         allowedTargetVariables.Add(int.Parse(tok));
       allowedInputVariables.Clear();

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ProblemView.cs

@@ -64 +64 @@
       inputsListBox.Items.Clear();
       for (int i = 0; i < problem.DataSet.Columns; i++) {
-        targetsListBox.Items.Add(problem.DataSet.VariableNames[i], problem.AllowedTargetVariables.Contains(i));
-        inputsListBox.Items.Add(problem.DataSet.VariableNames[i], problem.AllowedInputVariables.Contains(i));
+        targetsListBox.Items.Add(problem.DataSet.GetVariableName(i), problem.AllowedTargetVariables.Contains(i));
+        inputsListBox.Items.Add(problem.DataSet.GetVariableName(i), problem.AllowedInputVariables.Contains(i));
       }
     }
@@ -94 +94 @@
           dataset.Rows = parser.Rows;
           dataset.Columns = parser.Columns;
-          dataset.VariableNames = parser.VariableNames;
+          for (int i = 0; i < parser.VariableNames.Length; i++) {
+            dataset.SetVariableName(i, parser.VariableNames[i]);
+          }
           dataset.Name = parser.ProblemName;
           dataset.Samples = new double[dataset.Rows * dataset.Columns];