Changeset 12005 for stable/HeuristicLab.Problems.LinearAssignment

Timestamp:

02/13/15 15:00:15 (10 years ago)

Author:

abeham

Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblemSolver.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.cs

@@ -33 +33 @@
   [Item("BestLAPSolutionAnalyzer", "Analyzes the best solution found.")]
   [StorableClass]
-  public class BestLAPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  public class BestLAPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
     public bool EnabledByDefault { get { return true; } }
 
@@ -101 +101 @@
       bool max = MaximizationParameter.ActualValue.Value;
       DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
-      
+
       var sorted = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).ToArray();
       if (max) sorted = sorted.Reverse().ToArray();

stable/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblemSolver.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [Item("LinearAssignmentProblemSolver", "Uses the hungarian algorithm to solve linear assignment problems.")]
   [StorableClass]
-  public sealed class LinearAssignmentProblemSolver : SingleSuccessorOperator {
+  public sealed class LinearAssignmentProblemSolver : SingleSuccessorOperator, ISingleObjectiveOperator {
     private const int UNASSIGNED = -1;