Changeset 1215 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification

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)

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StructIdProblemInjectorView.cs (modified) (7 diffs)

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);