Changeset 7415 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs

Timestamp:

01/26/12 14:50:56 (12 years ago)

Author:

abeham

Message:

#1614: improved results output of GQAP

File:

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

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

@@ -33 +33 @@
 
     [Storable]
+    private IntegerVector assignment;
+    public IntegerVector Assignment {
+      get { return assignment; }
+      set {
+        bool changed = (assignment != value);
+        assignment = value;
+        if (changed) OnPropertyChanged("Assignment");
+      }
+    }
+
+    [Storable]
+    private DoubleValue quality;
+    public DoubleValue Quality {
+      get { return quality; }
+      set {
+        bool changed = (quality != value);
+        quality = value;
+        if (changed) OnPropertyChanged("Quality");
+      }
+    }
+
+    [Storable]
+    private StringArray equipmentNames;
+    public StringArray EquipmentNames {
+      get { return equipmentNames; }
+      set {
+        bool changed = (equipmentNames != value);
+        equipmentNames = value;
+        if (changed) OnPropertyChanged("EquipmentNames");
+      }
+    }
+
+    [Storable]
+    private StringArray locationNames;
+    public StringArray LocationNames {
+      get { return locationNames; }
+      set {
+        bool changed = (locationNames != value);
+        locationNames = value;
+        if (changed) OnPropertyChanged("LocationNames");
+      }
+    }
+
+    [Storable]
     private DoubleMatrix distances;
     public DoubleMatrix Distances {
@@ -55 +99 @@
 
     [Storable]
-    private IntegerVector assignment;
-    public IntegerVector Assignment {
-      get { return assignment; }
-      set {
-        bool changed = (assignment != value);
-        assignment = value;
-        if (changed) OnPropertyChanged("Assignment");
-      }
-    }
-
-    [Storable]
-    private DoubleValue quality;
-    public DoubleValue Quality {
-      get { return quality; }
-      set {
-        bool changed = (quality != value);
-        quality = value;
-        if (changed) OnPropertyChanged("Quality");
-      }
-    }
-
-    [Storable]
-    private StringArray equipmentNames;
-    public StringArray EquipmentNames {
-      get { return equipmentNames; }
-      set {
-        bool changed = (equipmentNames != value);
-        equipmentNames = value;
-        if (changed) OnPropertyChanged("EquipmentNames");
-      }
-    }
-
-    [Storable]
-    private StringArray locationNames;
-    public StringArray LocationNames {
-      get { return locationNames; }
-      set {
-        bool changed = (locationNames != value);
-        locationNames = value;
-        if (changed) OnPropertyChanged("LocationNames");
+    private DoubleMatrix installationCosts;
+    public DoubleMatrix InstallationCosts {
+      get { return installationCosts; }
+      set {
+        bool changed = (installationCosts != value);
+        installationCosts = value;
+        if (changed) OnPropertyChanged("InstallationCosts");
+      }
+    }
+
+    [Storable]
+    private DoubleArray demands;
+    public DoubleArray Demands {
+      get { return demands; }
+      set {
+        bool changed = (demands != value);
+        demands = value;
+        if (changed) OnPropertyChanged("Demands");
+      }
+    }
+
+    [Storable]
+    private DoubleArray capacities;
+    public DoubleArray Capacities {
+      get { return capacities; }
+      set {
+        bool changed = (capacities != value);
+        capacities = value;
+        if (changed) OnPropertyChanged("Capacities");
+      }
+    }
+
+    [Storable]
+    private DoubleValue transportationCosts;
+    public DoubleValue TransportationCosts {
+      get { return transportationCosts; }
+      set {
+        bool changed = (transportationCosts != value);
+        transportationCosts = value;
+        if (changed) OnPropertyChanged("TransportationCosts");
+      }
+    }
+
+    [Storable]
+    private DoubleValue overbookedCapacityPenalty;
+    public DoubleValue OverbookedCapacityPenalty {
+      get { return overbookedCapacityPenalty; }
+      set {
+        bool changed = (overbookedCapacityPenalty != value);
+        overbookedCapacityPenalty = value;
+        if (changed) OnPropertyChanged("OverbookedCapacityPenalty");
+      }
+    }
+
+    [Storable]
+    private DoubleValue flowDistanceQuality;
+    public DoubleValue FlowDistanceQuality {
+      get { return flowDistanceQuality; }
+      set {
+        bool changed = (flowDistanceQuality != value);
+        flowDistanceQuality = value;
+        if (changed) OnPropertyChanged("FlowDistanceQuality");
+      }
+    }
+
+    [Storable]
+    private DoubleValue installationQuality;
+    public DoubleValue InstallationQuality {
+      get { return installationQuality; }
+      set {
+        bool changed = (installationQuality != value);
+        installationQuality = value;
+        if (changed) OnPropertyChanged("InstallationQuality");
+      }
+    }
+
+    [Storable]
+    private DoubleValue overbookedCapacity;
+    public DoubleValue OverbookedCapacity {
+      get { return overbookedCapacity; }
+      set {
+        bool changed = (overbookedCapacity != value);
+        overbookedCapacity = value;
+        if (changed) OnPropertyChanged("OverbookedCapacity");
       }
     }
@@ -102 +190 @@
     private GQAPAssignment(GQAPAssignment original, Cloner cloner)
       : base(original, cloner) {
-      distances = cloner.Clone(original.distances);
-      weights = cloner.Clone(original.weights);
       assignment = cloner.Clone(original.assignment);
       quality = cloner.Clone(original.quality);
       equipmentNames = cloner.Clone(original.equipmentNames);
       locationNames = cloner.Clone(original.locationNames);
-    }
-    public GQAPAssignment(DoubleMatrix weights, IntegerVector assignment) {
-      this.weights = weights;
+      distances = cloner.Clone(original.distances);
+      weights = cloner.Clone(original.weights);
+      installationCosts = cloner.Clone(original.installationCosts);
+      demands = cloner.Clone(original.demands);
+      capacities = cloner.Clone(original.capacities);
+      transportationCosts = cloner.Clone(original.transportationCosts);
+      overbookedCapacityPenalty = cloner.Clone(original.overbookedCapacityPenalty);
+      flowDistanceQuality = cloner.Clone(original.flowDistanceQuality);
+      installationQuality = cloner.Clone(original.installationQuality);
+      overbookedCapacity = cloner.Clone(original.overbookedCapacity);
+    }
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality)
+      : base() {
       this.assignment = assignment;
-    }
-    public GQAPAssignment(DoubleMatrix weights, IntegerVector assignment, DoubleValue quality)
-      : this(weights, assignment) {
       this.quality = quality;
     }
-    public GQAPAssignment(DoubleMatrix weights, IntegerVector assignment, DoubleValue quality, StringArray equipmentNames, StringArray locationNames)
-      : this(weights, assignment, quality) {
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, StringArray equipmentNames, StringArray locationNames)
+      : this(assignment, quality) {
       this.equipmentNames = equipmentNames;
       this.locationNames = locationNames;
+    }
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, StringArray equipmentNames, StringArray locationNames,
+      DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities,
+      DoubleValue transportationCosts, DoubleValue overbookedCapacityPenalty, DoubleValue flowDistanceQuality,
+      DoubleValue installationQuality, DoubleValue overbookedCapacity)
+      : this(assignment, quality, equipmentNames, locationNames) {
+      this.distances = distances;
+      this.weights = weights;
+      this.installationCosts = installationCosts;
+      this.demands = demands;
+      this.capacities = capacities;
+      this.transportationCosts = transportationCosts;
+      this.overbookedCapacityPenalty = overbookedCapacityPenalty;
+      this.flowDistanceQuality = flowDistanceQuality;
+      this.installationQuality = installationQuality;
+      this.overbookedCapacity = overbookedCapacity;
     }