Changeset 6013

Timestamp:

04/15/11 19:33:28 (14 years ago)

Author:

abeham

Message:

#1465

• removed AggregatedHistogramHistoryView
• removed Histogram and HistogramHistory data structures
• removed HistogramView and HistogramHistoryView, but left the HistogramControl
• adapted the QualityDistributionAnalyzer to create a DataTable instead
• added a StoreHistory parameter
• adapted the temporary test project

Location:

branches/histogram

Files:

• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.Designer.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.resx (deleted)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Analysis.Views/3.3/HistogramHistoryView.Designer.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/HistogramHistoryView.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/HistogramView.Designer.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/HistogramView.cs (deleted)
• HeuristicLab.Analysis.Views/3.3/HistogramView.resx (deleted)
• HeuristicLab.Analysis/3.3/DataVisualization/Histogram.cs (deleted)
• HeuristicLab.Analysis/3.3/DataVisualization/HistogramHistory.cs (deleted)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs (modified) (4 diffs)
• HistogramViewTest/Form1.cs (modified) (1 diff)
• HistogramViewTest/HistogramViewTest.csproj (modified) (1 diff)

branches/histogram/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -124 +124 @@
       <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="AggregatedHistogramHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="AggregatedHistogramHistoryView.Designer.cs">
-      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
-    </Compile>
     <Compile Include="DataRowVisualPropertiesControl.cs">
       <SubType>UserControl</SubType>
@@ -148 +142 @@
       <DependentUpon>DataTableVisualPropertiesDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="HistogramHistoryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="HistogramHistoryView.Designer.cs">
-      <DependentUpon>HistogramHistoryView.cs</DependentUpon>
-    </Compile>
     <Compile Include="HeatMapHistoryView.cs">
       <SubType>UserControl</SubType>
@@ -184 +172 @@
     <Compile Include="AlleleFrequencyCollectionHistoryView.Designer.cs">
       <DependentUpon>AlleleFrequencyCollectionHistoryView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="HistogramView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="HistogramView.Designer.cs">
-      <DependentUpon>HistogramView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -271 +253 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="AggregatedHistogramHistoryView.resx">
-      <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="DataRowVisualPropertiesControl.resx">
       <DependentUpon>DataRowVisualPropertiesControl.cs</DependentUpon>
@@ -288 +267 @@
     <EmbeddedResource Include="HeatMapView.resx">
       <DependentUpon>HeatMapView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="HistogramView.resx">
-      <DependentUpon>HistogramView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

branches/histogram/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -118 +118 @@
     <Compile Include="AlleleFrequencyAnalysis\AlleleFrequencyCollectionHistory.cs" />
     <Compile Include="BestScopeSolutionAnalyzer.cs" />
-    <Compile Include="DataVisualization\HistogramHistory.cs" />
     <Compile Include="DataVisualization\DataRow.cs" />
     <Compile Include="DataVisualization\DataRowVisualProperties.cs" />
@@ -127 +126 @@
     <Compile Include="DataVisualization\HeatMap.cs" />
     <Compile Include="DataVisualization\HeatMapHistory.cs" />
-    <Compile Include="DataVisualization\Histogram.cs" />
     <Compile Include="MultidimensionalScaling\MultidimensionalScaling.cs" />
     <Compile Include="MultiObjective\RankBasedParetoFrontAnalyzer.cs" />

branches/histogram/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Analysis.QualityAnalysis {
-  [Item("Quality Distribution Analyzer", "Analyzes the distribution of the quality values in that it adds a Histogram of them into the result collection.")]
+  [Item("QualityDistributionAnalyzer", "Analyzes the distribution of the quality values in that it adds a Histogram of them into the result collection.")]
   [StorableClass]
-  public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator {
 
     #region Parameter properties
@@ -41 +41 @@
       get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
-    public IValueParameter<StringValue> HistogramNameParameter {
-      get { return (IValueParameter<StringValue>)Parameters["HistogramName"]; }
+    private ValueParameter<StringValue> HistogramNameParameter {
+      get { return (ValueParameter<StringValue>)Parameters["HistogramName"]; }
+    }
+    private ValueParameter<BoolValue> StoreHistoryParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["StoreHistory"]; }
+    }
+    public ILookupParameter<IntValue> IterationsParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["Iterations"]; }
+    }
+    public IValueLookupParameter<IntValue> MaximumIterationsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["MaximumIterations"]; }
     }
     #endregion
+
+    public string HistogramName {
+      get { return HistogramNameParameter.Value.Value; }
+      set { HistogramNameParameter.Value.Value = value; }
+    }
+
+    public bool StoreHistory {
+      get { return StoreHistoryParameter.Value.Value; }
+      set { StoreHistoryParameter.Value.Value = value; }
+    }
 
     [StorableConstructor]
