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

Timestamp:

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

Author:

abeham

Message:

#1614

• updated GQAP

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• . (modified) (1 prop)
• GQAPAssignment.cs (modified) (3 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/GQAPAssignment.cs

@@ -76 +76 @@
     }
 
+    [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");
+      }
+    }
+
     [StorableConstructor]
     private GQAPAssignment(bool deserializing) : base(deserializing) { }
@@ -84 +106 @@
       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) {
@@ -92 +116 @@
       : this(weights, assignment) {
       this.quality = quality;
+    }
+    public GQAPAssignment(DoubleMatrix weights, IntegerVector assignment, DoubleValue quality, StringArray equipmentNames, StringArray locationNames)
+      : this(weights, assignment, quality) {
+      this.equipmentNames = equipmentNames;
+      this.locationNames = locationNames;
     }
 

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