Changeset 11070

Timestamp:

07/01/14 17:42:44 (11 years ago)

Author:

mkommend

Message:

#2206: Clean up of data preprocessing code (removed unused code, used more appropriate collections, hiding of the backtransform button of symreg models).

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/DataCompletenessChartContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.resx (deleted)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -279 +279 @@
     <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent-3.3.csproj">
       <Project>{1256B945-EEA9-4BE4-9880-76B5B113F089}</Project>
-      <Name>HeuristicLab.Algorithms.GradientDescent-3.3</Name>
+      <Name>HeuristicLab.Algorithms.GradientDescent</Name>
       <Private>False</Private>
     </ProjectReference>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -37 +37 @@
     private bool notOwnEvent = true;
     private bool isSearching = false;
-    private bool isReplacing = false;
     private bool updateOnMouseUp = false;
     private SearchAndReplaceDialog findAndReplaceDialog;
@@ -570 +569 @@
 
     private void StartReplacing() {
-      isReplacing = true;
       SuspendRepaint();
     }
 
     private void StopReplacing() {
-      isReplacing = false;
       ResumeRepaint(true);
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

@@ -78 +78 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ManipulationLogic.Changed += Content_Changed;
       Content.FilterLogic.FilterChanged += FilterLogic_FilterChanged;
     }
 
     protected override void DeregisterContentEvents() {
+      Content.FilterLogic.FilterChanged -= FilterLogic_FilterChanged;
       base.DeregisterContentEvents();
-      Content.ManipulationLogic.Changed -= Content_Changed;
-      Content.FilterLogic.FilterChanged -= FilterLogic_FilterChanged;
     }
 
@@ -219 +217 @@
         var allIndices = Content.SearchLogic.GetMissingValueIndices();
         int count = allIndices[columnIndex].Count;
-        int cellCount = Content.FilterLogic.PreprocessingData.Rows*Content.FilterLogic.PreprocessingData.Columns;
+        int cellCount = Content.FilterLogic.PreprocessingData.Rows * Content.FilterLogic.PreprocessingData.Columns;
         lblPreviewReplaceMissingValues.Text = count + " cell" + (count > 1 || count == 0 ? "s" : "")
           + " of " + cellCount + " (" + string.Format("{0:F2}%", 100d / cellCount * count) + ") were detected with missing values which would be replaced with " + replaceWith;
@@ -292 +290 @@
     }
 
