Changeset 7437 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment

Timestamp:

02/01/12 00:14:00 (13 years ago)

Author:

abeham

Message:

#1614

• Allowed to view the solution of a certain point in the pareto chart
• Added multi crossovers and manipulators
• Added population diversity analyzer
• Fixed a few bugs

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (1 diff)
• Analyzers/GQAPPopulationDiversityAnalyzer.cs (added)
• Analyzers/GQAPSolutionArchiveAnalyzer.cs (modified) (1 diff)
• GQAPAssignment.cs (modified) (1 diff)
• GeneralizedQuadraticAssignmentProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj (modified) (5 diffs)
• Interfaces/IGQAPManipulator.cs (added)
• Operators/GQAPManipulator.cs (modified) (1 diff)
• Operators/MultiGQAPCrossover.cs (added)
• Operators/MultiGQAPManipulator.cs (added)

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

@@ -165 +165 @@
       GQAPAssignment assignment = BestSolutionParameter.ActualValue;
       if (assignment == null) {
-        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 = new GQAPAssignment((IntegerVector)assignments[bestIndex].Clone(), (DoubleValue)qualities[bestIndex].Clone(), flowDistanceQualities[bestIndex], installationQualities[bestIndex], overbookedCapacities[bestIndex], equipmentNames, locationNames, distances, weights, installationCosts, demands, capacities, transportationCosts, overbookedCapacityPenalty);
         assignment.Distances = distances;
         BestSolutionParameter.ActualValue = assignment;

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

@@ -178 +178 @@
             && front[i].InstallationQuality.Value > front[j].InstallationQuality.Value) {
             front.RemoveAt(i);
-            j = i + 1;
+            j = i;
           }
         }

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

@@ -160 +160 @@
       this.solution = new GQAPSolution(assignment, quality, flowDistanceQuality, installationQuality, overbookedCapacity);
     }
-    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)
+    public GQAPAssignment(IntegerVector assignment, DoubleValue quality, DoubleValue flowDistanceQuality, DoubleValue installationQuality, DoubleValue overbookedCapacity, 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.equipmentNames = equipmentNames;
+      this.locationNames = locationNames;
       this.distances = distances;
       this.weights = weights;

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

@@ -229 +229 @@
 
     private void InitializeOperators() {
+      Operators.Clear();
       Operators.Add(new BestGQAPSolutionAnalyzer());
       Operators.Add(new GQAPSolutionArchiveAnalyzer());

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -90 +94 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestGQAPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\GQAPPopulationDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\GQAPSolutionArchiveAnalyzer.cs" />
     <Compile Include="Evaluators\GQAPNMoveEvaluator.cs" />
@@ -98 +103 @@
     <Compile Include="GQAPAssignmentArchive.cs" />
     <Compile Include="GQAPSolution.cs" />
+    <Compile Include="Interfaces\IGQAPManipulator.cs" />
     <Compile Include="Interfaces\IQualitiesAwareGQAPOperator.cs" />
     <Compile Include="Interfaces\IAssignmentsAwareGQAPOperator.cs" />
@@ -130 +136 @@
     <Compile Include="Moves\StochasticNMoveSingleMoveGenerator.cs" />
     <Compile Include="Operators\ApproximateLocalSearch.cs" />
+    <Compile Include="Operators\MultiGQAPCrossover.cs" />
     <Compile Include="Operators\GQAPPathRelinking.cs" />
     <Compile Include="Operators\GQAPStochasticSolutionCreator.cs" />
@@ -137 +144 @@
     <Compile Include="Operators\GQAPSolutionCreator.cs" />
     <Compile Include="Operators\GreedyRandomizedSolutionCreator.cs" />
+    <Compile Include="Operators\MultiGQAPManipulator.cs" />
     <Compile Include="Operators\NMoveShakingOperator.cs" />
     <Compile Include="Operators\QualitySimilarityMerger.cs" />

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

@@ -31 +31 @@
   [Item("GQAPManipulator", "A base class for operators that manipulate assignment vectors of the GeneralizedQuadraticAssignment problems.")]
   [StorableClass]
-  public abstract class GQAPManipulator : SingleSuccessorOperator, IAssignmentAwareGQAPOperator, IManipulator, IStochasticOperator {
+  public abstract class GQAPManipulator : SingleSuccessorOperator, IGQAPManipulator, IAssignmentAwareGQAPOperator, IStochasticOperator {
     public override bool CanChangeName {
       get { return false; }