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

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)

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;
         }
       }