Changeset 10300 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
- Timestamp:
- 01/07/14 21:44:36 (11 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.Problems.TravelingSalesman merged eligible /trunk/sources/HeuristicLab.Problems.TravelingSalesman merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Problems.TravelingSalesman 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.TravelingSalesman 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.TravelingSalesman 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.TravelingSalesman 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.TravelingSalesman 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.TravelingSalesman 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.TravelingSalesman 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.TravelingSalesman 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.TravelingSalesman 6123-9799 /branches/NET40/sources/HeuristicLab.Problems.TravelingSalesman 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.TravelingSalesman 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.TravelingSalesman 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.TravelingSalesman 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.TravelingSalesman 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.TravelingSalesman 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.TravelingSalesman 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.TravelingSalesman 5370-5682 /branches/Trunk/HeuristicLab.Problems.TravelingSalesman 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.TravelingSalesman 9168-9215 /branches/VNS/HeuristicLab.Problems.TravelingSalesman 5594-5752 /branches/histogram/HeuristicLab.Problems.TravelingSalesman 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r9848 r10300 34 34 using HeuristicLab.PluginInfrastructure; 35 35 using HeuristicLab.Problems.Instances; 36 using HeuristicLab.Problems.TravelingSalesman.Analyzers; 36 37 37 38 namespace HeuristicLab.Problems.TravelingSalesman { … … 84 85 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer { 85 86 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); } 87 } 88 89 private TSPGenealogyAnalyzer TSPGenealogyAnalyzer { 90 get { return Operators.OfType<TSPGenealogyAnalyzer>().FirstOrDefault(); } 91 } 92 private IPermutationCrossover TSPCrossover { 93 get { return Operators.OfType<IPermutationCrossover>().FirstOrDefault(); } 94 } 95 96 private IPermutationManipulator TSPManipulator { 97 get { return Operators.OfType<IPermutationManipulator>().FirstOrDefault(); } 86 98 } 87 99 #endregion … … 240 252 Operators.Add(new TSPAlleleFrequencyAnalyzer()); 241 253 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer()); 254 Operators.Add(new TSPGenealogyAnalyzer()); 242 255 ParameterizeAnalyzers(); 243 256 var operators = new HashSet<IPermutationOperator>(new IPermutationOperator[] { … … 326 339 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<TSPSimilarityCalculator>().SingleOrDefault(); 327 340 } 341 328 342 } 329 343 private void ParameterizeOperators() { … … 369 383 op.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName; 370 384 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 385 } 386 if (TSPGenealogyAnalyzer != null) { 387 if (TSPCrossover != null) { 388 TSPGenealogyAnalyzer.CrossoverParentsParameterName = TSPCrossover.ParentsParameter.Name; 389 TSPGenealogyAnalyzer.CrossoverChildParameterName = TSPCrossover.ChildParameter.Name; 390 } 391 if (TSPManipulator != null) { 392 TSPGenealogyAnalyzer.ManipulatorChildParameterName = TSPManipulator.PermutationParameter.Name; 393 } 394 TSPGenealogyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 395 if (Evaluator is ITSPPathEvaluator) { 396 TSPGenealogyAnalyzer.PopulationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 397 } else { 398 throw new Exception("Unknown Evaluator. Could not parameterize genealogy analyzer."); 399 } 371 400 } 372 401 }
Note: See TracChangeset
for help on using the changeset viewer.