Changeset 8722 for branches

Timestamp:

10/02/12 22:20:08 (12 years ago)

Author:

ascheibe

Message:

#1886 improved the DuplicateSolutionsAnalyzer

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DuplicateSolutionsAnalyzer.cs (modified) (5 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DuplicateSolutionsAnalyzer.cs

@@ -21 +21 @@
 
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.TravelingSalesman;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
@@ -46 +45 @@
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
     }
-    public IValueParameter<SingleObjectiveSolutionSimilarityCalculator> SimilarityCalculatorParameter {
-      get { return (IValueParameter<SingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
+    public IValueParameter<ISingleObjectiveSolutionSimilarityCalculator> SimilarityCalculatorParameter {
+      get { return (IValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
+    }
+    public ILookupParameter<ItemCollection<IItem>> OperatorsParameter {
+      get { return (ILookupParameter<ItemCollection<IItem>>)Parameters["Operators"]; }
     }
     #endregion
@@ -62 +64 @@
     [StorableConstructor]
     private DuplicateSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
-    
-    private DuplicateSolutionsAnalyzer(DuplicateSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) {
+
+    private DuplicateSolutionsAnalyzer(DuplicateSolutionsAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
       chartingHelper = (DataTableHelper)original.chartingHelper.Clone(cloner);
     }
-    
+
     public DuplicateSolutionsAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
-      Parameters.Add(new ValueParameter<SingleObjectiveSolutionSimilarityCalculator>("SimilarityCalculator", new TSPSimilarityCalculator()));
-      SimilarityCalculatorParameter.Value.SolutionVariableName = "TSPTour";
-      SimilarityCalculatorParameter.Value.QualityVariableName = "TSPTourLength";
+      Parameters.Add(new ValueParameter<ISingleObjectiveSolutionSimilarityCalculator>("SimilarityCalculator"));
+      Parameters.Add(new LookupParameter<ItemCollection<IItem>>("Operators", "The operators and items that the problem provides to the algorithms."));
 
       chartingHelper = new DataTableHelper();
@@ -82 +84 @@
 
     public override IOperation Apply() {
+      if (SimilarityCalculatorParameter.Value == null) {
+        SimilarityCalculatorParameter.Value = OperatorsParameter.ActualValue.OfType<ISingleObjectiveSolutionSimilarityCalculator>().FirstOrDefault();
+      }
       chartingHelper.InitializeChart(Results, "Duplicate Solutions", "Duplicate Solutions per Generation");
 
@@ -95 +100 @@
       }
 
-      chartingHelper.AddPoint(counter);
+      chartingHelper.AddPoint(counter / (double)similarities.Length);
       return base.Apply();
     }