Changeset 13482 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3
- Timestamp:
- 12/17/15 20:43:07 (8 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Files:
-
- 5 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.TravelingSalesman merged: 12978,13173,13321,13397
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj
r12208 r13482 187 187 <Compile Include="Improvers\TSPImprovementOperator.cs" /> 188 188 <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" /> 189 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveDistanceMatrixEvaluator.cs" /> 189 190 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" /> 190 191 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" /> … … 193 194 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveEuclideanPathEvaluator.cs" /> 194 195 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveGeoPathEvaluator.cs" /> 196 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveDistanceMatrixEvaluator.cs" /> 195 197 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" /> 196 198 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" /> -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame
r12891 r13482 26 26 /// Plugin class for HeuristicLab.Problems.TravelingSalesman plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.1 2.$WCREV$")]28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.13.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.TravelingSalesman-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Properties/AssemblyInfo.cs.frame
r12891 r13482 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3.1 2.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")] -
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r12891 r13482 39 39 40 40 namespace HeuristicLab.Problems.TravelingSalesman { 41 [Item("Traveling Salesman Problem ", "Represents a symmetric Traveling Salesman Problem.")]41 [Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")] 42 42 [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)] 43 43 [StorableClass] … … 268 268 private void UpdateMoveEvaluators() { 269 269 Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator); 270 foreach ( ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())270 foreach (var op in ApplicationManager.Manager.GetInstances<ITSPMoveEvaluator>()) 271 271 if (op.EvaluatorType == Evaluator.GetType()) { 272 272 Operators.Add(op); … … 469 469 try { 470 470 EvaluateAndLoadTour(data.BestKnownTour); 471 } 472 catch (InvalidOperationException) { 471 } catch (InvalidOperationException) { 473 472 if (data.BestKnownQuality.HasValue) 474 473 BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
Note: See TracChangeset
for help on using the changeset viewer.