Changeset 7363

Timestamp:

01/18/12 16:55:08 (12 years ago)

Author:

abeham

Message:

#1614

• worked on GQAP

Location:

branches/GeneralizedQAP

Files:

• GeneralizedQAP.sln (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs (modified) (11 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinkingMainLoop.cs (modified) (5 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3 (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/ExtensionMethods.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/IMerger.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/Properties (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPManipulator.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame (modified) (1 diff)

branches/GeneralizedQAP/GeneralizedQAP.sln

@@ -6 +6 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj", "{BFAAC00C-B884-458D-BD74-98C94BFAFA41}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3.csproj", "{53AB48BF-532F-417D-B98B-745105BB447A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj", "{DA367BE5-4F53-4243-933B-32AAB86189D5}"
+EndProject
 Global
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     Debug|Any CPU = Debug|Any CPU
+    Debug|x64 = Debug|x64
+    Debug|x86 = Debug|x86
     Release|Any CPU = Release|Any CPU
+    Release|x64 = Release|x64
+    Release|x86 = Release|x86
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {C739E6D2-5680-4804-A810-8017DA0C238F}.Debug|x86.ActiveCfg = Debug|Any CPU
     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|Any CPU.Build.0 = Release|Any CPU
+    {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x64.ActiveCfg = Release|Any CPU
+    {C739E6D2-5680-4804-A810-8017DA0C238F}.Release|x86.ActiveCfg = Release|Any CPU
     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Debug|x86.ActiveCfg = Debug|Any CPU
     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|Any CPU.Build.0 = Release|Any CPU
+    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x64.ActiveCfg = Release|Any CPU
+    {BFAAC00C-B884-458D-BD74-98C94BFAFA41}.Release|x86.ActiveCfg = Release|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Release|Any CPU.Build.0 = Release|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Release|x64.ActiveCfg = Release|Any CPU
+    {53AB48BF-532F-417D-B98B-745105BB447A}.Release|x86.ActiveCfg = Release|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Release|Any CPU.Build.0 = Release|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Release|x64.ActiveCfg = Release|Any CPU
+    {DA367BE5-4F53-4243-933B-32AAB86189D5}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
   /// <summary>
-  /// A genetic algorithm.
+  /// The algorithm combines the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking and is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.
   /// </summary>
   [Item("GRASP+PR", "The algorithm combines the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking and is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
@@ -59 +61 @@
       get { return (IValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    private IValueParameter<IntValue> EliteSetSizeParameter {
-      get { return (IValueParameter<IntValue>)Parameters["EliteSetSize"]; }
-    }
-    private IValueParameter<IntValue> LocalImprovementMaximumIterationsParameter {
-      get { return (IValueParameter<IntValue>)Parameters["LocalImprovementMaximumIterations"]; }
+    private IFixedValueParameter<IntValue> EliteSetSizeParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["EliteSetSize"]; }
+    }
+    private IFixedValueParameter<IntValue> LocalImprovementMaximumIterationsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["LocalImprovementMaximumIterations"]; }
     }
     private ConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
@@ -74 +76 @@
       get { return (ConstrainedValueParameter<ICrossover>)Parameters["PathRelinking"]; }
     }
-    public ConstrainedValueParameter<IReplacer> EliteSetReplacerParameter {
-      get { return (ConstrainedValueParameter<IReplacer>)Parameters["EliteSetReplacer"]; }
+    public ConstrainedValueParameter<IMerger> EliteSetReplacerParameter {
+      get { return (ConstrainedValueParameter<IMerger>)Parameters["EliteSetMerger"]; }
     }
     #endregion
@@ -94 +96 @@
     public IntValue EliteSetSize {
       get { return EliteSetSizeParameter.Value; }
-      set { EliteSetSizeParameter.Value = value; }
+      set { EliteSetSizeParameter.Value.Value = value.Value; }
     }
     public IntValue LocalImprovementMaximumIterations {
       get { return LocalImprovementMaximumIterationsParameter.Value; }
-      set { LocalImprovementMaximumIterationsParameter.Value = value; }
+      set { LocalImprovementMaximumIterationsParameter.Value.Value = value.Value; }
     }
 
@@ -110 +112 @@
     private GRASPWithPathRelinking(GRASPWithPathRelinking original, Cloner cloner)
       : base(original, cloner) {
-      // TODO: clone your private fields here
       RegisterEventHandlers();
     }
@@ -118 +119 @@
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator."));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each iteration.", new MultiAnalyzer()));
-      Parameters.Add(new ValueParameter<IntValue>("EliteSetSize", "The elite set stores the best found solutions.", new IntValue(10)));
-      Parameters.Add(new ValueParameter<IntValue>("LocalImprovementMaximumIterations", "The maximum number of iterations performed by the local improvement operator.", new IntValue(100)));
-      Parameters.Add(new ConstrainedValueParameter<ILocalImprovementOperator>("LocalImprovement", "Performs a local search on the solution.", null));
+      Parameters.Add(new FixedValueParameter<IntValue>("EliteSetSize", "The elite set stores the best found solutions.", new IntValue(10)));
+      Parameters.Add(new FixedValueParameter<IntValue>("LocalImprovementMaximumIterations", "The maximum number of iterations performed by the local improvement operator.", new IntValue(100)));
+      Parameters.Add(new ConstrainedValueParameter<ILocalImprovementOperator>("LocalImprovement", "Performs a local search on the solution."));
       Parameters.Add(new FixedValueParameter<IntValue>("MinimumEliteSetSize", "(ρ) The minimum amount of elites for performing path relinking.", new IntValue(1)));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("PathRelinking", "The operator that performs the path relinking."));
-      Parameters.Add(new ConstrainedValueParameter<IReplacer>("EliteSetReplacer", "The operator that replaces solutions in the elite set."));
+      Parameters.Add(new ConstrainedValueParameter<IMerger>("EliteSetMerger", "The operator that merges new solutions into the elite set."));
 
       RandomCreator randomCreator = new RandomCreator();
@@ -151 +152 @@
     #region Events
     protected override void OnProblemChanged() {
-      // TODO: Initialize and parameterize operators
       InitializeOperators();
       base.OnProblemChanged();
@@ -157 +157 @@
 
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
-      // TODO: Parameterize operators
+      Parameterize();
       base.Problem_SolutionCreatorChanged(sender, e);
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
-      // TODO: Parameterize operators
+      Parameterize();
       base.Problem_EvaluatorChanged(sender, e);
     }
     protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
-      // TODO: Parameterize operators
       InitializeOperators();
       base.Problem_OperatorsChanged(sender, e);
@@ -176 +175 @@
       if (Problem != null) {
       }
+      RegisterEventHandlers();
     }
 
@@ -190 +190 @@
           Analyzer.Operators.Add(analyzer);
         }
-
-        string oldLocalImprovement = String.Empty;
-        if (LocalImprovementParameter.Value != null)
-          oldLocalImprovement = LocalImprovementParameter.Value.Name;
+        InitializeFromInstallation(LocalImprovementParameter, x => x.ProblemType.IsAssignableFrom(Problem.GetType()));
+        InitializeFromProblem(PathRelinkingParameter);
+        InitializeFromProblem(EliteSetReplacerParameter);
+      } else {
         LocalImprovementParameter.ValidValues.Clear();
-        foreach (ILocalImprovementOperator localImprovement in Problem.Operators.OfType<ILocalImprovementOperator>()) {
-          LocalImprovementParameter.ValidValues.Add(localImprovement);
-        }
-        var newLocalImprovement = LocalImprovementParameter.ValidValues.FirstOrDefault(x => x.Name == oldLocalImprovement);
-        if (newLocalImprovement != null) LocalImprovementParameter.Value = newLocalImprovement;
-
-        string oldPathRelinking = String.Empty;
-        if (PathRelinkingParameter.Value != null)
-          oldPathRelinking = PathRelinkingParameter.Value.Name;
         PathRelinkingParameter.ValidValues.Clear();
-        foreach (ICrossover pathRelinking in Problem.Operators.OfType<ICrossover>()) {
-          PathRelinkingParameter.ValidValues.Add(pathRelinking);
-        }
-        var newPathRelinking = PathRelinkingParameter.ValidValues.FirstOrDefault(x => x.Name == oldPathRelinking);
-        if (newPathRelinking != null) PathRelinkingParameter.Value = newPathRelinking;
-
-        string oldReplacer = String.Empty;
-        if (EliteSetReplacerParameter.Value != null)
-          oldReplacer = EliteSetReplacerParameter.Value.Name;
         EliteSetReplacerParameter.ValidValues.Clear();
-        foreach (IReplacer replacer in Problem.Operators.OfType<IReplacer>()) {
-          EliteSetReplacerParameter.ValidValues.Add(replacer);
-        }
-        var newReplacer = EliteSetReplacerParameter.ValidValues.FirstOrDefault(x => x.Name == oldReplacer);
-        if (newReplacer != null) EliteSetReplacerParameter.Value = newReplacer;
       }
 
@@ -234 +211 @@
       }
     }
