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

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

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs (modified) (3 diffs)

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

@@ -61 +61 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      UpdateQuality();
-      UpdateFlowDistanceQuality();
-      UpdateInstallationQuality();
-      UpdateOverbookedCapacity();
+      UpdateEvaluation();
       UpdateAssignment();
       if (Content != null) assignmentView.Content = Content.Assignment;
@@ -77 +74 @@
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
       switch (e.PropertyName) {
-        case "Quality": UpdateQuality(); break;
-        case "FlowDistanceQuality": UpdateFlowDistanceQuality(); break;
-        case "InstallationQuality": UpdateInstallationQuality(); break;
-        case "OverbookedCapacity": UpdateOverbookedCapacity(); break;
-        case "Assignment": UpdateAssignment(); break;
-        case "EquipmentNames": UpdateAssignment(); break;
-        case "LocationNames": UpdateAssignment(); break;
+        case nameof(Content.Evaluation): UpdateEvaluation(); break;
+        case nameof(Content.Assignment): UpdateAssignment(); break;
+        case nameof(Content.ProblemInstance): UpdateEvaluation(); UpdateAssignment(); break;
         default: break;
       }
@@ -124 +117 @@
 
     #region Helpers
-    private void UpdateQuality() {
-      if (InvokeRequired) Invoke((Action)UpdateQuality);
+    private void UpdateEvaluation() {
+      if (InvokeRequired) Invoke((Action)UpdateEvaluation);
       else {
         if (Content == null) {
           qualityLabel.Text = "-";
+          flowDistanceQualityLabel.Text = "-";
+          installationQualityLabel.Text = "-";
+          overbookedCapacityLabel.Text = "-";
         } else {
           qualityLabel.Text = Content.ProblemInstance.ToSingleObjective(Content.Evaluation).ToString();
-        }
-      }
-    }
-
-    private void UpdateFlowDistanceQuality() {
-      if (InvokeRequired) Invoke((Action)UpdateFlowDistanceQuality);
-      else {
-        if (Content == null || Content.Evaluation == null) {
-          flowDistanceQualityLabel.Text = "-";
-        } else {
           flowDistanceQualityLabel.Text = Content.Evaluation.FlowCosts.ToString();
-        }
-      }
-    }
-
-    private void UpdateInstallationQuality() {
-      if (InvokeRequired) Invoke((Action)UpdateInstallationQuality);
-      else {
-        if (Content == null || Content.Evaluation == null) {
-          installationQualityLabel.Text = "-";
-        } else {
           installationQualityLabel.Text = Content.Evaluation.InstallationCosts.ToString();
-        }
-      }
-    }
-
-    private void UpdateOverbookedCapacity() {
-      if (InvokeRequired) Invoke((Action)UpdateOverbookedCapacity);
-      else {
-        if (Content == null || Content.Evaluation == null) {
-          overbookedCapacityLabel.Text = "-";
-        } else {
           overbookedCapacityLabel.Text = Content.Evaluation.ExcessDemand.ToString();
         }