Changeset 7418

Timestamp:

01/27/12 02:01:25 (13 years ago)

Author:

abeham

Message:

#1614

• Added shaking operator based on n-moves
• Added pareto analyzer regarding flowdistance and installation qualities

Location:

branches/GeneralizedQAP

Files:

• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.Designer.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.resx (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs (modified) (10 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs (modified) (4 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPSolution.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (5 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPManipulator.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPManipulator.cs (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/NMoveShakingOperator.cs (added)

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

@@ -46 +46 @@
     protected override void DeregisterContentEvents() {
       Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
+      Content.Solution.PropertyChanged -= new PropertyChangedEventHandler(ContentSolution_PropertyChanged);
       base.DeregisterContentEvents();
     }
@@ -51 +52 @@
       base.RegisterContentEvents();
       Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
+      Content.Solution.PropertyChanged += new PropertyChangedEventHandler(ContentSolution_PropertyChanged);
     }
     #endregion
@@ -57 +59 @@
       base.OnContentChanged();
       UpdateQuality();
+      UpdateFlowDistanceQuality();
+      UpdateInstallationQuality();
+      UpdateOverbookedCapacity();
       UpdateAssignment();
     }
@@ -67 +72 @@
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
       switch (e.PropertyName) {
+        case "EquipmentNames": UpdateAssignment(); break;
+        case "LocationNames": UpdateAssignment(); break;
+        default: break;
+      }
+    }
+    private void ContentSolution_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      switch (e.PropertyName) {
         case "Quality": UpdateQuality(); break;
         case "FlowDistanceQuality": UpdateFlowDistanceQuality(); break;
@@ -72 +84 @@
         case "OverbookedCapacity": UpdateOverbookedCapacity(); break;
         case "Assignment": UpdateAssignment(); break;
-        case "EquipmentNames": UpdateAssignment(); break;
-        case "LocationNames": UpdateAssignment(); break;
         default: break;
       }
@@ -85 +95 @@
           qualityLabel.Text = "-";
         } else {
-          qualityLabel.Text = Content.Quality.ToString();
+          qualityLabel.Text = Content.Solution.Quality.ToString();
         }
       }