+
+    private void InitializeFromProblem<T>(ConstrainedValueParameter<T> parameter) where T : class, INamedItem {
+      InitializeFromProblem(parameter, x => true);
+    }
+    private void InitializeFromProblem<T>(ConstrainedValueParameter<T> parameter, Func<T, bool> condition) where T : class, INamedItem {
+      if (parameter == null) throw new ArgumentNullException("parameter");
+      if (condition == null) throw new ArgumentNullException("condition");
+      string oldName = String.Empty;
+      if (parameter.Value != null) oldName = parameter.Value.Name;
+      parameter.ValidValues.Clear();
+      foreach (var item in Problem.Operators.OfType<T>().Where(condition)) {
+        parameter.ValidValues.Add(item);
+      }
+      var newItem = parameter.ValidValues.FirstOrDefault(x => x.Name == oldName);
+      if (newItem != null) parameter.Value = newItem;
+    }
+    private void InitializeFromInstallation<T>(ConstrainedValueParameter<T> parameter) where T : class, INamedItem {
+      InitializeFromInstallation(parameter, x => true);
+    }
+    private void InitializeFromInstallation<T>(ConstrainedValueParameter<T> parameter, Func<T, bool> condition) where T : class, INamedItem {
+      if (parameter == null) throw new ArgumentNullException("parameter");
+      if (condition == null) throw new ArgumentNullException("condition");
+      string oldName = String.Empty;
+      if (parameter.Value != null) oldName = parameter.Value.Name;
+      parameter.ValidValues.Clear();
+      foreach (var item in ApplicationManager.Manager.GetInstances<T>().Where(condition)) {
+        parameter.ValidValues.Add(item);
+      }
+      var newItem = parameter.ValidValues.FirstOrDefault(x => x.Name == oldName);
+      if (newItem != null) parameter.Value = newItem;
+    }
     #endregion
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinkingMainLoop.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common;
 using HeuristicLab.Selection;
 
