Changeset 1215

Timestamp:

02/11/09 13:39:30 (16 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

Files:

• HeuristicLab.CEDMA.Core/Problem.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/ProblemView.cs (modified) (2 diffs)
• HeuristicLab.DataAnalysis/Dataset.cs (modified) (5 diffs)
• HeuristicLab.DataAnalysis/DatasetView.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/StructIdProblemInjectorView.cs (modified) (7 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];

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/Dataset.cs

@@ -52 +52 @@
     public int Columns {
       get { return columns; }
-      set { columns = value; }
+      set { 
+        columns = value;
+        if (variableNames == null || variableNames.Length != columns) {
+          variableNames = new string[columns];
+        }
+      }
     }
 
@@ -90 +95 @@
 
     private string[] variableNames;
-    public string[] VariableNames {
-      get { return variableNames; }
-      set { variableNames = value; }
-    }
 
     public Dataset() {
       Name = "-";
-      VariableNames = new string[] { "Var0" };
+      variableNames = new string[] { "Var0" };
       Columns = 1;
       Rows = 1;
@@ -114 +115 @@
       }
     }
+
+    public string GetVariableName(int variableIndex) {
+      return variableNames[variableIndex];
+    }
+
+    public void SetVariableName(int variableIndex, string name) {
+      variableNames[variableIndex] = name;
+    }
+
 
     public override IView CreateView() {
@@ -128 +138 @@
       clone.Samples = cloneSamples;
       clone.Name = Name;
-      clone.VariableNames = new string[VariableNames.Length];
-      Array.Copy(VariableNames, clone.VariableNames, VariableNames.Length);
+      clone.variableNames = new string[variableNames.Length];
+      Array.Copy(variableNames, clone.variableNames, variableNames.Length);
       Array.Copy(scalingFactor, clone.scalingFactor, columns);
       Array.Copy(scalingOffset, clone.scalingOffset, columns);
@@ -165 +175 @@
       columns = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
 
-      VariableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);
+      variableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);
       if(node.Attributes["ScalingFactors"] != null)
         scalingFactor = ParseDoubleString(node.Attributes["ScalingFactors"].Value);

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.DataAnalysis/DatasetView.cs

@@ -135 +135 @@
 
     private string GetColumnName(int index) {
-      if(Dataset.VariableNames.Length == dataGridView.Columns.Count) {
-        return Dataset.VariableNames[index];
+      if(Dataset.Columns == dataGridView.Columns.Count) {
+        return Dataset.GetVariableName(index);
       } else {
         return "Var " + index;

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StructIdProblemInjectorView.cs

@@ -63 +63 @@
     protected override void UpdateControls() {
       base.UpdateControls();
-      if(StructIdProblemInjector == null) {
+      if (StructIdProblemInjector == null) {
         importInstanceButton.Enabled = false;
       } else {
@@ -73 +73 @@
 
     private void importInstanceButton_Click(object sender, EventArgs e) {
-      if(openFileDialog.ShowDialog(this) == DialogResult.OK) {
+      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
         DatasetParser parser = new DatasetParser();
         bool success = false;
@@ -80 +80 @@
             parser.Import(openFileDialog.FileName, true);
             success = true;
-          } catch(DataFormatException ex) {
+          }
+          catch (DataFormatException ex) {
             ShowWarningMessageBox(ex);
             // not possible to parse strictly => clear and try to parse non-strict
@@ -87 +88 @@
             success = true;
           }
-        } catch(DataFormatException ex) {
+        }
+        catch (DataFormatException ex) {
           // if the non-strict parsing also failed then show the exception
           ShowErrorMessageBox(ex);
         }
-        if(success) {
+        if (success) {
           Dataset dataset = (Dataset)StructIdProblemInjector.GetVariable("Dataset").Value;
           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];
@@ -109 +113 @@
 
           IVariable var = StructIdProblemInjector.GetVariable("AllowedFeatures");
-          if(var != null) {
+          if (var != null) {
             ItemList<IntData> allowedFeatures = (ItemList<IntData>)var.Value;
             allowedFeatures.Clear();
             List<int> nonInputVariables = parser.NonInputVariables;
-            for(int i = 0; i < dataset.Columns; i++) {
-              if(!nonInputVariables.Contains(i)) allowedFeatures.Add(new IntData(i));
+            for (int i = 0; i < dataset.Columns; i++) {
+              if (!nonInputVariables.Contains(i)) allowedFeatures.Add(new IntData(i));
             }
           }
@@ -124 +128 @@
     private void TrySetVariable(string name, int value) {
       IVariable var = StructIdProblemInjector.GetVariable(name);
-      if(var != null) {
+      if (var != null) {
         ((IntData)var.Value).Data = value;
       }
@@ -145 +149 @@
       sb.Append("Sorry, but something went wrong!\n\n" + ex.Message + "\n\n" + ex.StackTrace);
 
-      while(ex.InnerException != null) {
+      while (ex.InnerException != null) {
         ex = ex.InnerException;
         sb.Append("\n\n-----\n\n" + ex.Message + "\n\n" + ex.StackTrace);