Changeset 9363 for branches/OaaS/HeuristicLab.Problems.TravelingSalesman
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 6 edited
- 3 copied
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/Analyzers/TSPPopulationDiversityAnalyzer.cs
r7259 r9363 20 20 #endregion 21 21 22 using System; 22 23 using HeuristicLab.Analysis; 23 24 using HeuristicLab.Common; … … 25 26 using HeuristicLab.Encodings.PermutationEncoding; 26 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.PluginInfrastructure; 27 29 28 30 namespace HeuristicLab.Problems.TravelingSalesman { 31 // BackwardsCompatibility3.3 32 #region Backwards compatible code, remove with 3.4 29 33 /// <summary> 30 34 /// An operator for analyzing the diversity of solutions of Traveling Salesman Problems given in path representation. 31 35 /// </summary> 36 [Obsolete] 37 [NonDiscoverableType] 32 38 [Item("TSPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Traveling Salesman Problems given in path representation.")] 33 39 [StorableClass] … … 79 85 } 80 86 } 87 #endregion 81 88 } -
branches/OaaS/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj
r8208 r9363 119 119 <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" /> 120 120 <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" /> 121 <Compile Include="Improvers\TSPImprovementOperator.cs" /> 121 122 <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" /> 122 123 <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" /> … … 128 129 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" /> 129 130 <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" /> 131 <Compile Include="PathRelinkers\TSPMultipleGuidesPathRelinker.cs" /> 132 <Compile Include="PathRelinkers\TSPPathRelinker.cs" /> 133 <Compile Include="PathRelinkers\TSPSimultaneousPathRelinker.cs" /> 130 134 <Compile Include="Plugin.cs" /> 135 <Compile Include="SimilarityCalculators\TSPSimilarityCalculator.cs" /> 131 136 <Compile Include="TravelingSalesmanProblem.cs" /> 132 137 <Compile Include="PathTSPTour.cs" /> … … 183 188 <Name>HeuristicLab.Operators-3.3</Name> 184 189 <Private>False</Private> 190 </ProjectReference> 191 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 192 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 193 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 185 194 </ProjectReference> 186 195 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> … … 241 250 --> 242 251 <PropertyGroup> 243 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)252 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 244 253 set ProjectDir=$(ProjectDir) 245 254 set SolutionDir=$(SolutionDir) … … 248 257 call PreBuildEvent.cmd 249 258 </PreBuildEvent> 259 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 260 export ProjectDir=$(ProjectDir) 261 export SolutionDir=$(SolutionDir) 262 263 $SolutionDir/PreBuildEvent.sh 264 </PreBuildEvent> 250 265 </PropertyGroup> 251 266 </Project> -
branches/OaaS/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame
r7558 r9363 26 26 /// Plugin class for HeuristicLab.Problems.TravelingSalesman plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.TravelingSalesman-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] … … 37 37 [PluginDependency("HeuristicLab.Operators", "3.3")] 38 38 [PluginDependency("HeuristicLab.Optimization", "3.3")] 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 39 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 40 41 [PluginDependency("HeuristicLab.Persistence", "3.3")] -
branches/OaaS/HeuristicLab.Problems.TravelingSalesman/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
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.