Changeset 15217 for stable/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

Timestamp:

07/12/17 21:02:01 (7 years ago)

Author:

abeham

Message:

#2666, #2706, #2730, #2736: merged revisions 14412, 14475, 14476, 14659, 14660, 14663, 14779, 14780, 14912, 15050, 15067, 15069, 15079, 15162, 15166, 15172, 15173 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (4 diffs)

stable/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

@@ -23 +23 @@
 using System.IO;
 using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -272 +274 @@
       Operators.Add(new OrienteeringLocalImprovementOperator());
       Operators.Add(new OrienteeringShakingOperator());
+      Operators.Add(new QualitySimilarityCalculator());
+      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
+
       ParameterizeOperators();
     }
@@ -292 +297 @@
         op.TerminalPointParameter.ActualName = TerminalPointParameter.Name;
         op.PointVisitingCostsParameter.ActualName = PointVisitingCostsParameter.Name;
+      }
+      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
+        similarityCalculator.SolutionVariableName = SolutionCreator.IntegerVectorParameter.ActualName;
+        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
       }
     }