- Timestamp:
- 07/08/16 14:40:02 (9 years ago)
- Location:
- branches/crossvalidation-2434
- Files:
-
- 5 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/crossvalidation-2434 ¶
- Property svn:mergeinfo changed
-
TabularUnified branches/crossvalidation-2434/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj ¶
r11623 r14029 128 128 <Compile Include="Improvers\TSPImprovementOperator.cs" /> 129 129 <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" /> 130 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveDistanceMatrixEvaluator.cs" /> 130 131 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" /> 131 132 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" /> … … 134 135 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveEuclideanPathEvaluator.cs" /> 135 136 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveGeoPathEvaluator.cs" /> 137 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveDistanceMatrixEvaluator.cs" /> 136 138 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" /> 137 139 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" /> -
TabularUnified branches/crossvalidation-2434/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame ¶
r12753 r14029 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")] -
TabularUnified branches/crossvalidation-2434/HeuristicLab.Problems.TravelingSalesman/3.3/Properties/AssemblyInfo.cs.frame ¶
r12753 r14029 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$")] -
TabularUnified branches/crossvalidation-2434/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs ¶
r12504 r14029 37 37 38 38 namespace HeuristicLab.Problems.TravelingSalesman { 39 [Item("Traveling Salesman Problem ", "Represents a symmetric Traveling Salesman Problem.")]39 [Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")] 40 40 [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)] 41 41 [StorableClass] … … 254 254 private void UpdateMoveEvaluators() { 255 255 Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator); 256 foreach ( ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())256 foreach (var op in ApplicationManager.Manager.GetInstances<ITSPMoveEvaluator>()) 257 257 if (op.EvaluatorType == Evaluator.GetType()) { 258 258 Operators.Add(op); … … 432 432 try { 433 433 EvaluateAndLoadTour(data.BestKnownTour); 434 } 435 catch (InvalidOperationException) { 434 } catch (InvalidOperationException) { 436 435 if (data.BestKnownQuality.HasValue) 437 436 BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
Note: See TracChangeset
for help on using the changeset viewer.