Changeset 15720 for branches/1614_GeneralizedQAP

Timestamp:

02/04/18 21:34:23 (7 years ago)

Author:

abeham

Message:

#1614: merged analysis and analysis views from #2457

Location:

branches/1614_GeneralizedQAP

Files:

• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.resx (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.resx)
• HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs)
• HeuristicLab.Analysis/3.3/Clustering (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Clustering)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Analysis/3.3/Optimizers (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/Optimizers)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Analysis/3.3/SelfOrganizingMaps (copied) (copied from branches/2457_ExpertSystem/HeuristicLab.Analysis/3.3/SelfOrganizingMaps)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -170 +170 @@
     <Compile Include="AlleleFrequencyAnalysis\AlleleFrequencyCollection.cs" />
     <Compile Include="AlleleFrequencyAnalysis\AlleleFrequencyCollectionHistory.cs" />
+    <Compile Include="BestNScopesSolutionAnalyzer.cs" />
     <Compile Include="BestScopeSolutionAnalyzer.cs" />
     <Compile Include="DataVisualization\GanttData.cs" />
+    <Compile Include="Clustering\CkMeans1D.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Clustering\ClusterHelper.cs" />
     <Compile Include="DataVisualization\IndexedDataRow.cs" />
     <Compile Include="DataVisualization\IndexedDataTable.cs" />
@@ -190 +195 @@
     <Compile Include="MultiObjective\RankBasedParetoFrontAnalyzer.cs" />
     <Compile Include="MultiObjective\ParetoFrontAnalyzer.cs" />
+    <Compile Include="Optimizers\IteratedAlgorithm.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="PopulationSimilarityAnalysis\PopulationDiversityAnalyzer.cs" />
@@ -206 +212 @@
     <Compile Include="QualityAnalysis\QualityPerEvaluationsAnalyzer.cs" />
     <Compile Include="QualityAnalysis\ScaledQualityDifferenceAnalyzer.cs" />
+    <Compile Include="SelfOrganizingMaps\RelationalSOM.cs" />
+    <Compile Include="SelfOrganizingMaps\SOM.cs" />
     <Compile Include="Statistics\BonferroniHolm.cs" />
     <Compile Include="Statistics\EnumerableStatisticsExtension.cs" />

branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Analysis.QualityAnalysis {
@@ -33 +34 @@
   [StorableClass]
   public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator, ISingleObjectiveOperator {
+    private const string TableDescription = "Shows the quality distributions in the current population.";
 
     #region Parameter properties
@@ -93 +95 @@
     }
 
+    public static DataTable PrepareTable(string qualityName = "Quality") {
+      var result = new DataTable("Population Quality Distribution", TableDescription);
+      result.VisualProperties.XAxisTitle = qualityName;
+      result.VisualProperties.YAxisTitle = "Frequency";
+
+      var row = new DataRow("QualityDistribution");
+      row.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
+      result.Rows.Add(row);
+
+      return result;
+    }
+
+    public static void UpdateTable(DataTable table, IEnumerable<double> qualities) {
+      var row = table.Rows["QualityDistribution"];
+      row.Values.Replace(qualities);
+    }
+
     public override IOperation Apply() {
       DataTable qualityDistribution = null;
-      ResultCollection results = ResultsParameter.ActualValue;
-      string description = "Shows the quality distributions in the current population.";
+      var results = ResultsParameter.ActualValue;
       if (results.ContainsKey(HistogramName)) {
-        qualityDistribution = results[HistogramName].Value as DataTable;
+        qualityDistribution = (DataTable)results[HistogramName].Value;
       } else {
-        qualityDistribution = new DataTable("Population Quality Distribution", description);
-        qualityDistribution.VisualProperties.XAxisTitle = QualityParameter.ActualName;
-        qualityDistribution.VisualProperties.YAxisTitle = "Frequency";
-        results.Add(new Result(HistogramName, description, qualityDistribution));
+        qualityDistribution = PrepareTable(QualityParameter.ActualName);
+        results.Add(new Result(HistogramName, TableDescription, qualityDistribution));
       }
-      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;
-      row.Values.Replace(qualities.Select(x => x.Value));
+
+      UpdateTable(qualityDistribution, QualityParameter.ActualValue.Select(x => x.Value));
 
       if (StoreHistory) {
-        string historyResultName = HistogramName + " History";
+        var historyResultName = HistogramName + " History";
         DataTableHistory qdHistory = null;
         if (results.ContainsKey(historyResultName)) {
-          qdHistory = results[historyResultName].Value as DataTableHistory;
+          qdHistory = (DataTableHistory)results[historyResultName].Value;
         } else {
           qdHistory = new DataTableHistory();
           results.Add(new Result(historyResultName, qdHistory));
         }
-        DataTable table = (DataTable)qualityDistribution.Clone();
-        IntValue iteration = IterationsParameter.ActualValue;
+        var table = (DataTable)qualityDistribution.Clone();
+        var iteration = IterationsParameter.ActualValue;
         if (iteration != null) {
-          string iterationName = IterationsParameter.ActualName;
+          var iterationName = IterationsParameter.ActualName;
           if (iterationName.EndsWith("s")) iterationName = iterationName.Remove(iterationName.Length - 1);
-          string appendix = " at " + iterationName + " " + iteration.Value.ToString();
+          var appendix = " at " + iterationName + " " + iteration.Value.ToString();
           table.Name += appendix;
           table.Rows["QualityDistribution"].VisualProperties.DisplayName += appendix;