@@ -88 +89 @@
 
       var variableCreator2 = new VariableCreator();
-      variableCreator2.CollectedValues.Add(new ValueParameter<IntValue>("ActualEliteSetSize", new IntValue(0));
+      variableCreator2.CollectedValues.Add(new ValueParameter<IntValue>("ActualEliteSetSize", new IntValue(0)));
       variableCreator2.Name = "ActualEliteSetSize = 0";
 
@@ -112 +113 @@
       var selector2 = new RandomSelector();
       selector2.NumberOfSelectedSubScopesParameter.Value = new IntValue(0);
-      
+
       var ssp1 = new SubScopesProcessor();
 
@@ -121 +122 @@
       solutionsCreator.SolutionCreatorParameter.ActualName = SolutionCreatorParameter.Name;
       solutionsCreator.NumberOfSolutions = new IntValue(1);
-      
+
       var subScopesCounter2 = new SubScopesCounter();
       subScopesCounter2.Name = "Count subscopes";
@@ -147 +148 @@
       var childrenCreator = new ChildrenCreator();
       childrenCreator.ParentsPerChild = new IntValue(2);
-      
+
       var placeholder2 = new Placeholder();
       placeholder2.Name = "(PathRelinking)";

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -47 +59 @@
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
+    <Compile Include="GRASPWithPathRelinking.cs" />
+    <Compile Include="GRASPWithPathRelinkingMainLoop.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -53 +67 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj">
+      <Project>{DA367BE5-4F53-4243-933B-32AAB86189D5}</Project>
+      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common", "3.3")]
   public class HeuristicLabProblemsGeneralizedQuadraticAssignmentAlgorithmsPlugin : PluginBase {
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

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

@@ -114 +114 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj">
+      <Project>{DA367BE5-4F53-4243-933B-32AAB86189D5}</Project>
+      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  public interface IGQAPManipulator : IGQAPOperator {
+  public interface IGQAPManipulator : IGQAPOperator, IManipulator {
     ILookupParameter<IRandom> RandomParameter { get; }
     ILookupParameter<IntegerVector> IntegerVectorParameter { get; }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common", "3.3")]
   public class HeuristicLabProblemsGeneralizedQuadraticAssignmentPlugin : PluginBase {
   }