@@ -55 +74 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection where the analysis values should be stored."));
-      Parameters.Add(new ValueParameter<StringValue>("HistogramName", "The name of the histogram that gets injected in to the results collection.", new StringValue("QualityDistribution")));
+      Parameters.Add(new FixedValueParameter<StringValue>("HistogramName", "The name of the histogram that gets injected in to the results collection.", new StringValue("Quality Distribution")));
+      Parameters.Add(new FixedValueParameter<BoolValue>("StoreHistory", "True if the history should be stored in addition to the current distribution", new BoolValue(false)));
+      Parameters.Add(new LookupParameter<IntValue>("Iterations", "Optional: A value indicating the current iteration."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "Unused", new IntValue(-1)));
+
+      QualityParameter.Hidden = true;
+      ResultsParameter.Hidden = true;
+      IterationsParameter.Hidden = true;
+      MaximumIterationsParameter.Hidden = true;
     }
 
@@ -63 +90 @@
 
     public override IOperation Apply() {
-      HistogramHistory qualityDistribution = null;
+      DataTable qualityDistribution = null;
       ResultCollection results = ResultsParameter.ActualValue;
       string description = "Shows the quality distributions in the current population.";
-      string resultName = HistogramNameParameter.Value.Value;
-      if (results.ContainsKey(resultName)) {
-        qualityDistribution = results[resultName].Value as HistogramHistory;
+      if (results.ContainsKey(HistogramName)) {
+        qualityDistribution = results[HistogramName].Value as DataTable;
       } else {
-        qualityDistribution = new HistogramHistory();
-        results.Add(new Result(resultName, description, qualityDistribution));
+        qualityDistribution = new DataTable("Population Quality Distribution", description);
+        qualityDistribution.VisualProperties.XAxisTitle = IterationsParameter.ActualName;
+        qualityDistribution.VisualProperties.YAxisTitle = QualityParameter.ActualName;
+        results.Add(new Result(HistogramName, description, qualityDistribution));
       }
-      Histogram histogram = new Histogram("History " + qualityDistribution.Count, description);
+      DataRow row;
+      if (!qualityDistribution.Rows.TryGetValue("QualityDistribution", out row)) {
+        row = new DataRow("QualityDistribution");
+        row.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
+        qualityDistribution.Rows.Add(row);
+      }
       var qualities = QualityParameter.ActualValue;
-      histogram.Values.Clear();
-      histogram.Values.AddRange(qualities.Select(x => x.Value));
-      qualityDistribution.Add(histogram);
+      row.Values.Clear();
+      row.Values.AddRange(qualities.Select(x => x.Value));
 
+      if (StoreHistory) {
+        string historyResultName = HistogramName + " History";
+        DataTableHistory qdHistory = null;
+        if (results.ContainsKey(historyResultName)) {
+          qdHistory = results[historyResultName].Value as DataTableHistory;
+        } else {
+          qdHistory = new DataTableHistory();
+          results.Add(new Result(historyResultName, qdHistory));
+        }
+        DataTable table = (DataTable)qualityDistribution.Clone();
+        IntValue iteration = IterationsParameter.ActualValue;
+        if (iteration != null) {
+          string iterationName = IterationsParameter.ActualName;
+          if (iterationName.EndsWith("s")) iterationName = iterationName.Remove(iterationName.Length - 1);
+          string appendix = " at " + iterationName + " " + iteration.Value.ToString();
+          table.Name += appendix;
+          table.Rows["QualityDistribution"].Name += appendix;
+        }
+        qdHistory.Add(table);
+      }
       return base.Apply();
     }

branches/histogram/HistogramViewTest/Form1.cs

@@ -6 +6 @@
 namespace HistogramViewTest {
   public partial class Form1 : Form {
-    private HistogramView view;
+    private DataTableView view;
 
     public Form1() {
       InitializeComponent();
-      view = new HistogramView();
-      Histogram hist = new Histogram();
+      view = new DataTableView();
+      DataTable hist = new DataTable("TestTable");
+      DataRow row = new DataRow("Test");
+      row.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
       Random rand = new Random();
       for (int index = 1; index < 100; index++) {
-        hist.Values.Add(rand.Next(1, 1000));
+        row.Values.Add(rand.Next(1, 1000));
       }
+      hist.Rows.Add(row);
       view.Content = hist;
+      view.Dock = DockStyle.Fill;
       Controls.Add(view);
     }

branches/histogram/HistogramViewTest/HistogramViewTest.csproj

@@ -102 +102 @@
       <Name>HeuristicLab.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
+      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
+      <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>