Changeset 14996 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content

Timestamp:

05/18/17 12:29:59 (8 years ago)

Author:

pfleck

Message:

#2709

• Fixed initial selection of the grouping text box (empty string instead of null to select the first entry).
• General code fixes (removed unnessecary bank lines and code, class member order, ...)

Location:

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content

Files:

• CorrelationMatrixContent.cs (modified) (1 diff)
• DataCompletenessChartContent.cs (modified) (1 diff)
• DataGridContent.cs (modified) (5 diffs)
• FilterContent.cs (modified) (1 diff)
• LineChartContent.cs (modified) (2 diffs)
• ManipulationContent.cs (modified) (2 diffs)
• MultiScatterPlotContent.cs (modified) (2 diffs)
• PreprocessingChartContent.cs (modified) (1 diff)
• ScatterPlotContent.cs (modified) (1 diff)
• SingleScatterPlotContent.cs (modified) (2 diffs)
• StatisticsContent.cs (modified) (2 diffs)
• TransformationContent.cs (modified) (2 diffs)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/CorrelationMatrixContent.cs

@@ -32 +32 @@
     }
 
-    private PreprocessingContext Context { get; set; }
+    public PreprocessingContext Context { get; private set; }
     public ITransactionalPreprocessingData PreprocessingData {
       get { return Context.Data; }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/DataCompletenessChartContent.cs

@@ -32 +32 @@
     }
 
-    //public DataGridLogic DataGridLogic { get; private set; }
     public SearchLogic SearchLogic { get; private set; }
 

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs

@@ -32 +32 @@
   [Item("Data Grid", "Represents a data grid.")]
   public class DataGridContent : Item, IStringConvertibleMatrix, IViewShortcut {
-
-    public ITransactionalPreprocessingData PreProcessingData { get; private set; }
-
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
     }
+
+    public ITransactionalPreprocessingData PreProcessingData { get; private set; }
 
     public ManipulationLogic ManipulationLogic { get; private set; }
@@ -43 +42 @@
 
     public int Rows {
-      get {
-        return PreProcessingData.Rows;
-      }
-      set {
-        //does nothing
-      }
+      get { return PreProcessingData.Rows; }
+      set { }
     }
 
     public int Columns {
-      get {
-        return PreProcessingData.Columns;
-      }
-      set {
-        //does nothing
-      }
+      get { return PreProcessingData.Columns; }
+      set { }
     }
 
     public IEnumerable<string> ColumnNames {
-      get {
-        return PreProcessingData.VariableNames;
-      }
-      set {
-
-      }
+      get { return PreProcessingData.VariableNames; }
+      set { }
     }
 
     public IEnumerable<string> RowNames {
-      get {
-        return Enumerable.Range(1, Rows).Select(n => n.ToString());
-      }
-      set {
-        throw new NotSupportedException();
-      }
+      get { return Enumerable.Range(1, Rows).Select(n => n.ToString()); }
+      set { throw new NotSupportedException(); }
     }
 
     public bool SortableView {
-      get {
-        return true;
-      }
-      set {
-        throw new NotSupportedException();
-      }
+      get { return true; }
+      set { throw new NotSupportedException(); }
     }
 
@@ -91 +70 @@
     }
 
-
     public IDictionary<int, IList<int>> Selection {
       get { return PreProcessingData.Selection; }
       set { PreProcessingData.Selection = value; }
     }
-
 
     public DataGridContent(ITransactionalPreprocessingData preProcessingData, ManipulationLogic theManipulationLogic, FilterLogic theFilterLogic) {
@@ -137 +114 @@
     }
 
-
     #region unused stuff/not implemented but necessary due to IStringConvertibleMatrix
 #pragma warning disable 0067
@@ -154 +130 @@
     public event EventHandler<EventArgs<int, int>> ItemChanged;
     public event EventHandler Reset;
-
 #pragma warning restore 0067
     #endregion
-
   }
 }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/FilterContent.cs

@@ -28 +28 @@
   [Item("Filter", "Represents the filter grid.")]
   public class FilterContent : Item, IViewShortcut {
-
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Filter; }
     }
 
-    private ICheckedItemCollection<IFilter> filters = new CheckedItemCollection<IFilter>();
-
     public FilterLogic FilterLogic { get; private set; }
 
-    public ICheckedItemCollection<IFilter> Filters {
-      get {
-        return this.filters;
-      }
-      set {
-        this.filters = value;
-      }
-    }
+    public ICheckedItemCollection<IFilter> Filters { get; private set; }
 
-    private bool isAndCombination = true;
-    public bool IsAndCombination {
-      get {
-        return this.isAndCombination;
-      }
-      set {
-        this.isAndCombination = value;
-      }
-    }
+    public bool IsAndCombination { get; set; }
 
     public FilterContent(FilterLogic filterLogic) {
+      Filters = new CheckedItemCollection<IFilter>();
+      IsAndCombination = true;
       FilterLogic = filterLogic;
     }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/LineChartContent.cs

