Changeset 15069 for trunk/sources/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

Timestamp:

06/27/17 13:45:50 (7 years ago)

Author:

abeham

Message:

#2706:

• Added or updated similarity calculators and population similarity analysis for several problems (BinPacking, LAP, Orienteering, Parameter optimization, PTSP, QAP, TF, TSP, VRP)
• Made TSPSimilarityCalculator obsolete since it's essentially the same as the one in the permutation plugin
• Made QAPPopulationDiversityAnalyzer obsolete as it is replaced by the newer PopulationSimilarityAnalyzer
• Removed genotype specific similarity code in QAPPermutationProximityCalculator (again identical to the permutation plugin)
• Changed QAPSimilarityCalculator to perform phenotype similarity instead of genotype similarity (has not been previously used)

File:

• trunk/sources/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (4 diffs)

trunk/sources/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;
       }
     }