Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3

Timestamp:

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

Author:

abeham

Message:

#1614: refactored code

• change problem to derive from basic problem
• using a combined instance class instead of individual parameters

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3

Files:

• GQAPAssignmentArchiveView.Designer.cs (modified) (1 diff)
• GQAPAssignmentArchiveView.cs (modified) (3 diffs)
• GQAPAssignmentView.Designer.cs (modified) (1 diff)
• GQAPAssignmentView.cs (modified) (13 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -85 +85 @@
           if (Content == null) return;
           foreach (var solution in Content.Solutions) {
-            if (solution.OverbookedCapacity.Value <= 0.0) {
-              paretoFrontChart.Series[0].Points.AddXY(solution.FlowDistanceQuality.Value, solution.InstallationQuality.Value);
+            if (solution.Evaluation.ExcessDemand <= 0.0) {
+              paretoFrontChart.Series[0].Points.AddXY(solution.Evaluation.FlowCosts, solution.Evaluation.InstallationCosts);
               paretoFrontChart.Series[0].Points.Last().Tag = solution;
             }
@@ -101 +101 @@
       if (h.ChartElementType == ChartElementType.DataPoint) {
         var solution = (GQAPSolution)((DataPoint)h.Object).Tag;
-        var assignment = new GQAPAssignment(solution.Assignment, solution.Quality, solution.FlowDistanceQuality, solution.InstallationQuality, solution.OverbookedCapacity, Content.EquipmentNames, Content.LocationNames, Content.Distances, Content.Weights, Content.InstallationCosts, Content.Demands, Content.Capacities, Content.TransportationCosts, Content.ExpectedRandomQuality, Content.Evaluator);
+        var assignment = new GQAPAssignment(solution.Assignment, Content.ProblemInstance, solution.Evaluation);
 
         var view = MainFormManager.MainForm.ShowContent(assignment);

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.MainForm;
@@ -131 +130 @@
           qualityLabel.Text = "-";
         } else {
-          qualityLabel.Text = Content.Quality.ToString();
+          qualityLabel.Text = Content.ProblemInstance.ToSingleObjective(Content.Evaluation).ToString();
         }
       }
@@ -139 +138 @@
       if (InvokeRequired) Invoke((Action)UpdateFlowDistanceQuality);
       else {
-        if (Content == null || Content.FlowDistanceQuality == null) {
+        if (Content == null || Content.Evaluation == null) {
           flowDistanceQualityLabel.Text = "-";
         } else {
-          flowDistanceQualityLabel.Text = Content.FlowDistanceQuality.ToString();
+          flowDistanceQualityLabel.Text = Content.Evaluation.FlowCosts.ToString();
         }
       }
@@ -150 +149 @@
       if (InvokeRequired) Invoke((Action)UpdateInstallationQuality);
       else {
-        if (Content == null || Content.InstallationQuality == null) {
+        if (Content == null || Content.Evaluation == null) {
           installationQualityLabel.Text = "-";
         } else {
-          installationQualityLabel.Text = Content.InstallationQuality.ToString();
+          installationQualityLabel.Text = Content.Evaluation.InstallationCosts.ToString();
         }
       }
@@ -161 +160 @@
       if (InvokeRequired) Invoke((Action)UpdateOverbookedCapacity);
       else {
-        if (Content == null || Content.OverbookedCapacity == null) {
+        if (Content == null || Content.Evaluation == null) {
           overbookedCapacityLabel.Text = "-";
         } else {
-          overbookedCapacityLabel.Text = Content.OverbookedCapacity.ToString();
+          overbookedCapacityLabel.Text = Content.Evaluation.ExcessDemand.ToString();
         }
       }
@@ -179 +178 @@
             if (!locationNodes.ContainsKey(assignment[i])) {
               string locationName = assignment[i].ToString();
-              if (Content.LocationNames != null && Content.LocationNames.Length > assignment[i])
-                locationName = Content.LocationNames[assignment[i]];
+              if (Content.ProblemInstance.LocationNames != null && Content.ProblemInstance.LocationNames.Length > assignment[i])
+                locationName = Content.ProblemInstance.LocationNames[assignment[i]];
               locationNodes.Add(assignment[i], new LocationNode(assignment[i], locationName));
             }
             string equipmentName = i.ToString();
-            if (Content.EquipmentNames != null && Content.EquipmentNames.Length > i)
-              equipmentName = Content.EquipmentNames[i];
+            if (Content.ProblemInstance.EquipmentNames != null && Content.ProblemInstance.EquipmentNames.Length > i)
+              equipmentName = Content.ProblemInstance.EquipmentNames[i];
             locationNodes[assignment[i]].Nodes.Add(new EquipmentNode(i, equipmentName));
           }
@@ -205 +204 @@
       foreach (var node in GetAllSubNodes(assignmentTreeView.Nodes).OfType<EquipmentNode>()) {
         int location = Content.Assignment[node.Equipment];
-        installationCosts[node] = Content.InstallationCosts[node.Equipment, location];
+        installationCosts[node] = Content.ProblemInstance.InstallationCosts[node.Equipment, location];
       }
       double max = installationCosts.Values.Max();
@@ -224 +223 @@
       int equipment = selectedNode.Equipment;
       double rowSum = 0, colSum = 0;
-      for (int i = 0; i < Content.Weights.Columns; i++)
-        if (i != equipment) rowSum += Content.Weights[equipment, i];
-      for (int i = 0; i < Content.Weights.Rows; i++)
-        if (i != equipment) colSum += Content.Weights[i, equipment];
+      for (int i = 0; i < Content.ProblemInstance.Weights.Columns; i++)
+        if (i != equipment) rowSum += Content.ProblemInstance.Weights[equipment, i];
+      for (int i = 0; i < Content.ProblemInstance.Weights.Rows; i++)
+        if (i != equipment) colSum += Content.ProblemInstance.Weights[i, equipment];
 
       var otherEquipments = GetAllSubNodes(assignmentTreeView.Nodes)
@@ -240 +239 @@
           other.ForeColor = assignmentTreeView.ForeColor;
         } else {
-          double rowInvProportion = rowSum == 0 ? 1.0 : (rowSum - Content.Weights[equipment, other.Equipment]) / rowSum;
-          double colInvProportion = colSum == 0 ? 1.0 : (colSum - Content.Weights[other.Equipment, equipment]) / colSum;
+          double rowInvProportion = rowSum == 0 ? 1.0 : (rowSum - Content.ProblemInstance.Weights[equipment, other.Equipment]) / rowSum;
+          double colInvProportion = colSum == 0 ? 1.0 : (colSum - Content.ProblemInstance.Weights[other.Equipment, equipment]) / colSum;
           int colorComponent = (int)(255 * Math.Pow(Math.Min(rowInvProportion, colInvProportion), 2));
           other.BackColor = Color.FromArgb(colorComponent, 255, colorComponent);
@@ -258 +257 @@
         rowSums[e] = 0;
         colSums[e] = 0;
-        for (int i = 0; i < Content.Weights.Columns; i++) {
-          if (!equipments.Contains(i)) rowSums[e] += Content.Weights[e, i];
-          if (!equipments.Contains(i)) colSums[e] += Content.Weights[i, e];
+        for (int i = 0; i < Content.ProblemInstance.Weights.Columns; i++) {
+          if (!equipments.Contains(i)) rowSums[e] += Content.ProblemInstance.Weights[e, i];
+          if (!equipments.Contains(i)) colSums[e] += Content.ProblemInstance.Weights[i, e];
         }
       }
@@ -272 +271 @@
           other.ForeColor = assignmentTreeView.ForeColor;
         } else {
-          double rowInvProportion = relevantEquipments.Min(x => rowSums[x] == 0 ? 1.0 : (rowSums[x] - Content.Weights[x, other.Equipment]) / rowSums[x]);
-          double colInvProportion = relevantEquipments.Min(x => colSums[x] == 0 ? 1.0 : (colSums[x] - Content.Weights[other.Equipment, x]) / colSums[x]);
+          double rowInvProportion = relevantEquipments.Min(x => rowSums[x] == 0 ? 1.0 : (rowSums[x] - Content.ProblemInstance.Weights[x, other.Equipment]) / rowSums[x]);
+          double colInvProportion = relevantEquipments.Min(x => colSums[x] == 0 ? 1.0 : (colSums[x] - Content.ProblemInstance.Weights[other.Equipment, x]) / colSums[x]);
           int colorComponent = (int)(255 * Math.Pow(Math.Min(rowInvProportion, colInvProportion), 2));
           other.BackColor = Color.FromArgb(colorComponent, 255, colorComponent);
@@ -314 +313 @@
 
     private void recalculateButton_Click(object sender, EventArgs e) {
-      double fdq, iq, oc;
-      Content.Evaluator.Evaluate(Content.Assignment, Content.Weights,
-        Content.Distances, Content.InstallationCosts, Content.Demands,
-        Content.Capacities, out fdq, out iq, out oc);
-      Content.FlowDistanceQuality = new DoubleValue(fdq);
-      Content.InstallationQuality = new DoubleValue(iq);
-      Content.OverbookedCapacity = new DoubleValue(oc);
-      Content.Quality = new DoubleValue(
-        Content.Evaluator.GetFitness(fdq, iq, oc,
-        Content.TransportationCosts.Value, Content.ExpectedRandomQuality.Value));
+      Content.Evaluation = Content.ProblemInstance.Evaluate(Content.Assignment);
     }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]