Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.cs (modified) (5 diffs)
• HeuristicLab.Problems.LinearAssignment/3.3/HungarianAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Problems.LinearAssignment/3.3/LAPAssignment.cs (modified) (4 diffs)
• HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs (modified) (4 diffs)

branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.cs

@@ -42 +42 @@
       get { return (ILookupParameter<DoubleMatrix>)Parameters["Costs"]; }
     }
+    public IValueLookupParameter<StringArray> RowNamesParameter {
+      get { return (IValueLookupParameter<StringArray>)Parameters["RowNames"]; }
+    }
+    public IValueLookupParameter<StringArray> ColumnNamesParameter {
+      get { return (IValueLookupParameter<StringArray>)Parameters["ColumnNames"]; }
+    }
     public IScopeTreeLookupParameter<Permutation> AssignmentParameter {
       get { return (IScopeTreeLookupParameter<Permutation>)Parameters["Assignment"]; }
@@ -71 +77 @@
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Costs", LinearAssignmentProblem.CostsDescription));
+      Parameters.Add(new ValueLookupParameter<StringArray>("RowNames", LinearAssignmentProblem.RowNamesDescription));
+      Parameters.Add(new ValueLookupParameter<StringArray>("ColumnNames", LinearAssignmentProblem.ColumnNamesDescription));
       Parameters.Add(new ScopeTreeLookupParameter<Permutation>("Assignment", "The LAP solutions from which the best solution should be analyzed."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the LAP solutions which should be analyzed."));
@@ -86 +94 @@
     public override IOperation Apply() {
       var costs = CostsParameter.ActualValue;
+      var rowNames = RowNamesParameter.ActualValue;
+      var columnNames = ColumnNamesParameter.ActualValue;
       var permutations = AssignmentParameter.ActualValue;
       var qualities = QualityParameter.ActualValue;
@@ -122 +132 @@
       LAPAssignment assignment = BestSolutionParameter.ActualValue;
       if (assignment == null) {
-        assignment = new LAPAssignment(costs, (Permutation)permutations[i].Clone(), new DoubleValue(qualities[i].Value));
+        assignment = new LAPAssignment(costs, rowNames, columnNames, (Permutation)permutations[i].Clone(), new DoubleValue(qualities[i].Value));
         BestSolutionParameter.ActualValue = assignment;
         results.Add(new Result("Best LAP Solution", assignment));
@@ -131 +141 @@
           assignment.Assignment = (Permutation)permutations[i].Clone();
           assignment.Quality.Value = qualities[i].Value;
+          if (rowNames != null)
+            assignment.RowNames = rowNames;
+          else assignment.RowNames = null;
+          if (columnNames != null)
+            assignment.ColumnNames = columnNames;
+          else assignment.ColumnNames = null;
         }
       }

branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3/HungarianAlgorithm.cs

@@ -34 +34 @@
   /// A genetic algorithm.
   /// </summary>
-  [Item("HungarianAlgorithm", "The Hungarian algorithm can be used to solve the linear assignment problem in O(n^3). It is also known as the Kuhn–Munkres algorithm or Munkres assignment algorithm.")]
+  [Item("Hungarian Algorithm", "The Hungarian algorithm can be used to solve the linear assignment problem in O(n^3). It is also known as the Kuhn–Munkres algorithm or Munkres assignment algorithm.")]
   [Creatable("Algorithms")]
   [StorableClass]
-  public sealed class HungarianAlgorithm : EngineAlgorithm {
+  public sealed class HungarianAlgorithm : EngineAlgorithm, IStorableContent {
+    public string Filename { get; set; }
+
     #region Problem Properties
     public override Type ProblemType {
@@ -52 +54 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-
     #endregion
 
@@ -69 +70 @@
     private HungarianAlgorithm(HungarianAlgorithm original, Cloner cloner)
       : base(original, cloner) {
-      // TODO: clone your private fields here
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public HungarianAlgorithm()
@@ -85 +85 @@
 
       UpdateAnalyzers();
-      AttachEventHandlers();
+      RegisterEventHandlers();
+
+      Problem = new LinearAssignmentProblem();
     }
 
@@ -121 +123 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void AttachEventHandlers() {
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
+
+    private void RegisterEventHandlers() {
       if (Problem != null) {
         Problem.SolutionCreatorChanged += new EventHandler(Problem_SolutionCreatorChanged);

branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3/LAPAssignment.cs

@@ -30 +30 @@
   [Item("LAP Assignment", "Represents a solution to the LAP.")]
   [StorableClass]
-  public sealed class LAPAssignment : Item, INotifyPropertyChanged {
+  public sealed class LAPAssignment : Item, INotifyPropertyChanged, IStorableContent {
+    public string Filename { get; set; }
 
     [Storable]
@@ -40 +41 @@
         costs = value;
         if (changed) OnPropertyChanged("Costs");
+      }
+    }
+
+    [Storable]
+    private StringArray rowNames;
+    public StringArray RowNames {
+      get { return rowNames; }
+      set {
+        bool changed = (rowNames != value);
+        rowNames = value;
+        if (changed) OnPropertyChanged("RowNames");
+      }
+    }
+
+    [Storable]
+    private StringArray columnNames;
+    public StringArray ColumnNames {
+      get { return columnNames; }
+      set {
+        bool changed = (columnNames != value);
+        columnNames = value;
+        if (changed) OnPropertyChanged("ColumnNames");
       }
     }
@@ -71 +94 @@
       costs = cloner.Clone(original.costs);
       assignment = cloner.Clone(original.assignment);
+      rowNames = cloner.Clone(original.rowNames);
+      columnNames = cloner.Clone(original.columnNames);
       quality = cloner.Clone(original.quality);
     }
@@ -81 +106 @@
       this.quality = quality;
     }
+    public LAPAssignment(DoubleMatrix costs, StringArray rowNames, StringArray columnNames, Permutation assignment)
+      : this(costs, assignment) {
+      this.rowNames = rowNames;
+      this.columnNames = columnNames;
+    }
+    public LAPAssignment(DoubleMatrix costs, StringArray rowNames, StringArray columnNames, Permutation assignment, DoubleValue quality)
+      : this(costs, rowNames, columnNames, assignment) {
+      this.quality = quality;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new LAPAssignment(this, cloner);
     }
-
 
     public event PropertyChangedEventHandler PropertyChanged;

branches/GP-MoveOperators/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs

@@ -36 +36 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class LinearAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<ILAPEvaluator, IPermutationCreator> {
+  public sealed class LinearAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<ILAPEvaluator, IPermutationCreator>, IStorableContent {
     public static readonly string CostsDescription = "The cost matrix that describes the assignment of rows to columns.";
+    public static readonly string RowNamesDescription = "The elements represented by the rows of the costs matrix.";
+    public static readonly string ColumnNamesDescription = "The elements represented by the columns of the costs matrix.";
+
+    public string Filename { get; set; }
 
     public override Image ItemImage {
@@ -52 +56 @@
     public IValueParameter<Permutation> BestKnownSolutionParameter {
       get { return (IValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
+    }
+    public IValueParameter<StringArray> RowNamesParameter {
+      get { return (IValueParameter<StringArray>)Parameters["RowNames"]; }
+    }
+    public IValueParameter<StringArray> ColumnNamesParameter {
+      get { return (IValueParameter<StringArray>)Parameters["ColumnNames"]; }
     }
     #endregion
@@ -59 +69 @@
       get { return CostsParameter.Value; }
       set { CostsParameter.Value = value; }
+    }
+    public StringArray RowNames {
+      get { return RowNamesParameter.Value; }
+      set { RowNamesParameter.Value = value; }
+    }
+    public StringArray ColumnNames {
+      get { return ColumnNamesParameter.Value; }
+      set { ColumnNamesParameter.Value = value; }
     }
     public ItemSet<Permutation> BestKnownSolutions {
@@ -85 +103 @@
       Parameters.Add(new OptionalValueParameter<ItemSet<Permutation>>("BestKnownSolutions", "The list of best known solutions which is updated whenever a new better solution is found or may be the optimal solution if it is known beforehand.", null));
       Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution which is updated whenever a new better solution is found or may be the optimal solution if it is known beforehand.", null));
-      
+      Parameters.Add(new OptionalValueParameter<StringArray>("RowNames", RowNamesDescription));
+      Parameters.Add(new OptionalValueParameter<StringArray>("ColumnNames", ColumnNamesDescription));
+
       ((ValueParameter<DoubleMatrix>)CostsParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
+      ((OptionalValueParameter<StringArray>)RowNamesParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
+      ((OptionalValueParameter<StringArray>)ColumnNamesParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
+
+      RowNames = new StringArray(new string[] { "Eric", "Robert", "Allison" });
+      ColumnNames = new StringArray(new string[] { "MRI", "Blood test", "Angiogram" });
+      Costs[0, 0] = 4; Costs[0, 1] = 5; Costs[0, 2] = 3;
+      Costs[1, 0] = 6; Costs[1, 1] = 6; Costs[1, 2] = 4;
+      Costs[2, 0] = 5; Costs[2, 1] = 5; Costs[2, 2] = 1;
 
       bestLAPSolutionAnalyzer = new BestLAPSolutionAnalyzer();