Changeset 7311 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

Timestamp:

01/11/12 09:16:27 (12 years ago)

Author:

abeham

Message:

#1614

• updated GQAP

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• . (modified) (1 prop)
• GeneralizedQuadraticAssignmentProblem.cs (modified) (11 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

@@ -1 +1 @@
 Plugin.cs
 obj
+bin

@@ -1 +1 @@
 Plugin.cs
 obj
+bin

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Drawing;
 using System.Linq;
@@ -35 +36 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IIntegerVectorCreator> {
+  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IIntegerVectorCreator>, IStorableContent {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }
+
+    public string Filename { get; set; }
 
     #region Parameter Properties
@@ -62 +65 @@
       get { return (OptionalValueParameter<IItem>)Parameters["BestKnownSolution"]; }
     }
-
     #endregion
 
@@ -90 +92 @@
       set { CapacitiesParameter.Value = value; }
     }
-
     #endregion
 
@@ -116 +117 @@
       Parameters.Add(new ValueParameter<DoubleArray>("Capacities", "The capacities vector describes the available space at the locations.", new DoubleArray()));
       Parameters.Add(new OptionalValueParameter<IItem>("BestKnownSolution", "The best known solution (if available)", null));
+      Parameters.Add(new OptionalValueParameter<StringArray>("EquipmentNames", "Optional: A list of names that describes the equipments.", null, false));
+      Parameters.Add(new OptionalValueParameter<StringArray>("LocationNames", "Optional: A list of names that describes the locations.", null, false));
 
       WeightsParameter.ReactOnValueToStringChangedAndValueItemImageChanged = false;
@@ -133 +136 @@
       Distances[0, 2] = Distances[2, 0] = 2;
 
-      InstallationCosts = new DoubleMatrix(3, 3);
+      InstallationCosts = new DoubleMatrix(5, 3);
 
       TransportationCosts = 1;
@@ -143 +146 @@
       Capacities[0] = 4; Capacities[1] = 1; Capacities[2] = 4;
 
-      ParameterizeSolutionCreator();
-      ParameterizeEvaluator();
+      Parameterize();
 
       InitializeOperators();
@@ -155 +157 @@
 
     #region Events
-    // TODO: Add your event handlers here
+    protected override void OnOperatorsChanged() {
+      base.OnOperatorsChanged();
+      Parameterize();
+    }
+    protected override void OnEvaluatorChanged() {
+      base.OnEvaluatorChanged();
+      Parameterize();
+      Evaluator.QualityParameter.ActualNameChanged += new System.EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+    }
+    protected override void OnSolutionCreatorChanged() {
+      base.OnSolutionCreatorChanged();
+      Parameterize();
+      SolutionCreator.IntegerVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
+    }
+
+    private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
+      Parameterize();
+    }
+    private void SolutionCreator_IntegerVectorParameter_ActualNameChanged(object sender, EventArgs e) {
+      Parameterize();
+    }
     #endregion
 
@@ -161 +183 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      if (!Parameters.ContainsKey("EquipmentNames"))
+        Parameters.Add(new OptionalValueParameter<StringArray>("EquipmentNames", "Optional: A list of names that describes the equipments.", null, false));
+      if (!Parameters.ContainsKey("LocationNames"))
+        Parameters.Add(new OptionalValueParameter<StringArray>("LocationNames", "Optional: A list of names that describes the locations.", null, false));
+      #endregion
       AttachEventHandlers();
     }
 
     private void AttachEventHandlers() {
-      // TODO: Add event handlers to the parameters here
+      Evaluator.QualityParameter.ActualNameChanged += new System.EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+      SolutionCreator.IntegerVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
     }
 
@@ -172 +202 @@
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.Add(new BestGQAPSolutionAnalyzer());
-      ParameterizeAnalyzers();
-      ParameterizeOperators();
-    }
-    private void ParameterizeAnalyzers() {
+      Parameterize();
+    }
+
+    private void Parameterize() {
+      Evaluator.WeightsParameter.ActualName = WeightsParameter.Name;
+      Evaluator.DistancesParameter.ActualName = DistancesParameter.Name;
+      Evaluator.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
+      Evaluator.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
+      Evaluator.DemandsParameter.ActualName = DemandsParameter.Name;
+      Evaluator.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
+      Evaluator.AssignmentParameter.ActualName = "Assignment";
+
+      SolutionCreator.LengthParameter.Value = new IntValue(Demands.Length);
+      SolutionCreator.MinimumParameter.Value = new IntValue(0);
+      SolutionCreator.MaximumParameter.Value = new IntValue(Capacities.Length);
+      SolutionCreator.IntegerVectorParameter.ActualName = "Assignment";
+
+      foreach (IIntegerVectorCrossover op in Operators.OfType<IIntegerVectorCrossover>()) {
+        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+      }
+      foreach (IIntegerVectorManipulator op in Operators.OfType<IIntegerVectorManipulator>()) {
+        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+      }
+
       if (BestSolutionAnalyzer != null) {
         BestSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
@@ -186 +237 @@
       }
     }
-    private void ParameterizeOperators() {
-      foreach (IIntegerVectorCrossover op in Operators.OfType<IIntegerVectorCrossover>()) {
-        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-      }
-      foreach (IIntegerVectorManipulator op in Operators.OfType<IIntegerVectorManipulator>()) {
-        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-      }
-    }
-    private void ParameterizeSolutionCreator() {
-      SolutionCreator.LengthParameter.Value = new IntValue(Demands.Length);
-      SolutionCreator.MinimumParameter.Value = new IntValue(0);
-      SolutionCreator.MaximumParameter.Value = new IntValue(Capacities.Length);
-      SolutionCreator.IntegerVectorParameter.ActualName = "Assignment";
-    }
-    private void ParameterizeEvaluator() {
-      Evaluator.WeightsParameter.ActualName = WeightsParameter.Name;
-      Evaluator.DistancesParameter.ActualName = DistancesParameter.Name;
-      Evaluator.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
-      Evaluator.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
-      Evaluator.DemandsParameter.ActualName = DemandsParameter.Name;
-      Evaluator.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
-      Evaluator.AssignmentParameter.ActualName = "Assignment";
-    }
     #endregion
   }

@@ -1 +1 @@
 Plugin.cs
 obj
+bin