Changeset 15069 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs
- Timestamp:
- 06/27/17 13:45:50 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs
r14185 r15069 24 24 using System.Drawing; 25 25 using System.Linq; 26 using HeuristicLab.Analysis; 26 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Core; … … 29 30 using HeuristicLab.Encodings.PermutationEncoding; 30 31 using HeuristicLab.Optimization; 32 using HeuristicLab.Optimization.Operators; 31 33 using HeuristicLab.Parameters; 32 34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 301 303 Operators.Add(new BestQAPSolutionAnalyzer()); 302 304 Operators.Add(new QAPAlleleFrequencyAnalyzer()); 303 Operators.Add(new QAPPopulationDiversityAnalyzer());304 305 305 306 Operators.Add(new QAPExhaustiveInsertionLocalImprovement()); … … 308 309 Operators.Add(new QAPExhaustiveSwap2LocalImprovement()); 309 310 311 Operators.Add(new HammingSimilarityCalculator()); 310 312 Operators.Add(new QAPSimilarityCalculator()); 313 Operators.Add(new QualitySimilarityCalculator()); 314 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); 315 311 316 ParameterizeAnalyzers(); 312 317 ParameterizeOperators(); … … 393 398 } 394 399 395 QAPSimilarityCalculator similarityCalculator = Operators.OfType<QAPSimilarityCalculator>().SingleOrDefault(); 396 if (similarityCalculator != null) { 400 foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) { 397 401 similarityCalculator.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName; 398 402 similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName; 403 var qapsimcalc = similarityCalculator as QAPSimilarityCalculator; 404 if (qapsimcalc != null) { 405 qapsimcalc.Weights = Weights; 406 qapsimcalc.Distances = Distances; 407 } 399 408 } 400 409 }
Note: See TracChangeset
for help on using the changeset viewer.