Changeset 4641

Timestamp:

10/23/10 04:07:18 (14 years ago)

Author:

swagner

Message:

Worked on allele frequency analysis (#1234)

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionHistoryView.Designer.cs (added)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionHistoryView.cs (added)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.cs (modified) (6 diffs)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionHistory.cs (moved) (moved from trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionCollection.cs) (1 diff)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/MultiAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/MovieView.Designer.cs (added)
• HeuristicLab.Core.Views/3.3/MovieView.cs (added)
• HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl (modified) (previous)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.Designer.cs

@@ -61 +61 @@
       chartArea1.AxisX.IntervalAutoMode = System.Windows.Forms.DataVisualization.Charting.IntervalAutoMode.VariableCount;
       chartArea1.AxisX.LabelAutoFitStyle = ((System.Windows.Forms.DataVisualization.Charting.LabelAutoFitStyles)((System.Windows.Forms.DataVisualization.Charting.LabelAutoFitStyles.IncreaseFont | System.Windows.Forms.DataVisualization.Charting.LabelAutoFitStyles.DecreaseFont)));
-      chartArea1.AxisX.Title = "Alleles";
+      chartArea1.AxisX.Title = "Allele Index";
       chartArea1.AxisY.Maximum = 1D;
       chartArea1.AxisY.Minimum = 0D;
       chartArea1.AxisY.Title = "Relative Frequency";
-      chartArea1.AxisY2.Title = "Average Solution Quality / Average Impact";
+      chartArea1.AxisY2.Title = "Average Solution Quality";
       chartArea1.CursorX.IsUserEnabled = true;
       chartArea1.CursorX.IsUserSelectionEnabled = true;

trunk/sources/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionView.cs

@@ -83 +83 @@
       qualities.YValueType = ChartValueType.Double;
       qualities.YAxisType = AxisType.Secondary;
-      qualities.ToolTip = "#VAL";
       chart.Series.Add(qualities);
 
@@ -91 +90 @@
       impacts.YValueType = ChartValueType.Double;
       impacts.YAxisType = AxisType.Secondary;
-      impacts.ToolTip = "#VAL";
       chart.Series.Add(impacts);
+      invisibleSeries.Add(impacts);
     }
 
@@ -106 +105 @@
       impacts.Points.Clear();
 
+      if (!invisibleSeries.Contains(qualities) && !invisibleSeries.Contains(impacts))
+        chart.ChartAreas["Default"].AxisY2.Title = "Average Solution Quality / Average Impact";
+      else if (!invisibleSeries.Contains(qualities))
+        chart.ChartAreas["Default"].AxisY2.Title = "Average Solution Quality";
+      else if (!invisibleSeries.Contains(impacts))
+        chart.ChartAreas["Default"].AxisY2.Title = "Average Impact";
+
       if (!invisibleSeries.Contains(bestKnown)) {
         foreach (AlleleFrequency af in Content.Where(x => x.ContainedInBestKnownSolution).OrderBy(x => x.AverageImpact)) {
-          bestKnown.Points.Add(CreateFrequencyDataPoint(index, af));
-          if (!invisibleSeries.Contains(qualities)) qualities.Points.AddXY(index, af.AverageSolutionQuality);
-          if (!invisibleSeries.Contains(impacts)) impacts.Points.AddXY(index, af.AverageImpact);
+          bestKnown.Points.Add(CreateDataPoint(index, af.Frequency, af));
+          if (!invisibleSeries.Contains(qualities)) qualities.Points.Add(CreateDataPoint(index, af.AverageSolutionQuality, af));
+          if (!invisibleSeries.Contains(impacts)) impacts.Points.Add(CreateDataPoint(index, af.AverageImpact, af));
           index++;
         }
@@ -116 +122 @@
       if (!invisibleSeries.Contains(others)) {
         foreach (AlleleFrequency af in Content.Where(x => !x.ContainedInBestKnownSolution).OrderBy(x => x.AverageImpact)) {
-          others.Points.Add(CreateFrequencyDataPoint(index, af));
-          if (!invisibleSeries.Contains(qualities)) qualities.Points.AddXY(index, af.AverageSolutionQuality);
-          if (!invisibleSeries.Contains(impacts)) impacts.Points.AddXY(index, af.AverageImpact);
+          others.Points.Add(CreateDataPoint(index, af.Frequency, af));
+          if (!invisibleSeries.Contains(qualities)) qualities.Points.Add(CreateDataPoint(index, af.AverageSolutionQuality, af));
+          if (!invisibleSeries.Contains(impacts)) impacts.Points.Add(CreateDataPoint(index, af.AverageImpact, af));
           index++;
         }
@@ -124 +130 @@
     }
 
-    protected virtual DataPoint CreateFrequencyDataPoint(int index, AlleleFrequency af) {
+    protected virtual DataPoint CreateDataPoint(int index, double value, AlleleFrequency af) {
       string nl = Environment.NewLine;
-
-      DataPoint p = new DataPoint(index, af.Frequency);
-      p.AxisLabel = af.Id;
+      DataPoint p = new DataPoint(index, value);
       p.ToolTip = string.Format("Id: {0}" + nl +
                                 "Relative Frequency: {1}" + nl +
@@ -136 +140 @@
                                 "Contained in Best Solution: {5}",
                                 af.Id, af.Frequency, af.AverageSolutionQuality, af.AverageImpact, af.ContainedInBestKnownSolution, af.ContainedInBestSolution);
+      p.IsEmpty = value == 0;
       return p;
     }

trunk/sources/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -117 +117 @@
   <ItemGroup>
     <None Include="HeuristicLabAnalysisViewsPlugin.cs.frame" />
-    <Compile Include="AlleleFrequencyCollectionView.cs" />
+    <Compile Include="AlleleFrequencyCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="AlleleFrequencyCollectionView.Designer.cs">
       <DependentUpon>AlleleFrequencyCollectionView.cs</DependentUpon>
@@ -127 +129 @@
     <Compile Include="AlleleFrequencyView.Designer.cs">
       <DependentUpon>AlleleFrequencyView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AlleleFrequencyCollectionHistoryView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="AlleleFrequencyCollectionHistoryView.Designer.cs">
+      <DependentUpon>AlleleFrequencyCollectionHistoryView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />

trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs

@@ -70 +70 @@
       Parameters.Add(new ValueParameter<BoolValue>("StoreAlleleFrequenciesHistory", "True if the history of all allele frequencies should be stored.", new BoolValue(false)));
       Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1)));
