Changeset 9363 for branches/OaaS/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
- Timestamp:
- 04/16/13 13:13:41 (12 years ago)
- Location:
- branches/OaaS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r8221 r9363 24 24 using System.IO; 25 25 using System.Linq; 26 using HeuristicLab.Analysis; 26 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Core; … … 81 82 get { return Operators.OfType<TSPAlleleFrequencyAnalyzer>().FirstOrDefault(); } 82 83 } 83 private TSPPopulationDiversityAnalyzer TSPPopulationDiversityAnalyzer {84 get { return Operators.OfType< TSPPopulationDiversityAnalyzer>().FirstOrDefault(); }84 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer { 85 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); } 85 86 } 86 87 #endregion … … 230 231 231 232 private void InitializeOperators() { 233 Operators.Add(new TSPImprovementOperator()); 234 Operators.Add(new TSPMultipleGuidesPathRelinker()); 235 Operators.Add(new TSPPathRelinker()); 236 Operators.Add(new TSPSimultaneousPathRelinker()); 237 Operators.Add(new TSPSimilarityCalculator()); 238 232 239 Operators.Add(new BestTSPSolutionAnalyzer()); 233 240 Operators.Add(new TSPAlleleFrequencyAnalyzer()); 234 Operators.Add(new TSPPopulationDiversityAnalyzer());241 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer()); 235 242 ParameterizeAnalyzers(); 236 243 var operators = new HashSet<IPermutationOperator>(new IPermutationOperator[] { … … 313 320 } 314 321 315 if ( TSPPopulationDiversityAnalyzer != null) {316 TSPPopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;317 TSPPopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;318 TSPPopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;319 TSPPopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";322 if (SingleObjectivePopulationDiversityAnalyzer != null) { 323 SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 324 SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 325 SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results"; 326 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<TSPSimilarityCalculator>().SingleOrDefault(); 320 327 } 321 328 } … … 350 357 op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 351 358 op.PermutationParameter.Hidden = true; 359 } 360 foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 361 op.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 362 op.SolutionParameter.Hidden = true; 363 } 364 foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) { 365 op.ParentsParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 366 op.ParentsParameter.Hidden = true; 367 } 368 foreach (TSPSimilarityCalculator op in Operators.OfType<TSPSimilarityCalculator>()) { 369 op.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName; 370 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 352 371 } 353 372 } … … 419 438 try { 420 439 EvaluateAndLoadTour(data.BestKnownTour); 421 } catch (InvalidOperationException) { 440 } 441 catch (InvalidOperationException) { 422 442 if (data.BestKnownQuality.HasValue) 423 443 BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
Note: See TracChangeset
for help on using the changeset viewer.