Changeset 10786 for branches/DataPreprocessing

Timestamp:

04/23/14 15:56:31 (11 years ago)

Author:

pfleck

Message:

• Implemented PreprocessingTransformator to apply Transformations.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/CheckedTransformationCollectionView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.Designer.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationLogic.cs (deleted)
• HeuristicLab.DataPreprocessing/3.3/Implementations/Transformations (deleted)
• HeuristicLab.DataPreprocessing/3.3/PreprocessingTransformator.cs (added)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/CheckedTransformationCollectionView.cs

@@ -52 +52 @@
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          var columNames = new[] { "dummy", "target" }.AsEnumerable();
-          return (ITransformation)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType(new[] { columNames });
+          // TODO:
+          var columnNames = Enumerable.Range(0, 10).Select(i => "x" + i);
+          //var columnNames = new[] { "dummy", "target" }.AsEnumerable();
+          return (ITransformation)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType(new[] { columnNames });
         } catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.Designer.cs

@@ -47 +47 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
-      this.transformationCollectionView = new CheckedTransformationCollectionView();
+      this.transformationCollectionView = new HeuristicLab.DataPreprocessing.Views.CheckedTransformationCollectionView();
+      this.applyButton = new System.Windows.Forms.Button();
+      this.SuspendLayout();
+      // 
       // transformationCollectionView
       // 
+      this.transformationCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.transformationCollectionView.Caption = "Transformations";
       this.transformationCollectionView.Content = null;
-      this.transformationCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
       this.transformationCollectionView.Location = new System.Drawing.Point(0, 0);
       this.transformationCollectionView.Name = "transformationCollectionView";
-      this.transformationCollectionView.Size = new System.Drawing.Size(627, 528);
+      this.transformationCollectionView.ReadOnly = false;
+      this.transformationCollectionView.ShowDetails = true;
+      this.transformationCollectionView.Size = new System.Drawing.Size(627, 482);
       this.transformationCollectionView.TabIndex = 0;
+      // 
+      // applyButton
+      // 
+      this.applyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.applyButton.Location = new System.Drawing.Point(490, 488);
+      this.applyButton.Name = "applyButton";
+      this.applyButton.Size = new System.Drawing.Size(134, 23);
+      this.applyButton.TabIndex = 1;
+      this.applyButton.Text = "Apply Transformations";
+      this.applyButton.UseVisualStyleBackColor = true;
+      this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
       // 
       // TransformationView
@@ -63 +80 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.applyButton);
       this.Controls.Add(this.transformationCollectionView);
       this.Name = "TransformationView";
-      this.Size = new System.Drawing.Size(627, 528);
+      this.Size = new System.Drawing.Size(627, 514);
       this.ResumeLayout(false);
 
@@ -72 +90 @@
     #endregion
     private CheckedTransformationCollectionView transformationCollectionView;
+    private System.Windows.Forms.Button applyButton;
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -29 +29 @@
   [Content(typeof(TransformationContent), true)]
   public partial class TransformationView : AsynchronousContentView {
+
     public TransformationView() {
       InitializeComponent();
@@ -46 +47 @@
       }
     }
+
+    private void applyButton_Click(object sender, EventArgs e) {
+      var transformations = Content.CheckedTransformationCollection.CheckedItems;
+
+      var transformator = new PreprocessingTransformator(Content.Data);
+      bool success = transformator.ApplyTransformations(transformations);
+      if (success) {
+        Content.CheckedTransformationCollection.Clear();
+      }
+    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -78 +78 @@
     <Compile Include="Implementations\DataGridLogic.cs" />
     <Compile Include="Interfaces\IFilteredPreprocessingData.cs" />
+    <Compile Include="PreprocessingTransformator.cs" />
     <Compile Include="Utils\DataPreprocessingChangedEvent.cs" />
     <Compile Include="Implementations\Filter\ComparisonFilter.cs" />
@@ -91 +92 @@
     <Compile Include="Implementations\StatisticsContent.cs" />
     <Compile Include="Implementations\TransformationContent.cs" />
-    <Compile Include="Implementations\TransformationLogic.cs" />
     <Compile Include="Interfaces\IFilterLogic.cs" />
     <Compile Include="Interfaces\IChartLogic.cs" />
@@ -178 +178 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Implementations\Transformations\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
 using HeuristicLab.DataPreprocessing.Implementations;
 using HeuristicLab.DataPreprocessing.Interfaces;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

@@ -52 +52 @@
     public PreprocessingData(IDataAnalysisProblemData problemData)
       : base() {
-      Name = "-";
+      Name = "Preprocessing Data";
+
+      transformations = new List<ITransformation>();
 
       variableNames = new List<string>(problemData.Dataset.VariableNames);