Changeset 15217 for stable/HeuristicLab.Problems.PTSP/3.3
- Timestamp:
- 07/12/17 21:02:01 (7 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 14412,14475-14476,14659-14660,14663,14912,15050,15067,15069,15079,15162,15166,15172-15173
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj
r13484 r15217 74 74 </PropertyGroup> 75 75 <ItemGroup> 76 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj"> 77 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project> 78 <Name>HeuristicLab.Analysis-3.3</Name> 79 <Private>False</Private> 80 </ProjectReference> 76 81 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 77 82 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> … … 107 112 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 108 113 <Name>HeuristicLab.Operators-3.3</Name> 114 <Private>False</Private> 115 </ProjectReference> 116 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 117 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 118 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 109 119 <Private>False</Private> 110 120 </ProjectReference> -
stable/HeuristicLab.Problems.PTSP/3.3/PTSP.cs
r14186 r15217 22 22 using System; 23 23 using System.Linq; 24 using HeuristicLab.Analysis; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; … … 27 28 using HeuristicLab.Encodings.PermutationEncoding; 28 29 using HeuristicLab.Optimization; 30 using HeuristicLab.Optimization.Operators; 29 31 using HeuristicLab.Parameters; 30 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 119 121 Probabilities = new DoubleArray(Enumerable.Range(0, coordinates.Rows).Select(x => 0.5).ToArray()); 120 122 123 InitializeOperators(); 124 Parameterize(); 121 125 RegisterEventHandlers(); 126 } 127 128 private void InitializeOperators() { 129 Operators.Add(new HammingSimilarityCalculator()); 130 Operators.Add(new QualitySimilarityCalculator()); 131 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); 122 132 } 123 133 … … 125 135 private void AfterDeserialization() { 126 136 RegisterEventHandlers(); 137 } 138 139 protected override void OnEncodingChanged() { 140 base.OnEncodingChanged(); 141 Encoding.Length = Coordinates.Rows; 142 Parameterize(); 127 143 } 128 144 … … 236 252 return Coordinates != null ? Coordinates.Rows : DistanceMatrix.Rows; 237 253 } 254 255 private void Parameterize() { 256 foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) { 257 similarityCalculator.SolutionVariableName = Encoding.SolutionCreator.PermutationParameter.ActualName; 258 similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName; 259 } 260 } 238 261 } 239 262 } -
stable/HeuristicLab.Problems.PTSP/3.3/Plugin.cs.frame
r14190 r15217 25 25 [Plugin("HeuristicLab.Problems.PTSP", "Provides an implementation of the probabilistic traveling salesman problem (PTSP)", "3.3.14.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.PTSP-3.3.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Analysis", "3.3")] 27 28 [PluginDependency("HeuristicLab.Collections", "3.3")] 28 29 [PluginDependency("HeuristicLab.Common", "3.3")] … … 33 34 [PluginDependency("HeuristicLab.Operators", "3.3")] 34 35 [PluginDependency("HeuristicLab.Optimization", "3.3")] 36 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 35 37 [PluginDependency("HeuristicLab.Parameters", "3.3")] 36 38 [PluginDependency("HeuristicLab.Persistence", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.