@@ -93 +103 @@
       if (InvokeRequired) Invoke((Action)UpdateFlowDistanceQuality);
       else {
-        if (Content == null || Content.FlowDistanceQuality == null) {
+        if (Content == null || Content.Solution.FlowDistanceQuality == null) {
           flowDistanceQualityLabel.Text = "-";
         } else {
-          flowDistanceQualityLabel.Text = Content.FlowDistanceQuality.ToString();
+          flowDistanceQualityLabel.Text = Content.Solution.FlowDistanceQuality.ToString();
         }
       }
@@ -104 +114 @@
       if (InvokeRequired) Invoke((Action)UpdateInstallationQuality);
       else {
-        if (Content == null || Content.InstallationQuality == null) {
+        if (Content == null || Content.Solution.InstallationQuality == null) {
           installationQualityLabel.Text = "-";
         } else {
-          installationQualityLabel.Text = Content.InstallationQuality.ToString();
+          installationQualityLabel.Text = Content.Solution.InstallationQuality.ToString();
         }
       }
@@ -115 +125 @@
       if (InvokeRequired) Invoke((Action)UpdateOverbookedCapacity);
       else {
-        if (Content == null || Content.OverbookedCapacity == null) {
+        if (Content == null || Content.Solution.OverbookedCapacity == null) {
           overbookedCapacityLabel.Text = "-";
         } else {
-          overbookedCapacityLabel.Text = Content.OverbookedCapacity.ToString();
+          overbookedCapacityLabel.Text = Content.Solution.OverbookedCapacity.ToString();
         }
       }
@@ -128 +138 @@
         assignmentTreeView.Nodes.Clear();
         if (Content != null) {
-          IntegerVector assignment = Content.Assignment;
+          IntegerVector assignment = Content.Solution.Assignment;
           Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>();
           for (int i = 0; i < assignment.Length; i++) {

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
@@ -74 +75 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -85 +88 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GQAPAssignmentArchiveView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GQAPAssignmentArchiveView.Designer.cs">
+      <DependentUpon>GQAPAssignmentArchiveView.cs</DependentUpon>
+    </Compile>
     <Compile Include="GQAPAssignmentView.cs">
       <SubType>UserControl</SubType>
@@ -106 +115 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="GQAPAssignmentArchiveView.resx">
+      <DependentUpon>GQAPAssignmentArchiveView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GQAPAssignmentView.resx">
       <DependentUpon>GQAPAssignmentView.cs</DependentUpon>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

@@ -130 +130 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (!Parameters.ContainsKey("EquipmentNames"))
-        Parameters.Add(new LookupParameter<StringArray>("EquipmentNames", "Optional: A list of names that describes the equipments."));
-      if (!Parameters.ContainsKey("LocationNames"))
-        Parameters.Add(new LookupParameter<StringArray>("LocationNames", "Optional: A list of names that describes the locations."));
-      #endregion
-    }
-
     public override IOperation Apply() {
       var assignments = AssignmentParameter.ActualValue;
@@ -172 +161 @@
       GQAPAssignment assignment = BestSolutionParameter.ActualValue;
       if (assignment == null) {
-        assignment = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(),
-          equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts,
-          overbookedCapacityPenalty, flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex]);
+        assignment = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(), flowDistanceQualities[bestIndex], overbookedCapacities[bestIndex], installationQualities[bestIndex], equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
         assignment.Distances = distances;
         BestSolutionParameter.ActualValue = assignment;
         results.Add(new Result("Best GQAP Solution", assignment));
       } else {
-        if (HasSolutionImproved(assignment.Quality.Value, qualities[bestIndex].Value, maximization)) {
-          assignment.Assignment = (IntegerVector)assignments[bestIndex].Clone();
-          assignment.Quality = (DoubleValue)qualities[bestIndex].Clone();
+        if (HasSolutionImproved(assignment.Solution.Quality.Value, qualities[bestIndex].Value, maximization)) {
+          assignment.Solution = new GQAPSolution((IntegerVector)assignments[bestIndex].Clone(),
+            (DoubleValue)qualities[bestIndex].Clone(), (DoubleValue)flowDistanceQualities[bestIndex].Clone(),
+            (DoubleValue)installationQualities[bestIndex].Clone(), (DoubleValue)overbookedCapacities[bestIndex].Clone());
           assignment.EquipmentNames = equipmentNames;
           assignment.LocationNames = locationNames;
@@ -191 +179 @@
           assignment.TransportationCosts = transportationCosts;
           assignment.OverbookedCapacityPenalty = overbookedCapacityPenalty;
-          assignment.FlowDistanceQuality = (DoubleValue)flowDistanceQualities[bestIndex].Clone();
-          assignment.InstallationQuality = (DoubleValue)installationQualities[bestIndex].Clone();
-          assignment.OverbookedCapacity = (DoubleValue)overbookedCapacities[bestIndex].Clone();
         }
       }

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

@@ -33 +33 @@
 
     [Storable]
-    private IntegerVector assignment;
-    public IntegerVector Assignment {
-      get { return assignment; }
+    private GQAPSolution solution;
+    public GQAPSolution Solution {
+      get { return solution; }
       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");
+        bool changed = (solution != value);
+        solution = value;
+        if (changed) OnPropertyChanged("Solution");
       }
     }
@@ -153 +142 @@
     }
 
-    [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");
-      }
-    }
-
     [StorableConstructor]
     private GQAPAssignment(bool deserializing) : base(deserializing) { }
     private GQAPAssignment(GQAPAssignment original, Cloner cloner)
       : base(original, cloner) {
-      assignment = cloner.Clone(original.assignment);
-      quality = cloner.Clone(original.quality);
       equipmentNames = cloner.Clone(original.equipmentNames);
       locationNames = cloner.Clone(original.locationNames);
@@ -201 +155 @@
       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)
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue installationQuality, DoubleValue overbookedCapacity)
       : base() {
-      this.assignment = assignment;
-      this.quality = quality;
+      this.solution = new GQAPSolution(assignment, quality, flowDistanceQuality, installationQuality, overbookedCapacity);
     }
-    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) {
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue overbookedCapacity, DoubleValue installationQuality, StringArray equipmentNames, StringArray locationNames, DoubleMatrix distances, DoubleMatrix weights, DoubleMatrix installationCosts, DoubleArray demands, DoubleArray capacities, DoubleValue transportationCosts, DoubleValue overbookedCapacityPenalty)
+      : this(assignment, quality, flowDistanceQuality, installationQuality, overbookedCapacity) {
       this.distances = distances;
       this.weights = weights;
@@ -227 +169 @@
       this.transportationCosts = transportationCosts;
       this.overbookedCapacityPenalty = overbookedCapacityPenalty;
-      this.flowDistanceQuality = flowDistanceQuality;
-      this.installationQuality = installationQuality;
-      this.overbookedCapacity = overbookedCapacity;
     }
 

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

@@ -116 +116 @@
 
     public BestGQAPSolutionAnalyzer BestSolutionAnalyzer {
-      get { return Operators.OfType<BestGQAPSolutionAnalyzer>().First(); }
+      get { return Operators.OfType<BestGQAPSolutionAnalyzer>().FirstOrDefault(); }
+    }
+    public GQAPSolutionArchiveAnalyzer SolutionArchiveAnalyzer {
+      get { return Operators.OfType<GQAPSolutionArchiveAnalyzer>().FirstOrDefault(); }
     }
 
