Changeset 3373 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3

Timestamp:

04/16/10 15:22:57 (14 years ago)

Author:

gkronber

Message:

Refactored HeuristicLab.Problems.DataAnalysis namespace. #938 (Data types and operators for regression problems)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views

Files:

• . (added)
• 3.3 (added)
• 3.3/DataAnalysisProblemDataView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblemDataView.Designer.cs) (1 diff)
• 3.3/DataAnalysisProblemDataView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblemDataView.cs) (2 diffs)
• 3.3/DataAnalysisProblemView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblemView.Designer.cs) (2 diffs)
• 3.3/DataAnalysisProblemView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/RegressionProblemView.cs) (2 diffs)
• 3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (added)
• 3.3/HeuristicLab.snk (added)
• 3.3/HeuristicLabProblemsDataAnalysisViewsPlugin.cs (added)
• 3.3/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame (added)
• 3.3/Properties (added)
• 3.3/Properties/AssemblyInfo.frame (added)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.DataAnalysis.Regression {
-  partial class RegressionProblemDataView {
+namespace HeuristicLab.Problems.DataAnalysis {
+  partial class DataAnalysisProblemDataView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs

@@ -26 +26 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Problems.DataAnalysis.Regression {
-  [View("Regression Problem Data View")]
-  [Content(typeof(RegressionProblemData), true)]
-  public partial class RegressionProblemDataView : NamedItemView {
+namespace HeuristicLab.Problems.DataAnalysis {
+  [View("Data-Analysis Data View")]
+  [Content(typeof(DataAnalysisProblemData), true)]
+  public partial class DataAnalysisProblemDataView : NamedItemView {
     private OpenFileDialog openFileDialog;
 
-    public new RegressionProblemData Content {
-      get { return (RegressionProblemData)base.Content; }
+    public new DataAnalysisProblemData Content {
+      get { return (DataAnalysisProblemData)base.Content; }
       set { base.Content = value; }
     }
 
-    public RegressionProblemDataView() {
+    public DataAnalysisProblemDataView() {
       InitializeComponent();
     }
 
-    public RegressionProblemDataView(RegressionProblemData content)
+    public DataAnalysisProblemDataView(DataAnalysisProblemData content)
       : this() {
       Content = content;
@@ -67 +67 @@
         importButton.Enabled = false;
       } else {
-        //parameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
-        //parameterCollectionView.Enabled = true;
         importButton.Enabled = true;
         this.datasetView.Content = this.Content.Dataset;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.DataAnalysis.Regression {
-  partial class RegressionProblemView {
+namespace HeuristicLab.Problems.DataAnalysis {
+  partial class DataAnalysisProblemView {
     /// <summary> 
     /// Required designer variable.
@@ -33 +33 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        if (openFileDialog != null) openFileDialog.Dispose();
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemView.cs

@@ -26 +26 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Problems.DataAnalysis.Regression {
-  [View("Regression Problem View")]
-  [Content(typeof(RegressionProblem), true)]
-  public partial class RegressionProblemView : NamedItemView {
-    private OpenFileDialog openFileDialog;
-
-    public new RegressionProblem Content {
-      get { return (RegressionProblem)base.Content; }
+namespace HeuristicLab.Problems.DataAnalysis {
+  [View("Data-Analysis Problem View")]
+  [Content(typeof(DataAnalysisProblem), true)]
+  public partial class DataAnalysisProblemView : NamedItemView {
+    public new DataAnalysisProblem Content {
+      get { return (DataAnalysisProblem)base.Content; }
       set { base.Content = value; }
     }
 
-    public RegressionProblemView() {
+    public DataAnalysisProblemView() {
       InitializeComponent();
     }
 
-    public RegressionProblemView(RegressionProblem content)
+    public DataAnalysisProblemView(DataAnalysisProblem content)
       : this() {
       Content = content;
@@ -58 +56 @@
       }
     }
-
-    private void importButton_Click(object sender, System.EventArgs e) {
-      if (openFileDialog == null) openFileDialog = new OpenFileDialog();
-
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          Content.ImportFromFile(openFileDialog.FileName);
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-      }
-    }
   }
 }