Changeset 12155 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
- Timestamp:
- 03/07/15 12:11:09 (9 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.TravelingSalesman merged: 11840,11970,12012,12069-12070,12087,12102,12126
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r11864 r12155 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 using HeuristicLab.EvolutionTracking; 32 32 using HeuristicLab.Optimization; 33 using HeuristicLab.Optimization.Operators; 33 34 using HeuristicLab.Parameters; 34 35 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 83 84 private TSPAlleleFrequencyAnalyzer TSPAlleleFrequencyAnalyzer { 84 85 get { return Operators.OfType<TSPAlleleFrequencyAnalyzer>().FirstOrDefault(); } 85 }86 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {87 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); }88 86 } 89 87 … … 249 247 Operators.Add(new TSPSimultaneousPathRelinker()); 250 248 Operators.Add(new TSPSimilarityCalculator()); 249 Operators.Add(new QualitySimilarityCalculator()); 250 Operators.Add(new NoSimilarityCalculator()); 251 251 252 252 Operators.Add(new BestTSPSolutionAnalyzer()); 253 253 Operators.Add(new TSPAlleleFrequencyAnalyzer()); 254 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());254 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); 255 255 Operators.Add(new TSPGenealogyAnalyzer()); 256 256 ParameterizeAnalyzers(); … … 334 334 } 335 335 336 if (SingleObjectivePopulationDiversityAnalyzer != null) {337 SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;338 SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;339 SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";340 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<TSPSimilarityCalculator>().SingleOrDefault();341 }342 343 336 } 344 337 private void ParameterizeOperators() { … … 381 374 op.ParentsParameter.Hidden = true; 382 375 } 383 foreach ( TSPSimilarityCalculator op in Operators.OfType<TSPSimilarityCalculator>()) {376 foreach (ISolutionSimilarityCalculator op in Operators.OfType<ISolutionSimilarityCalculator>()) { 384 377 op.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName; 385 378 op.QualityVariableName = Evaluator.QualityParameter.ActualName;
Note: See TracChangeset
for help on using the changeset viewer.