@@ -165 +168 @@
 
       SolutionCreator.AssignmentParameter.ActualName = "Assignment";
-      Parameterize();
 
       InitializeOperators();
@@ -212 +214 @@
     private void InitializeOperators() {
       Operators.Add(new BestGQAPSolutionAnalyzer());
+      Operators.Add(new GQAPSolutionArchiveAnalyzer());
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>());
@@ -263 +266 @@
       }
       foreach (var op in Operators.OfType<IGQAPManipulator>()) {
-        op.IntegerVectorParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IGQAPMerger>()) {
@@ -305 +308 @@
         BestSolutionAnalyzer.LocationNamesParameter.ActualName = LocationNamesParameter.Name;
       }
+      if (SolutionArchiveAnalyzer != null) {
+        SolutionArchiveAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        SolutionArchiveAnalyzer.DistancesParameter.ActualName = DistancesParameter.Name;
+        SolutionArchiveAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
+        SolutionArchiveAnalyzer.InstallationCostsParameter.ActualName = InstallationCostsParameter.Name;
+        SolutionArchiveAnalyzer.DemandsParameter.ActualName = DemandsParameter.Name;
+        SolutionArchiveAnalyzer.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
+        SolutionArchiveAnalyzer.TransportationCostsParameter.ActualName = TransportationCostsParameter.Name;
+        SolutionArchiveAnalyzer.OverbookedCapacityPenaltyParameter.ActualName = OverbookedCapacityPenaltyParameter.Name;
+        SolutionArchiveAnalyzer.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        SolutionArchiveAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        SolutionArchiveAnalyzer.FlowDistanceQualityParameter.ActualName = Evaluator.FlowDistanceQualityParameter.ActualName;
+        SolutionArchiveAnalyzer.InstallationQualityParameter.ActualName = Evaluator.InstallationQualityParameter.ActualName;
+        SolutionArchiveAnalyzer.OverbookedCapacityParameter.ActualName = Evaluator.OverbookedCapacityParameter.ActualName;
+        SolutionArchiveAnalyzer.ResultsParameter.ActualName = "Results";
+        SolutionArchiveAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
+        SolutionArchiveAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+        SolutionArchiveAnalyzer.EquipmentNamesParameter.ActualName = EquipmentNamesParameter.Name;
+        SolutionArchiveAnalyzer.LocationNamesParameter.ActualName = LocationNamesParameter.Name;
+      }
     }
     #endregion

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

@@ -70 +70 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -89 +90 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestGQAPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\GQAPSolutionArchiveAnalyzer.cs" />
     <Compile Include="Evaluators\GQAPNMoveEvaluator.cs" />
     <Compile Include="GQAPAssignment.cs" />
@@ -94 +96 @@
     <Compile Include="Evaluators\GQAPEvaluator.cs" />
     <Compile Include="GeneralizedQuadraticAssignmentProblem.cs" />
+    <Compile Include="GQAPAssignmentArchive.cs" />
     <Compile Include="GQAPIntegerVectorProximityCalculator.cs" />
+    <Compile Include="GQAPSolution.cs" />
     <Compile Include="Interfaces\IGQAPMerger.cs" />
     <Compile Include="Interfaces\IGQAPNMoveEvaluator.cs" />
@@ -122 +126 @@
     <Compile Include="Operators\GQAPSolutionCreator.cs" />
     <Compile Include="Operators\GreedyRandomizedSolutionCreator.cs" />
+    <Compile Include="Operators\NMoveShakingOperator.cs" />
     <Compile Include="Operators\QualitySimilarityMerger.cs" />
     <Compile Include="Operators\RandomSolutionCreator.cs" />

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPManipulator.cs

@@ -27 +27 @@
   public interface IGQAPManipulator : IGQAPOperator, IManipulator {
     ILookupParameter<IRandom> RandomParameter { get; }
-    ILookupParameter<IntegerVector> IntegerVectorParameter { get; }
+    ILookupParameter<IntegerVector> AssignmentParameter { get; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPManipulator.cs

@@ -38 +38 @@
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ILookupParameter<IntegerVector> IntegerVectorParameter {
+    public ILookupParameter<IntegerVector> AssignmentParameter {
       get { return (ILookupParameter<IntegerVector>)Parameters["IntegerVector"]; }
     }
@@ -52 +52 @@
 
     public sealed override IOperation Apply() {
-      Manipulate(RandomParameter.ActualValue, IntegerVectorParameter.ActualValue);
+      Manipulate(RandomParameter.ActualValue, AssignmentParameter.ActualValue);
       return base.Apply();
     }