-    void Content_Changed(object sender, DataPreprocessingChangedEventArgs e) {
-      switch (lstMethods.SelectedIndex) {
-        case 0:
-          validateDeleteColumnsInfo();
-          break;
-        case 1:
-          validateDeleteColumnsVariance();
-          break;
-        case 2:
-          validateDeleteRowsInfo();
-          break;
-      }
-    }
-
     private void cmbReplaceWith_SelectedIndexChanged(object sender, EventArgs e) {
       bool isReplaceWithValueSelected = cmbReplaceWith.SelectedIndex == 0;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/DataCompletenessChartContent.cs

@@ -6 +6 @@
   [Item("DataCompletenessChart", "Represents a datacompleteness chart.")]
 
-  public class DataCompletenessChartContent : Item, IViewChartShortcut
-  {
+  public class DataCompletenessChartContent : Item, IViewChartShortcut {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.EditBrightnessContrast; }
     }
 
-    private readonly SearchLogic searchLogic;
-
     public IDataGridLogic DataGridLogic { get; private set; }
     public ISearchLogic SearchLogic { get; private set; }
 
-    public DataCompletenessChartContent(SearchLogic searchLogic)
-    {
+    public DataCompletenessChartContent(SearchLogic searchLogic) {
       SearchLogic = searchLogic;
     }
-    
+
     public DataCompletenessChartContent(DataCompletenessChartContent content, Cloner cloner)
-      : base(content, cloner)
-    {
-      SearchLogic = content.searchLogic;
+      : base(content, cloner) {
+      SearchLogic = content.SearchLogic;
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -95 +93 @@
 
 
-    private IDictionary<int, IList<int>> selection;
     public IDictionary<int, IList<int>> Selection {
       get { return PreProcessingData.Selection; }
@@ -145 +142 @@
 
     #region unused stuff/not implemented but necessary due to IStringConvertibleMatrix
-
+#pragma warning disable 0067
     // Is not used since DataGridContentView overrides dataGridView_CellValidating and uses 
     // DataGridLogic#Validate(string value, out string errorMessage, int columnIndex)
@@ -160 +157 @@
     public event EventHandler<EventArgs<int, int>> ItemChanged;
     public event EventHandler Reset;
+
+#pragma warning restore 0067
     #endregion
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs

@@ -27 +27 @@
 namespace HeuristicLab.DataPreprocessing {
   public class ManipulationLogic : IManipulationLogic {
-    private ITransactionalPreprocessingData preprocessingData;
-    private IStatisticsLogic statisticsLogic;
-    private ISearchLogic searchLogic;
+    private readonly ITransactionalPreprocessingData preprocessingData;
+    private readonly IStatisticsLogic statisticsLogic;
+    private readonly ISearchLogic searchLogic;
 
     public IEnumerable<string> VariableNames {
@@ -402 +402 @@
     }
 
-    public event DataPreprocessingChangedEventHandler Changed;
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs

@@ -46 +46 @@
     void DeleteColumnsWithMissingValuesGreater(double percent);
     void DeleteColumnsWithVarianceSmaller(double variance);
-
-    event DataPreprocessingChangedEventHandler Changed;
-
-
   }
 }

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

@@ -392 +392 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="RunCollectionConstraintViews\RunCollectionComparisonConstraintView.resx">
-      <DependentUpon>RunCollectionComparisonConstraintView.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/DataPreprocessing/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.Designer.cs

@@ -48 +48 @@
       this.txtConstraintData = new System.Windows.Forms.TextBox();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
-      this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -54 +53 @@
       // txtConstraintData
       // 
-      this.txtConstraintData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.txtConstraintData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.errorProvider.SetIconAlignment(this.txtConstraintData, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
@@ -68 +67 @@
       // 
       this.errorProvider.ContainerControl = this;
-      // 
-      // contextMenuStrip1
-      // 
-      this.contextMenuStrip1.Name = "contextMenuStrip1";
       // 
       // RunCollectionComparisonConstraintView
@@ -92 +87 @@
     private System.Windows.Forms.TextBox txtConstraintData;
     private System.Windows.Forms.ErrorProvider errorProvider;
-    private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
   }
 }

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

@@ -44 +44 @@
       btnSimplify.Enabled = Content != null && !Locked;
       exportButton.Enabled = Content != null && !Locked;
+      transformModelButton.Visible = false;
       transformModelButton.Enabled = Content != null && !Locked;
     }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs

@@ -1627 +1627 @@
     }
 
-    public ProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IList<ITransformation> transformations = null)
-      : base(dataset, allowedInputVariables, transformations ?? new List<ITransformation>()) {
+    public ProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
+      : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(PriceChangeVariableParameterName, new ItemSet<StringValue>(variables), variables.First(x => x.Value == targetVariable)));

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

@@ -300 +300 @@
     }
 
-    public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IList<ITransformation> transformations = null)
-      : base(dataset, allowedInputVariables, transformations ?? new List<ITransformation>()) {
+    public ClassificationProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
+      : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       var validTargetVariableValues = CheckVariablesForPossibleTargetVariables(dataset).Select(x => new StringValue(x).AsReadOnly()).ToList();
       var target = validTargetVariableValues.Where(x => x.Value == targetVariable).DefaultIfEmpty(validTargetVariableValues.First()).First();

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -86 +87 @@
     }
 
-    public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IList<ITransformation> transformations = null)
-      : base(dataset, allowedInputVariables, transformations ?? new List<ITransformation>()) {
+    public ClusteringProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, IEnumerable<ITransformation> transformations = null)
+      : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
     }
   }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -137 +137 @@
     }
 
-    public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IList<ITransformation> transformations = null)
-      : base(dataset, allowedInputVariables, transformations ?? new List<ITransformation>()) {
+    public RegressionProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
+      : base(dataset, allowedInputVariables, transformations ?? Enumerable.Empty<ITransformation>()) {
       var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
       Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

@@ -1582 +1582 @@
       TrainingPartition.Start = 50;
     }
-    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable)
-      : base(dataset, allowedInputVariables, targetVariable) {
+    public TimeSeriesPrognosisProblemData(Dataset dataset, IEnumerable<string> allowedInputVariables, string targetVariable, IEnumerable<ITransformation> transformations = null)
+      : base(dataset, allowedInputVariables, targetVariable, transformations ?? Enumerable.Empty<ITransformation>()) {
       Parameters.Add(new FixedValueParameter<IntValue>(TrainingHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each training sample.", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<IntValue>(TestHorizonParameterName, "Specifies the horizon (how far the prognosis reaches in the future) for each test sample.", new IntValue(1)));
@@ -1643 +1643 @@
 
       var trainingDataStart = TrainingIndices.First();
-      
+
       base.AdjustProblemDataProperties(problemData);
-      
+
       TestPartition.Start = trainingDataStart;