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

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/LinearAssignmentProblem.cs (modified) (4 diffs)

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();