@@ -28 +28 @@
   [Item("Line Chart", "Represents the line chart grid.")]
   public class LineChartContent : PreprocessingChartContent {
-
-    private bool allInOneMode = true;
-    public bool AllInOneMode {
-      get { return this.allInOneMode; }
-      set { this.allInOneMode = value; }
-    }
+    public bool AllInOneMode { get; set; }
 
     public static new Image StaticItemImage {
@@ -41 +36 @@
     public LineChartContent(IFilteredPreprocessingData preprocessingData)
       : base(preprocessingData) {
+      AllInOneMode = true;
     }
 
     public LineChartContent(LineChartContent content, Cloner cloner)
       : base(content, cloner) {
-      this.allInOneMode = content.allInOneMode;
+      this.AllInOneMode = content.AllInOneMode;
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

@@ -28 +28 @@
   [Item("Manipulation", "Represents the available manipulations on a data set.")]
   public class ManipulationContent : Item, IViewShortcut {
-
-    private ManipulationLogic manipulationLogic;
-    private SearchLogic searchLogic;
-    private FilterLogic filterLogic;
-
-    public ManipulationLogic ManipulationLogic { get { return manipulationLogic; } }
-    public SearchLogic SearchLogic { get { return searchLogic; } }
-    public FilterLogic FilterLogic { get { return filterLogic; } }
-
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
     }
 
-    public ManipulationContent(ManipulationLogic theManipulationLogic, SearchLogic theSearchLogic, FilterLogic theFilterLogic) {
-      manipulationLogic = theManipulationLogic;
-      searchLogic = theSearchLogic;
-      filterLogic = theFilterLogic;
+    public ManipulationLogic ManipulationLogic { get; private set; }
+    public SearchLogic SearchLogic { get; private set; }
+    public FilterLogic FilterLogic { get; private set; }
+
+    public ManipulationContent(ManipulationLogic manipulationLogic, SearchLogic searchLogic, FilterLogic filterLogic) {
+      ManipulationLogic = manipulationLogic;
+      SearchLogic = searchLogic;
+      FilterLogic = filterLogic;
     }
 
@@ -52 +47 @@
       return new ManipulationContent(this, cloner);
     }
-
-
   }
 }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/MultiScatterPlotContent.cs

@@ -28 +28 @@
   [Item("Multi Scatter Plot", "Represents a multi scatter plot.")]
   public class MultiScatterPlotContent : ScatterPlotContent {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
+    }
 
     public MultiScatterPlotContent(IFilteredPreprocessingData preprocessingData)
@@ -37 +40 @@
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new MultiScatterPlotContent(this, cloner);

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

@@ -33 +33 @@
   [Item("PreprocessingChart", "Represents a preprocessing chart.")]
   public class PreprocessingChartContent : Item, IViewShortcut {
-
     public enum LegendOrder {
       Appearance,

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

@@ -105 +105 @@
       return scatterPlot;
     }
-
   }
 }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/SingleScatterPlotContent.cs

@@ -28 +28 @@
   [Item("Scatter Plot", "Represents a scatter plot.")]
   public class SingleScatterPlotContent : ScatterPlotContent {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
+    }
 
     public string SelectedXVariable { get; set; }
@@ -43 +46 @@
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SingleScatterPlotContent(this, cloner);

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/StatisticsContent.cs

@@ -27 +27 @@
   [Item("Statistics", "Represents the statistics grid.")]
   public class StatisticsContent : Item, IViewShortcut {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
+    }
+
     public ITransactionalPreprocessingData PreprocessingData { get; private set; }
+    public StatisticsLogic StatisticsLogic { get; private set; }
 
-    private readonly StatisticsLogic statisticsLogic;
-    public StatisticsContent(ITransactionalPreprocessingData preProcessingData, StatisticsLogic theStatisticsLogic) {
+    public StatisticsContent(ITransactionalPreprocessingData preProcessingData, StatisticsLogic statisticsLogic) {
       PreprocessingData = preProcessingData;
-      statisticsLogic = theStatisticsLogic;
+      StatisticsLogic = statisticsLogic;
     }
 
     public StatisticsContent(StatisticsContent content, Cloner cloner)
       : base(content, cloner) {
-
-    }
-
-    public StatisticsLogic StatisticsLogic {
-      get { return statisticsLogic; }
-    }
-
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
     }
 
@@ -53 +48 @@
 
     public event DataPreprocessingChangedEventHandler Changed {
-      add { statisticsLogic.Changed += value; }
-      remove { statisticsLogic.Changed -= value; }
+      add { StatisticsLogic.Changed += value; }
+      remove { StatisticsLogic.Changed -= value; }
     }
-
   }
 }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/TransformationContent.cs

@@ -28 +28 @@
   [Item("Transformation", "Represents the transformation grid.")]
   public class TransformationContent : Item, IViewShortcut {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
+    }
 
     public IPreprocessingData Data { get; private set; }
@@ -33 +36 @@
 
     public ICheckedItemList<ITransformation> CheckedTransformationList { get; private set; }
-
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
-    }
 
     public TransformationContent(IPreprocessingData data, FilterLogic filterLogic) {