Changeset 7338 for branches

Timestamp:

01/16/12 17:06:32 (13 years ago)

Author:

sforsten

Message:

#1758: first version to change the data set in a model has been implemented

Location:

branches/ChangeDatasetOfRegressionModel

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs (modified) (2 diffs)

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj

@@ -275 +275 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SymbolicRegressionSolutionView.resx">
+      <DependentUpon>SymbolicRegressionSolutionView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

@@ -36 +36 @@
       // 
       // 
-      // splitContainer.Panel1
+      // splitContainer.Panel2
       // 
-      this.splitContainer.Panel1.Controls.Add(this.btnSimplify);
+      this.splitContainer.Panel2.Controls.Add(this.btnSimplify);
       this.splitContainer.Size = new System.Drawing.Size(480, 275);
       this.splitContainer.SplitterDistance = 255;
@@ -68 +68 @@
       // btnSimplify
       // 
-      this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.btnSimplify.Location = new System.Drawing.Point(177, 4);
+      this.btnSimplify.Location = new System.Drawing.Point(3, 4);
       this.btnSimplify.Name = "btnSimplify";
       this.btnSimplify.Size = new System.Drawing.Size(75, 23);

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -366 +366 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Solution Views\RegressionSolutionView.resx">
+      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.btnImport = new System.Windows.Forms.Button();
+      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -55 +57 @@
       // splitContainer
       // 
+      // 
+      // splitContainer.Panel1
+      // 
+      this.splitContainer.Panel1.Controls.Add(this.btnImport);
       // 
       // itemsGroupBox
@@ -67 +73 @@
       // 
       this.toolTip.SetToolTip(this.removeButton, "Remove");
+      // 
+      // btnImport
+      // 
+      this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.btnImport.Location = new System.Drawing.Point(172, 4);
+      this.btnImport.Name = "btnImport";
+      this.btnImport.Size = new System.Drawing.Size(75, 23);
+      this.btnImport.TabIndex = 7;
+      this.btnImport.Text = "Import";
+      this.btnImport.UseVisualStyleBackColor = true;
+      this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
+      // 
+      // openFileDialog
+      // 
+      this.openFileDialog.Filter = "HL files|*.hl";
+      this.openFileDialog.Title = "Import ProblemData or Problem...";
       // 
       // RegressionSolutionView
@@ -84 +106 @@
 
     #endregion
+
+    private System.Windows.Forms.Button btnImport;
+    private System.Windows.Forms.OpenFileDialog openFileDialog;
   }
 }

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
+using HeuristicLab.Persistence.Default.Xml;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -50 +54 @@
     }
     #endregion
+
+    private void btnImport_Click(object sender, System.EventArgs e) {
+      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
+        object hlFile = null;
+        try {
+          hlFile = XmlParser.Deserialize(openFileDialog.FileName);
+        }
+        catch (Exception ex) {
+          ErrorHandling.ShowErrorDialog(this, ex);
+        }
+        IRegressionProblemData problemData = null;
+        if (hlFile != null && hlFile is RegressionProblemData) {
+          problemData = (RegressionProblemData)hlFile;
+        } else if (hlFile != null && hlFile is IRegressionProblem) {
+          problemData = ((IRegressionProblem)hlFile).ProblemData;
+        }
+        if (problemData != null) {
+          IList<string> missingVariables = new List<string>();
+          if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
+            missingVariables.Add(Content.ProblemData.TargetVariable);
+
+          //foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
+          //  if (!problemData.InputVariables.Contains(item.Value))
+          //    missingVariables.Add(item.Value.ToString());
+          //}
+
+          //easier solution will be created later
+          bool found;
+          foreach (var item in Content.ProblemData.InputVariables.CheckedItems) {
+            found = false;
+            foreach (var it in problemData.InputVariables) {
+              if (it.Value.Equals(item.Value.Value)) {
+                found = true;
+                break;
+              }
+            }
+            if (!found)
+              missingVariables.Add(item.Value.ToString());
+          }
+
+          if (missingVariables.Count != 0) {
+            string message = "";
+            foreach (var item in missingVariables) {
+              message += item + Environment.NewLine;
+            }
+            ErrorHandling.ShowErrorDialog(this, new Exception(message));
+          } else {
+            Content.ProblemData = problemData;
+          }
+        }
+      }
+    }
   }
 }