-      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update."));
+      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "AlleleFrequencyAnalyzerUpdateCounter"));
     }
 
-    private class AlleleFrequencyEqualityComparer : IEqualityComparer<AlleleFrequency> {
+    #region AlleleFrequencyIdEqualityComparer
+    private class AlleleFrequencyIdEqualityComparer : IEqualityComparer<AlleleFrequency> {
       public bool Equals(AlleleFrequency x, AlleleFrequency y) {
         return x.Id == y.Id;
       }
       public int GetHashCode(AlleleFrequency obj) {
-        return obj.GetHashCode();
+        return obj.Id.GetHashCode();
       }
     }
+    #endregion
 
     public override IOperation Apply() {
@@ -121 +123 @@
 
         // calculate dummy allele frequencies of alleles of best known solution which did not occur
-        var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequencyEqualityComparer());
+        var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequencyIdEqualityComparer());
 
         // fetch results collection
@@ -142 +144 @@
         if (storeHistory) {
           if (!results.ContainsKey("Allele Frequencies History")) {
-            AlleleFrequencyCollectionCollection history = new AlleleFrequencyCollectionCollection();
+            AlleleFrequencyCollectionHistory history = new AlleleFrequencyCollectionHistory();
             history.Add(frequenciesCollection);
             results.Add(new Result("Allele Frequencies History", history));
           } else {
-            ((AlleleFrequencyCollectionCollection)results["Allele Frequencies History"].Value).Add(frequenciesCollection);
+            ((AlleleFrequencyCollectionHistory)results["Allele Frequencies History"].Value).Add(frequenciesCollection);
           }
         }

trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionHistory.cs

@@ -26 +26 @@
 namespace HeuristicLab.Analysis {
   /// <summary>
-  /// Represents a collection of allele frequencies collections.
+  /// Represents history values of allele frequencies collections.
   /// </summary>
-  [Item("AlleleFrequencyCollectionCollection", "Represents a collection of allele frequencies collections.")]
+  [Item("AlleleFrequencyCollectionHistory", "Represents history values of allele frequencies collections.")]
   [StorableClass]
-  public class AlleleFrequencyCollectionCollection : ItemCollection<AlleleFrequencyCollection> {
-    public AlleleFrequencyCollectionCollection() : base() { }
-    public AlleleFrequencyCollectionCollection(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }
+  public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
+    public AlleleFrequencyCollectionHistory() : base() { }
+    public AlleleFrequencyCollectionHistory(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }
     [StorableConstructor]
-    protected AlleleFrequencyCollectionCollection(bool deserializing) : base(deserializing) { }
+    protected AlleleFrequencyCollectionHistory(bool deserializing) : base(deserializing) { }
   }
 }

trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -111 +111 @@
     <None Include="HeuristicLabAnalysisPlugin.cs.frame" />
     <Compile Include="AlleleFrequencyCollection.cs" />
+    <Compile Include="AlleleFrequencyCollectionHistory.cs" />
     <Compile Include="BestAverageWorstQualityAnalyzer.cs" />
     <Compile Include="BestAverageWorstQualityCalculator.cs" />
@@ -117 +118 @@
     <Compile Include="Allele.cs" />
     <Compile Include="AlleleFrequency.cs" />
-    <Compile Include="AlleleFrequencyCollectionCollection.cs" />
     <Compile Include="QualityAnalyzer.cs" />
     <Compile Include="MinAverageMaxValueAnalyzer.cs" />

trunk/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -54 +54 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<IntValue>("UpdateInterval", "The interval in which the contained analyzers should be applied.", new IntValue(1)));
-      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update."));
+      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update.", "MultiAnalyzerUpdateCounter"));
     }
     [StorableConstructor]

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -130 +130 @@
       <DependentUpon>CheckedItemListView.cs</DependentUpon>
     </Compile>
+    <Compile Include="MovieView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MovieView.Designer.cs">
+      <DependentUpon>MovieView.cs</DependentUpon>
+    </Compile>
     <Compile Include="LogView.cs">
       <SubType>UserControl</SubType>

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -315 +315 @@
     }
     private void ParameterizeAnalyzers() {
-      BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
-      BestTSPSolutionAnalyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
-      BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
-      BestTSPSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-      BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-      BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-
-      TSPAlleleFrequencyAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      TSPAlleleFrequencyAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
-      TSPAlleleFrequencyAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
-      TSPAlleleFrequencyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      TSPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-      TSPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
+      if (BestTSPSolutionAnalyzer != null) {
+        BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        BestTSPSolutionAnalyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        BestTSPSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+        BestTSPSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
+        BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+        BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      }
+
+      if (TSPAlleleFrequencyAnalyzer != null) {
+        TSPAlleleFrequencyAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        TSPAlleleFrequencyAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        TSPAlleleFrequencyAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        TSPAlleleFrequencyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        TSPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+        TSPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
+      }
     }
     private void ParameterizeOperators() {