Changeset 15510 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment

Timestamp:

12/11/17 22:10:01 (7 years ago)

Author:

abeham

Message:

#1614:

• Fixed bugs in view
• Made Evaluation object immutable
• Fixed bug in Analyze
• Fixed operators

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• . (modified) (1 prop)
• Evaluation/Evaluation.cs (modified) (4 diffs)
• Evaluation/GQAPNMoveEvaluator.cs (modified) (2 diffs)
• GQAP.cs (modified) (2 diffs)
• GQAPInstance.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user (deleted)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

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

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

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

@@ -1 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -18 +19 @@
     /// </summary>
     [Storable]
-    public double ExcessDemand { get; set; }
+    public double ExcessDemand { get; private set; }
     /// <summary>
     /// The amount of slack at each location, is negative in case of excess demand.
@@ -26 +27 @@
     /// </remarks>
     [Storable]
-    public double[] Slack { get; set; }
+    private double[] slack;
+    public IReadOnlyList<double> Slack {
+      get { return slack; }
+    }
     /// <summary>
     /// The quadratic part of the fitness function that represents the flow or transportation costs.
     /// </summary>
     [Storable]
-    public double FlowCosts { get; set; }
+    public double FlowCosts { get; private set; }
     /// <summary>
     /// The linear part of the fitness function that represents the installation costs.
     /// </summary>
     [Storable]
-    public double InstallationCosts { get; set; }
+    public double InstallationCosts { get; private set; }
     
     [StorableConstructor]
@@ -43 +47 @@
       : base(original, cloner) {
       ExcessDemand = original.ExcessDemand;
-      if (original.Slack != null)
-        Slack = original.Slack.ToArray();
+      if (original.slack != null)
+        slack = original.slack.ToArray();
       FlowCosts = original.FlowCosts;
       InstallationCosts = original.InstallationCosts;
     }
-    public Evaluation() { }
+    public Evaluation(double flowCosts, double installationCosts, double excessDemand, double[] slack) {
+      FlowCosts = flowCosts;
+      InstallationCosts = installationCosts;
+      ExcessDemand = excessDemand;
+      this.slack = slack;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.cs

@@ -85 +85 @@
     public static Evaluation Evaluate(NMove move, IntegerVector assignment, Evaluation evaluation, GQAPInstance problemInstance) {
       int moves = move.N;
-      var newEvaluation = new Evaluation() {
-        ExcessDemand = evaluation.ExcessDemand,
-        FlowCosts = evaluation.FlowCosts,
-        InstallationCosts = evaluation.InstallationCosts,
-        Slack = evaluation.Slack.ToArray()
-      };
+      var excessDemand = evaluation.ExcessDemand;
+      var flowCosts = evaluation.FlowCosts;
+      var installationCosts = evaluation.InstallationCosts;
+      var slack = evaluation.Slack.ToArray();
+
       foreach (var kvp in move.NewAssignments) {
         int equip = kvp.Key;
@@ -96 +95 @@
         int oldLoc = assignment[equip];
         var equipDemand = problemInstance.Demands[equip];
-        newEvaluation.InstallationCosts -= problemInstance.InstallationCosts[equip, oldLoc];
-        newEvaluation.InstallationCosts += problemInstance.InstallationCosts[equip, newLoc];
+        installationCosts -= problemInstance.InstallationCosts[equip, oldLoc];
+        installationCosts += problemInstance.InstallationCosts[equip, newLoc];
         for (int j = 0; j < assignment.Length; j++) {
           if (!move.NewAssignments.ContainsKey(j)) {
-            newEvaluation.FlowCosts += problemInstance.Weights[equip, j] * problemInstance.Distances[newLoc, assignment[j]];
-            newEvaluation.FlowCosts -= problemInstance.Weights[equip, j] * problemInstance.Distances[oldLoc, assignment[j]];
-            newEvaluation.FlowCosts += problemInstance.Weights[j, equip] * problemInstance.Distances[assignment[j], newLoc];
-            newEvaluation.FlowCosts -= problemInstance.Weights[j, equip] * problemInstance.Distances[assignment[j], oldLoc];
+            flowCosts += problemInstance.Weights[equip, j] * problemInstance.Distances[newLoc, assignment[j]];
+            flowCosts -= problemInstance.Weights[equip, j] * problemInstance.Distances[oldLoc, assignment[j]];
+            flowCosts += problemInstance.Weights[j, equip] * problemInstance.Distances[assignment[j], newLoc];
+            flowCosts -= problemInstance.Weights[j, equip] * problemInstance.Distances[assignment[j], oldLoc];
           } else {
-            newEvaluation.FlowCosts += problemInstance.Weights[equip, j] * problemInstance.Distances[newLoc, move.NewAssignments[j]];
-            newEvaluation.FlowCosts -= problemInstance.Weights[equip, j] * problemInstance.Distances[oldLoc, assignment[j]];
+            flowCosts += problemInstance.Weights[equip, j] * problemInstance.Distances[newLoc, move.NewAssignments[j]];
+            flowCosts -= problemInstance.Weights[equip, j] * problemInstance.Distances[oldLoc, assignment[j]];
           }
         }
-        newEvaluation.Slack[oldLoc] += equipDemand;
-        if (newEvaluation.Slack[oldLoc] < equipDemand)
-          newEvaluation.ExcessDemand -= Math.Min(equipDemand, equipDemand - newEvaluation.Slack[oldLoc]);
-        newEvaluation.Slack[newLoc] -= equipDemand;
-        if (newEvaluation.Slack[newLoc] < 0)
-          newEvaluation.ExcessDemand += Math.Min(equipDemand, -newEvaluation.Slack[newLoc]);
+        slack[oldLoc] += equipDemand;
+        if (slack[oldLoc] < equipDemand)
+          excessDemand -= Math.Min(equipDemand, equipDemand - slack[oldLoc]);
+        slack[newLoc] -= equipDemand;
+        if (slack[newLoc] < 0)
+          excessDemand += Math.Min(equipDemand, -slack[newLoc]);
       }
 
-      return newEvaluation;
+      return new Evaluation(flowCosts, installationCosts, excessDemand, slack);
     }
 

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

@@ -154 +154 @@
       }
       var archive = archiveResult.Value as GQAPAssignmentArchive;
-      if (archive == null) archive = new GQAPAssignmentArchive(ProblemInstance);
-      else archive.ProblemInstance = ProblemInstance;
+      if (archive == null) {
+        archive = new GQAPAssignmentArchive(ProblemInstance);
+        archiveResult.Value = archive;
+      } else archive.ProblemInstance = ProblemInstance;
       
       var combinedArchive = solutions
@@ -401 +403 @@
 
     private void InitializeOperators() {
-      Operators.Clear();
+      Operators.RemoveAll(x => x is ISingleObjectiveMoveOperator);
+      Operators.RemoveAll(x => x is SingleObjectiveImprover);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
-      Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPMoveEvaluator>());
       Operators.Add(new HammingSimilarityCalculator() { SolutionVariableName = Encoding.Name, QualityVariableName = Evaluator.QualityParameter.ActualName });

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

@@ -214 +214 @@
         slack[assignI] -= demands[i];
       }
-      return new Evaluation() {
-        ExcessDemand = overbookedCapacity,
-        FlowCosts = flowDistanceQuality,
-        InstallationCosts = installationQuality,
-        Slack = slack
-      };
+      return new Evaluation(flowDistanceQuality, installationQuality, overbookedCapacity, slack);
     }
 

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