Changeset 15217 for stable/HeuristicLab.Problems.LinearAssignment/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.LinearAssignment/3.3/HeuristicLab.Problems.LinearAssignment-3.3.csproj
r11920 r15217 175 175 <Private>False</Private> 176 176 </ProjectReference> 177 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 178 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 179 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 180 <Private>False</Private> 181 </ProjectReference> 177 182 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 178 183 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> -
stable/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs
r14186 r15217 23 23 using System.Drawing; 24 24 using System.Linq; 25 using HeuristicLab.Analysis; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 28 29 using HeuristicLab.Encodings.PermutationEncoding; 29 30 using HeuristicLab.Optimization; 31 using HeuristicLab.Optimization.Operators; 30 32 using HeuristicLab.Parameters; 31 33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 178 180 Operators.RemoveAll(x => x is IMoveOperator); 179 181 Operators.Add(bestLAPSolutionAnalyzer); 182 183 Operators.Add(new HammingSimilarityCalculator()); 184 Operators.Add(new QualitySimilarityCalculator()); 185 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); 180 186 } 181 187 … … 207 213 } 208 214 215 foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) { 216 similarityCalculator.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName; 217 similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName; 218 } 219 209 220 bestLAPSolutionAnalyzer.AssignmentParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 210 221 bestLAPSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name; -
stable/HeuristicLab.Problems.LinearAssignment/3.3/Plugin.cs.frame
r14190 r15217 34 34 [PluginDependency("HeuristicLab.Operators", "3.3")] 35 35 [PluginDependency("HeuristicLab.Optimization", "3.3")] 36 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 36 37 [PluginDependency("HeuristicLab.Parameters", "3.3")] 37 38 [PluginDependency("HeuristicLab.Persistence", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.