Changeset 16077


Ignore:
Timestamp:
08/14/18 12:01:42 (13 months ago)
Author:
abeham
Message:

#2936: Added integration branch

Location:
branches/2936_GQAPIntegration
Files:
6 added
7 deleted
74 edited
13 copied

Legend:

Unmodified
Added
Removed
  • branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj

    r15688 r16077  
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     104      <Private>False</Private>
     105    </Reference>
    101106    <Reference Include="System" />
    102107    <Reference Include="System.Core">
     
    220225    </Reference>
    221226  </ItemGroup>
    222   <ItemGroup>
    223     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    224       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    225       <Name>HeuristicLab.Optimization-3.3</Name>
    226       <Private>False</Private>
    227     </ProjectReference>
    228   </ItemGroup>
    229227  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    230228  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

    r15704 r16077  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
     33namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3434
    3535  /// <summary>
     
    159159      Results.Add(new Result("EvaluatedSolutions", new IntValue(Context.EvaluatedSolutions)));
    160160      Results.Add(new Result("BestQuality", new DoubleValue(Context.BestQuality)));
    161       Results.Add(new Result("BestSolution", typeof(GQAPSolution)));
     161      Results.Add(new Result("BestSolution", typeof(GQAPAssignment)));
    162162    }
    163163
     
    249249          ((DoubleValue)result.Value).Value = Context.BestQuality;
    250250        else Results.Add(new Result("BestQuality", new DoubleValue(Context.BestQuality)));
    251         if (Results.TryGetValue("BestSolution", out result))
    252           result.Value = Context.BestSolution;
    253         else Results.Add(new Result("BestSolution", Context.BestSolution));
     251        if (Results.TryGetValue("BestSolution", out result)) {
     252          var solAssign = (GQAPAssignment)result.Value;
     253          if (solAssign != null) {
     254            solAssign.Solution = Context.BestSolution;
     255          } else {
     256            result.Value = new GQAPAssignment(Context.BestSolution, Problem.ProblemInstance);
     257          }
     258        } else Results.Add(new Result("BestSolution", new GQAPAssignment(Context.BestSolution, Problem.ProblemInstance)));
    254259
    255260        try {
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs

    r15572 r16077  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
     28namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2929  [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")]
    3030  [StorableClass]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj

    r15758 r16077  
    4242  </PropertyGroup>
    4343  <ItemGroup>
     44    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     45      <SpecificVersion>False</SpecificVersion>
     46      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     47      <Private>False</Private>
     48    </Reference>
    4449    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
    4550      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    6469    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0">
    6570      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     71      <Private>False</Private>
     72    </Reference>
     73    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     74      <SpecificVersion>False</SpecificVersion>
     75      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    6676      <Private>False</Private>
    6777    </Reference>
     
    90100      <Private>False</Private>
    91101    </Reference>
    92     <Reference Include="localsolvernet, Version=7.5.0.0, Culture=neutral, processorArchitecture=AMD64">
    93       <SpecificVersion>False</SpecificVersion>
    94       <HintPath>..\..\..\..\trunk\bin\localsolvernet.dll</HintPath>
    95       <Private>False</Private>
    96     </Reference>
    97     <Reference Include="oplall, Version=12.7.0.0, Culture=neutral, PublicKeyToken=7906592bc7cc7340, processorArchitecture=MSIL">
    98       <SpecificVersion>False</SpecificVersion>
    99       <HintPath>..\..\..\..\trunk\bin\oplall.dll</HintPath>
    100       <Private>False</Private>
    101     </Reference>
    102102    <Reference Include="System" />
    103103    <Reference Include="System.Core" />
     
    106106  </ItemGroup>
    107107  <ItemGroup>
    108     <Compile Include="CPLEX\CplexSolver.cs" />
    109     <Compile Include="CPLEX\GQAP-FY.cs" />
    110     <Compile Include="CPLEX\GQAP-KB.cs" />
    111     <Compile Include="CPLEX\GQAPDataSource.cs" />
    112     <Compile Include="CPLEX\CplexContext.cs" />
    113     <Compile Include="Evolutionary\ESContext.cs" />
    114     <Compile Include="Evolutionary\ESGQAPSolution.cs" />
    115     <Compile Include="Evolutionary\EvolutionStrategy.cs" />
    116     <Compile Include="Evolutionary\OSGAContext.cs" />
    117     <Compile Include="Evolutionary\OSGA.cs" />
     108    <None Include="Properties\AssemblyInfo.cs.frame" />
    118109    <Compile Include="Infrastructure\Algorithms\StochasticAlgorithm.cs" />
    119110    <Compile Include="Infrastructure\Contexts\StochasticContext.cs" />
     
    122113    <Compile Include="GRASP\GRASPContext.cs" />
    123114    <Compile Include="GRASP\GRASP.cs" />
    124     <Compile Include="LAHC\pLAHCContext.cs" />
    125     <Compile Include="LAHC\pLAHC.cs" />
    126     <Compile Include="LAHC\LAHC.cs" />
    127     <Compile Include="LAHC\LAHCContext.cs" />
    128     <Compile Include="LocalSearch\LocalSearchContext.cs" />
    129115    <Compile Include="Infrastructure\Interfaces.cs" />
    130     <Compile Include="LocalSearch\IteratedLS.cs" />
    131     <Compile Include="LocalSearch\MultistartLS.cs" />
    132     <Compile Include="LocalSolverNet\GQAPListSolver.cs" />
    133     <Compile Include="LocalSolverNet\GQAPIntegerSolver.cs" />
    134     <Compile Include="LocalSolverNet\LocalSolverContext.cs" />
    135     <Compile Include="LocalSolverNet\GQAPBinarySolver.cs" />
     116    <None Include="Plugin.cs.frame" />
    136117    <Compile Include="Plugin.cs" />
    137118    <Compile Include="Infrastructure\Contexts\SingleSolutionContext.cs" />
     
    139120    <Compile Include="Properties\AssemblyInfo.cs" />
    140121    <Compile Include="Infrastructure\SingleObjectiveSolutionScope.cs" />
    141     <Compile Include="RandomSearch\RandomSearchContext.cs" />
    142     <Compile Include="RandomSearch\RandomSearch.cs" />
    143122  </ItemGroup>
    144123  <ItemGroup>
    145     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    146       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
    147       <Name>HeuristicLab.Analysis-3.3</Name>
    148       <Private>False</Private>
    149     </ProjectReference>
    150124    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    151125      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
    152126      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    153       <Private>False</Private>
    154     </ProjectReference>
    155     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    156       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    157       <Name>HeuristicLab.Optimization-3.3</Name>
    158127      <Private>False</Private>
    159128    </ProjectReference>
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs

    r15574 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.14.1")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.15890")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     
    4040  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4141  [PluginDependency("HeuristicLab.Random", "3.3")]
    42   [PluginDependency("CPLEX Transport", "12.7.0")]
    43   [PluginDependency("LocalSolver 7.5 Transport", "7.5")]
    44   public class Plugin : PluginBase {
    45   }
     42  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentAlgorithmsPlugin : PluginBase { }
    4643}
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Properties/AssemblyInfo.cs

    r15553 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3131[assembly: AssemblyCompany("HEAL")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
     
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.14.1")]
     56[assembly: AssemblyFileVersion("3.3.15.15890")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Plugin.cs

    r15579 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.14.0")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.15905")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    2929  [PluginDependency("HeuristicLab.Problems.Instances.CordeauGQAP", "3.3")]
    30   public class Plugin : PluginBase {
    31   }
     30  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentInstances : PluginBase { }
    3231}
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Plugin.cs.frame

    r15579 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.14.0")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    2929  [PluginDependency("HeuristicLab.Problems.Instances.CordeauGQAP", "3.3")]
    30   public class Plugin : PluginBase {
    31   }
     30  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentInstances : PluginBase { }
    3231}
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Properties/AssemblyInfo.cs

    r15579 r16077  
    5353// [assembly: AssemblyVersion("1.0.*")]
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.0.0")]
     55[assembly: AssemblyFileVersion("3.3.15.15905")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Properties/AssemblyInfo.cs.frame

    r15579 r16077  
    5353// [assembly: AssemblyVersion("1.0.*")]
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.0.0")]
     55[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.Designer.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentArchiveView.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.Designer.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/GQAPAssignmentView.cs

    r15510 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    4545    public GQAPAssignmentView() {
    4646      InitializeComponent();
     47      recalculateButton.Text = string.Empty;
    4748      recalculateButton.Image = VSImageLibrary.Refresh;
    4849    }
     
    5051    #region Register Content Events
    5152    protected override void DeregisterContentEvents() {
    52       Content.PropertyChanged -= new PropertyChangedEventHandler(Content_PropertyChanged);
     53      DeregisterSolutionEvents();
     54      Content.PropertyChanged -= Content_PropertyChanged;
    5355      base.DeregisterContentEvents();
    5456    }
    5557    protected override void RegisterContentEvents() {
    5658      base.RegisterContentEvents();
    57       Content.PropertyChanged += new PropertyChangedEventHandler(Content_PropertyChanged);
     59      Content.PropertyChanged += Content_PropertyChanged;
     60      RegisterSolutionEvents();
     61    }
     62
     63    private void DeregisterSolutionEvents() {
     64      if (Content.Solution != null) Content.Solution.PropertyChanged -= Content_SolutionPropertyChanged;
     65    }
     66    private void RegisterSolutionEvents() {
     67      if (Content.Solution != null) Content.Solution.PropertyChanged += Content_SolutionPropertyChanged;
    5868    }
    5969    #endregion
     
    6373      UpdateEvaluation();
    6474      UpdateAssignment();
    65       if (Content != null) assignmentView.Content = Content.Assignment;
     75      if (Content != null && Content.Solution != null) assignmentView.Content = Content.Solution.Assignment;
    6676      else assignmentView.Content = null;
    6777    }
     
    6979    protected override void SetEnabledStateOfControls() {
    7080      base.SetEnabledStateOfControls();
     81      recalculateButton.Enabled = Content != null && Content.Solution != null && !Locked && !ReadOnly;
    7182    }
    7283
     
    7485    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
    7586      switch (e.PropertyName) {
    76         case nameof(Content.Evaluation): UpdateEvaluation(); break;
    77         case nameof(Content.Assignment): UpdateAssignment(); break;
     87        case nameof(Content.Solution): RegisterSolutionEvents(); UpdateEvaluation(); UpdateAssignment(); break;
    7888        case nameof(Content.ProblemInstance): UpdateEvaluation(); UpdateAssignment(); break;
    7989        default: break;
    8090      }
     91      SetEnabledStateOfControls();
     92    }
     93
     94    private void Content_SolutionPropertyChanged(object sender, PropertyChangedEventArgs e) {
     95      switch (e.PropertyName) {
     96        case nameof(Content.Solution.Assignment): UpdateAssignment(); break;
     97        case nameof(Content.Solution.Evaluation): UpdateEvaluation(); break;
     98        default: break;
     99      }
    81100    }
    82101
     
    88107    #region Event Handlers
    89108    private void assignmentTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
    90       if (Content != null) {
     109      if (Content != null && Content.Solution != null) {
    91110        assignmentTreeView.BeginUpdate();
    92111        try {
     
    120139      if (InvokeRequired) Invoke((Action)UpdateEvaluation);
    121140      else {
    122         if (Content == null) {
     141        if (Content == null || Content.Solution == null) {
    123142          qualityLabel.Text = "-";
    124143          flowDistanceQualityLabel.Text = "-";
     
    126145          overbookedCapacityLabel.Text = "-";
    127146        } else {
    128           qualityLabel.Text = Content.ProblemInstance.ToSingleObjective(Content.Evaluation).ToString();
    129           flowDistanceQualityLabel.Text = Content.Evaluation.FlowCosts.ToString();
    130           installationQualityLabel.Text = Content.Evaluation.InstallationCosts.ToString();
    131           overbookedCapacityLabel.Text = Content.Evaluation.ExcessDemand.ToString();
     147          qualityLabel.Text = Content.ProblemInstance.ToSingleObjective(Content.Solution.Evaluation).ToString();
     148          flowDistanceQualityLabel.Text = Content.Solution.Evaluation.FlowCosts.ToString();
     149          installationQualityLabel.Text = Content.Solution.Evaluation.InstallationCosts.ToString();
     150          overbookedCapacityLabel.Text = Content.Solution.Evaluation.ExcessDemand.ToString();
    132151        }
    133152      }
     
    138157      else {
    139158        assignmentTreeView.Nodes.Clear();
    140         if (Content != null) {
    141           IntegerVector assignment = Content.Assignment;
     159        if (Content != null && Content.Solution != null) {
     160          IntegerVector assignment = Content.Solution.Assignment;
    142161          Dictionary<int, TreeNode> locationNodes = new Dictionary<int, TreeNode>();
    143162          for (int i = 0; i < assignment.Length; i++) {
     
    169188      var installationCosts = new Dictionary<EquipmentNode, double>();
    170189      foreach (var node in GetAllSubNodes(assignmentTreeView.Nodes).OfType<EquipmentNode>()) {
    171         int location = Content.Assignment[node.Equipment];
     190        int location = Content.Solution.Assignment[node.Equipment];
    172191        installationCosts[node] = Content.ProblemInstance.InstallationCosts[node.Equipment, location];
    173192      }
     
    216235
    217236    private void ColorByWeight(LocationNode selectedNode) {
    218       var equipments = new HashSet<int>(Content.Assignment.Select((v, i) => new { Index = i, Value = v })
     237      var equipments = new HashSet<int>(Content.Solution.Assignment.Select((v, i) => new { Index = i, Value = v })
    219238        .Where(x => x.Value == selectedNode.Location).Select(x => x.Index));
    220239      var rowSums = new Dictionary<int, double>(equipments.Count);
     
    279298
    280299    private void recalculateButton_Click(object sender, EventArgs e) {
    281       Content.Evaluation = Content.ProblemInstance.Evaluate(Content.Assignment);
     300      Content.Solution.Evaluation = Content.ProblemInstance.Evaluate(Content.Solution.Assignment);
    282301    }
    283302  }
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

    r15688 r16077  
    135135      <Private>False</Private>
    136136    </ProjectReference>
    137     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    138       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    139       <Name>HeuristicLab.Optimization-3.3</Name>
    140       <Private>False</Private>
    141     </ProjectReference>
    142137    <ProjectReference Include="..\..\HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj">
    143138      <Project>{C739E6D2-5680-4804-A810-8017DA0C238F}</Project>
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Plugin.cs.frame

    r13418 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views", "3.3.13.$WCREV$")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/Properties/AssemblyInfo.cs.frame

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3131[assembly: AssemblyCompany("HEAL")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
     
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/Evaluation.cs

    r15553 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.cs

    r15511 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAP.cs

    r15510 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3737namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3838  [Item("Generalized Quadratic Assignment Problem (GQAP)", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")]
    39   [Creatable("Problems")]
     39  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    4040  [StorableClass]
    4141  public sealed class GQAP : SingleObjectiveBasicProblem<IntegerVectorEncoding>,
     
    140140      if (item == null) bestResult.Value = new GQAPAssignment((IntegerVector)bestVector.Clone(), ProblemInstance, bestEvaluation);
    141141      else if (ProblemInstance.ToSingleObjective(bestEvaluation)
    142         < ProblemInstance.ToSingleObjective(item.Evaluation)) {
     142        < ProblemInstance.ToSingleObjective(item.Solution.Evaluation)) {
    143143        item.ProblemInstance = ProblemInstance;
    144         item.Assignment = (IntegerVector)bestVector.Clone();
    145         item.Evaluation = bestEvaluation;
     144        item.Solution = new GQAPSolution((IntegerVector)bestVector.Clone(), bestEvaluation);
    146145      }
    147146    }
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3232
    3333    [Storable]
    34     private IntegerVector assignment;
    35     public IntegerVector Assignment {
    36       get { return assignment; }
     34    private GQAPSolution solution;
     35    public GQAPSolution Solution {
     36      get { return solution; }
    3737      set {
    38         if (assignment == value) return;
    39         assignment = value;
    40         OnPropertyChanged(nameof(Assignment));
    41       }
    42     }
    43 
    44     [Storable]
    45     private Evaluation evaluation;
    46     public Evaluation Evaluation {
    47       get { return evaluation; }
    48       set {
    49         if (evaluation == value) return;
    50         evaluation = value;
    51         OnPropertyChanged(nameof(Evaluation));
     38        if (solution == value) return;
     39        solution = value;
     40        OnPropertyChanged(nameof(Solution));
    5241      }
    5342    }
     
    6857    private GQAPAssignment(GQAPAssignment original, Cloner cloner)
    6958      : base(original, cloner) {
    70       assignment = cloner.Clone(original.assignment);
    71       evaluation = cloner.Clone(original.evaluation);
     59      solution = cloner.Clone(original.solution);
    7260      problemInstance = cloner.Clone(original.problemInstance);
    7361    }
     
    7664    public GQAPAssignment(IntegerVector assignment, GQAPInstance problemInstance, Evaluation evaluation)
    7765      : base() {
    78       this.assignment = assignment;
    79       this.evaluation = evaluation;
     66      this.solution = new GQAPSolution(assignment, evaluation);
     67      this.problemInstance = problemInstance;
     68    }
     69    public GQAPAssignment(GQAPSolution solution, GQAPInstance problemInstance)
     70      : base() {
     71      this.solution = solution;
    8072      this.problemInstance = problemInstance;
    8173    }
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPInstance.cs

    r15713 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPSolution.cs

    r15553 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

    r15719 r16077  
    4141  </PropertyGroup>
    4242  <ItemGroup>
     43    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     44      <SpecificVersion>False</SpecificVersion>
     45      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     46      <Private>False</Private>
     47    </Reference>
    4348    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
    4449      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    6368    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0">
    6469      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     70      <Private>False</Private>
     71    </Reference>
     72    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     73      <SpecificVersion>False</SpecificVersion>
     74      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    6575      <Private>False</Private>
    6676    </Reference>
     
    148158    <Compile Include="Operators\Manipulators\SwapEquipmentManipluator.cs" />
    149159    <Compile Include="Operators\Manipulators\SwapLocationManipulator.cs" />
    150     <Compile Include="Operators\PopulationReducers\GQAPQualitySimilarityReducer.cs" />
    151160    <Compile Include="Operators\Shakers\NMoveShakingOperator.cs" />
    152161    <Compile Include="Plugin.cs" />
     
    158167  </ItemGroup>
    159168  <ItemGroup>
    160     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    161       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
    162       <Name>HeuristicLab.Analysis-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165169    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    166170      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
    167171      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    171       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    172       <Name>HeuristicLab.Optimization-3.3</Name>
    173172      <Private>False</Private>
    174173    </ProjectReference>
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPCrossover.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPLocalImprovementOperator.cs

    r15562 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPManipulator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveEvaluator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveEvaluator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPSolutionCreator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IAssignmentAwareGQAPOperator.cs

    r15506 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownQualityAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionsAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IMoveQualityAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IProblemInstanceAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualitiesAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualityAwareGQAPOperator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/ExhaustiveOneMoveGenerator.cs

    r15562 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMove.cs

    r15511 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs

    r15511 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

    r15511 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs

    r15511 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuMaker.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

    r15572 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

    r15506 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/DiscreteLocationCrossover.cs

    r15572 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPCrossover.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs

    r15572 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/ApproximateLocalSearch.cs

    r15558 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/OneOptLocalSearch.cs

    r15562 r16077  
    22#region License Information
    33/* HeuristicLab
    4  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/DemandEquivalentSwapEquipmentManipluator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/GQAPManipulator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs

    r15572 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapEquipmentManipluator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Shakers/NMoveShakingOperator.cs

    r15506 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3.13.$WCREV$")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Analysis", "3.3")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Properties/AssemblyInfo.cs.frame

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3232[assembly: AssemblyCompany("HEAL")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
     
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPSolutionCreator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPStochasticSolutionCreator.cs

    r15504 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs

    r15558 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs

    r15555 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs

    r15555 r16077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/2936_GQAPIntegration/HeuristicLab.Tests/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3/ApproximateLocalSearchTest.cs

    r16073 r16077  
    1 using System.Linq;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.Linq;
    223using System.Threading;
    324using HeuristicLab.Data;
    425using HeuristicLab.Encodings.IntegerVectorEncoding;
    5 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
    626using HeuristicLab.Random;
    727using Microsoft.VisualStudio.TestTools.UnitTesting;
    828
    9 namespace UnitTests {
     29namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Tests {
    1030  [TestClass]
    1131  public class ApproximateLocalSearchTest {
  • branches/2936_GQAPIntegration/HeuristicLab.Tests/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3/CordeauCrossoverTest.cs

    r16073 r16077  
    2323using System.Threading;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
    2625using HeuristicLab.Problems.Instances.CordeauGQAP;
    2726using HeuristicLab.Random;
    2827using Microsoft.VisualStudio.TestTools.UnitTesting;
    2928
    30 namespace UnitTests {
     29namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Tests {
    3130  [TestClass]
    3231  public class CordeauCrossoverTest {
  • branches/2936_GQAPIntegration/HeuristicLab.Tests/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3/GQAPNMoveEvaluatorTest.cs

    r16073 r16077  
    2323using HeuristicLab.Data;
    2424using HeuristicLab.Encodings.IntegerVectorEncoding;
    25 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
    2625using HeuristicLab.Random;
    2726using Microsoft.VisualStudio.TestTools.UnitTesting;
    2827
    29 namespace UnitTests {
     28namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Tests {
    3029  /// <summary>
    3130  ///This is a test class for GQAPNMoveEvaluatorTest and is intended
  • branches/2936_GQAPIntegration/HeuristicLab.Tests/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3/GRASPTest.cs

    r16073 r16077  
    2323using System.Linq;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
    26 using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP;
    2725using HeuristicLab.Problems.Instances.CordeauGQAP;
    2826using Microsoft.VisualStudio.TestTools.UnitTesting;
    2927
    30 namespace UnitTests {
     28namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Tests {
    3129  [TestClass]
    3230  public class GRASPTest {
  • branches/2936_GQAPIntegration/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r16023 r16077  
    2121    <DebugType>full</DebugType>
    2222    <Optimize>false</Optimize>
    23     <OutputPath>..\bin\</OutputPath>
     23    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    2424    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2525    <ErrorReport>prompt</ErrorReport>
     
    3030    <DebugType>pdbonly</DebugType>
    3131    <Optimize>true</Optimize>
    32     <OutputPath>..\bin\</OutputPath>
     32    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    3333    <DefineConstants>TRACE</DefineConstants>
    3434    <ErrorReport>prompt</ErrorReport>
     
    4444  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4545    <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>..\bin\</OutputPath>
     46    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    4747    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4848    <DebugType>full</DebugType>
     
    6060  </PropertyGroup>
    6161  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    62     <OutputPath>..\bin\</OutputPath>
     62    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    6363    <DefineConstants>TRACE</DefineConstants>
    6464    <Optimize>true</Optimize>
     
    7878  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7979    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>..\bin\</OutputPath>
     80    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    8181    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8282    <DebugType>full</DebugType>
     
    9494  </PropertyGroup>
    9595  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    96     <OutputPath>..\bin\</OutputPath>
     96    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    9797    <DefineConstants>TRACE</DefineConstants>
    9898    <Optimize>true</Optimize>
     
    110110  <ItemGroup>
    111111    <Reference Include="ALGLIB-3.7.0">
    112       <HintPath>..\bin\ALGLIB-3.7.0.dll</HintPath>
     112      <HintPath>..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
    113113      <Private>False</Private>
    114114    </Reference>
    115115    <Reference Include="HeuristicLab.Algorithms.ALPS-3.3">
    116       <HintPath>..\bin\HeuristicLab.Algorithms.ALPS-3.3.dll</HintPath>
     116      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.ALPS-3.3.dll</HintPath>
    117117      <Private>False</Private>
    118118    </Reference>
    119119    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4">
    120       <HintPath>..\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
     120      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
    121121      <Private>False</Private>
    122122    </Reference>
    123123    <Reference Include="HeuristicLab.Algorithms.EvolutionStrategy-3.3">
    124       <HintPath>..\bin\HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll</HintPath>
     124      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll</HintPath>
    125125      <Private>False</Private>
    126126    </Reference>
    127127    <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3">
    128       <HintPath>..\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
     128      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
    129129      <Private>False</Private>
    130130    </Reference>
    131131    <Reference Include="HeuristicLab.Algorithms.LocalSearch-3.3">
    132       <HintPath>..\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
     132      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
    133133      <Private>False</Private>
    134134    </Reference>
    135135    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    136       <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.dll</HintPath>
     136      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.dll</HintPath>
    137137      <Private>False</Private>
    138138    </Reference>
    139139    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
    140       <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
     140      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
    141141      <Private>False</Private>
    142142    </Reference>
    143143    <Reference Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3">
    144144      <SpecificVersion>False</SpecificVersion>
    145       <HintPath>..\bin\HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.dll</HintPath>
     145      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.dll</HintPath>
    146146      <Private>False</Private>
    147147    </Reference>
    148148    <Reference Include="HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3">
    149       <HintPath>..\bin\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll</HintPath>
     149      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll</HintPath>
    150150      <Private>False</Private>
    151151    </Reference>
    152152    <Reference Include="HeuristicLab.Algorithms.RAPGA-3.3">
    153       <HintPath>..\bin\HeuristicLab.Algorithms.RAPGA-3.3.dll</HintPath>
     153      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.RAPGA-3.3.dll</HintPath>
    154154      <Private>False</Private>
    155155    </Reference>
    156156    <Reference Include="HeuristicLab.Algorithms.ScatterSearch-3.3">
    157       <HintPath>..\bin\HeuristicLab.Algorithms.ScatterSearch-3.3.dll</HintPath>
     157      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.ScatterSearch-3.3.dll</HintPath>
    158158      <Private>False</Private>
    159159    </Reference>
    160160    <Reference Include="HeuristicLab.Algorithms.SimulatedAnnealing-3.3">
    161       <HintPath>..\bin\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll</HintPath>
     161      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll</HintPath>
    162162      <Private>False</Private>
    163163    </Reference>
    164164    <Reference Include="HeuristicLab.Algorithms.TabuSearch-3.3">
    165       <HintPath>..\bin\HeuristicLab.Algorithms.TabuSearch-3.3.dll</HintPath>
     165      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.TabuSearch-3.3.dll</HintPath>
    166166      <Private>False</Private>
    167167    </Reference>
    168168    <Reference Include="HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3">
    169       <HintPath>..\bin\HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll</HintPath>
     169      <HintPath>..\..\..\trunk\bin\HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll</HintPath>
    170170      <Private>False</Private>
    171171    </Reference>
    172172    <Reference Include="HeuristicLab.Analysis-3.3">
    173       <HintPath>..\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     173      <HintPath>..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    174174      <Private>False</Private>
    175175    </Reference>
    176176    <Reference Include="HeuristicLab.Collections-3.3">
    177       <HintPath>..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     177      <HintPath>..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    178178      <Private>False</Private>
    179179    </Reference>
    180180    <Reference Include="HeuristicLab.Common-3.3">
    181       <HintPath>..\bin\HeuristicLab.Common-3.3.dll</HintPath>
     181      <HintPath>..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
    182182      <Private>False</Private>
    183183    </Reference>
    184184    <Reference Include="HeuristicLab.Core-3.3">
    185       <HintPath>..\bin\HeuristicLab.Core-3.3.dll</HintPath>
     185      <HintPath>..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
    186186      <Private>False</Private>
    187187    </Reference>
    188188    <Reference Include="HeuristicLab.Data-3.3">
    189       <HintPath>..\bin\HeuristicLab.Data-3.3.dll</HintPath>
     189      <HintPath>..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
    190190      <Private>False</Private>
    191191    </Reference>
    192192    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
    193       <HintPath>..\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
     193      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
    194194      <Private>False</Private>
    195195    </Reference>
    196196    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
    197197      <Private>False</Private>
    198       <HintPath>..\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     198      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
    199199    </Reference>
    200200    <Reference Include="HeuristicLab.Encodings.LinearLinkageEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    201201      <SpecificVersion>False</SpecificVersion>
    202       <HintPath>..\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.dll</HintPath>
     202      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.dll</HintPath>
    203203    </Reference>
    204204    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    205       <HintPath>..\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     205      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    206206      <Private>False</Private>
    207207    </Reference>
    208208    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    209       <HintPath>..\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     209      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    210210      <Private>False</Private>
    211211    </Reference>
    212212    <Reference Include="HeuristicLab.Encodings.ScheduleEncoding-3.3">
    213       <HintPath>..\bin\HeuristicLab.Encodings.ScheduleEncoding-3.3.dll</HintPath>
     213      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.ScheduleEncoding-3.3.dll</HintPath>
    214214      <Private>False</Private>
    215215    </Reference>
    216216    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    217       <HintPath>..\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     217      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    218218      <Private>False</Private>
    219219    </Reference>
    220220    <Reference Include="HeuristicLab.IGraph-0.8.0-pre, Version=0.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    221221      <SpecificVersion>False</SpecificVersion>
    222       <HintPath>..\bin\HeuristicLab.IGraph-0.8.0-pre.dll</HintPath>
     222      <HintPath>..\..\..\trunk\bin\HeuristicLab.IGraph-0.8.0-pre.dll</HintPath>
    223223      <Private>False</Private>
    224224    </Reference>
    225225    <Reference Include="HeuristicLab.MainForm-3.3">
    226       <HintPath>..\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     226      <HintPath>..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    227227      <Private>False</Private>
    228228    </Reference>
    229229    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    230       <HintPath>..\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     230      <HintPath>..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    231231      <Private>False</Private>
    232232    </Reference>
    233233    <Reference Include="HeuristicLab.Operators-3.3">
    234       <HintPath>..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     234      <HintPath>..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    235235      <Private>False</Private>
    236236    </Reference>
    237237    <Reference Include="HeuristicLab.Optimization-3.3">
    238       <HintPath>..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     238      <HintPath>..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    239239      <Private>False</Private>
    240240    </Reference>
    241241    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    242       <HintPath>..\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     242      <HintPath>..\..\..\trunk\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    243243      <Private>False</Private>
    244244    </Reference>
    245245    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    246       <HintPath>..\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     246      <HintPath>..\..\..\trunk\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    247247      <Private>False</Private>
    248248    </Reference>
    249249    <Reference Include="HeuristicLab.Optimizer-3.3">
    250       <HintPath>..\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
     250      <HintPath>..\..\..\trunk\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
    251251      <Private>False</Private>
    252252    </Reference>
    253253    <Reference Include="HeuristicLab.ParallelEngine-3.3">
    254       <HintPath>..\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
     254      <HintPath>..\..\..\trunk\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
    255255      <Private>False</Private>
    256256    </Reference>
    257257    <Reference Include="HeuristicLab.Parameters-3.3">
    258       <HintPath>..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     258      <HintPath>..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    259259      <Private>False</Private>
    260260    </Reference>
    261261    <Reference Include="HeuristicLab.Persistence-3.3">
    262       <HintPath>..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     262      <HintPath>..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    263263      <Private>False</Private>
    264264    </Reference>
    265265    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    266       <HintPath>..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     266      <HintPath>..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    267267      <Private>False</Private>
    268268    </Reference>
    269269    <Reference Include="HeuristicLab.Problems.Binary-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    270270      <SpecificVersion>False</SpecificVersion>
    271       <HintPath>..\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
     271      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
    272272      <Private>False</Private>
    273273    </Reference>
    274274    <Reference Include="HeuristicLab.Problems.BinPacking-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    275275      <SpecificVersion>False</SpecificVersion>
    276       <HintPath>..\bin\HeuristicLab.Problems.BinPacking-3.3.dll</HintPath>
     276      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.BinPacking-3.3.dll</HintPath>
    277277      <Private>False</Private>
    278278    </Reference>
    279279    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    280       <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     280      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    281281      <Private>False</Private>
    282282    </Reference>
    283283    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    284       <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     284      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    285285      <Private>False</Private>
    286286    </Reference>
    287287    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4">
    288       <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath>
     288      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath>
    289289      <Private>False</Private>
    290290    </Reference>
    291291    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
    292       <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
     292      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
    293293      <Private>False</Private>
    294294    </Reference>
    295295    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4">
    296       <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath>
     296      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath>
    297297      <Private>False</Private>
    298298    </Reference>
    299299    <Reference Include="HeuristicLab.Problems.ExternalEvaluation-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    300300      <SpecificVersion>False</SpecificVersion>
    301       <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation-3.4.dll</HintPath>
     301      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.ExternalEvaluation-3.4.dll</HintPath>
    302302      <Private>False</Private>
    303303    </Reference>
    304304    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.GP-3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    305305      <SpecificVersion>False</SpecificVersion>
    306       <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll</HintPath>
     306      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll</HintPath>
    307307      <Private>False</Private>
    308308    </Reference>
    309309    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    310310      <SpecificVersion>False</SpecificVersion>
    311       <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.dll</HintPath>
     311      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.dll</HintPath>
    312312      <Private>False</Private>
    313313    </Reference>
    314314    <Reference Include="HeuristicLab.Problems.GeneticProgramming-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    315315      <SpecificVersion>False</SpecificVersion>
    316       <HintPath>..\bin\HeuristicLab.Problems.GeneticProgramming-3.3.dll</HintPath>
     316      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.GeneticProgramming-3.3.dll</HintPath>
    317317      <Private>False</Private>
    318318    </Reference>
    319319    <Reference Include="HeuristicLab.Problems.GrammaticalEvolution-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    320320      <SpecificVersion>False</SpecificVersion>
    321       <HintPath>..\bin\HeuristicLab.Problems.GrammaticalEvolution-3.4.dll</HintPath>
     321      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.GrammaticalEvolution-3.4.dll</HintPath>
    322322      <Private>False</Private>
    323323    </Reference>
    324324    <Reference Include="HeuristicLab.Problems.Instances-3.3">
    325       <HintPath>..\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     325      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    326326      <Private>False</Private>
    327327    </Reference>
    328328    <Reference Include="HeuristicLab.Problems.Instances.CordeauGQAP-3.3">
    329       <HintPath>..\bin\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll</HintPath>
     329      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll</HintPath>
    330330      <Private>False</Private>
    331331    </Reference>
    332332    <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
    333       <HintPath>..\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
     333      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
    334334      <Private>False</Private>
    335335    </Reference>
    336336    <Reference Include="HeuristicLab.Problems.Instances.DIMACS-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    337337      <SpecificVersion>False</SpecificVersion>
    338       <HintPath>..\bin\HeuristicLab.Problems.Instances.DIMACS-3.3.dll</HintPath>
     338      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.DIMACS-3.3.dll</HintPath>
    339339      <Private>False</Private>
    340340    </Reference>
    341341    <Reference Include="HeuristicLab.Problems.Instances.ElloumiCTAP-3.3">
    342       <HintPath>..\bin\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.dll</HintPath>
     342      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.dll</HintPath>
    343343      <Private>False</Private>
    344344    </Reference>
    345345    <Reference Include="HeuristicLab.Problems.Instances.QAPLIB-3.3">
    346       <HintPath>..\bin\HeuristicLab.Problems.Instances.QAPLIB-3.3.dll</HintPath>
     346      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.QAPLIB-3.3.dll</HintPath>
    347347      <Private>False</Private>
    348348    </Reference>
    349349    <Reference Include="HeuristicLab.Problems.Instances.TSPLIB-3.3">
    350       <HintPath>..\bin\HeuristicLab.Problems.Instances.TSPLIB-3.3.dll</HintPath>
     350      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.TSPLIB-3.3.dll</HintPath>
    351351      <Private>False</Private>
    352352    </Reference>
    353353    <Reference Include="HeuristicLab.Problems.Instances.VehicleRouting-3.4">
    354       <HintPath>..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll</HintPath>
     354      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll</HintPath>
    355355      <Private>False</Private>
    356356    </Reference>
    357357    <Reference Include="HeuristicLab.Problems.Knapsack-3.3">
    358       <HintPath>..\bin\HeuristicLab.Problems.Knapsack-3.3.dll</HintPath>
     358      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Knapsack-3.3.dll</HintPath>
    359359      <Private>False</Private>
    360360    </Reference>
    361361    <Reference Include="HeuristicLab.Problems.LinearAssignment-3.3">
    362       <HintPath>..\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
     362      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
    363363      <Private>False</Private>
    364364    </Reference>
    365365    <Reference Include="HeuristicLab.Problems.Programmable-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    366366      <SpecificVersion>False</SpecificVersion>
    367       <HintPath>..\bin\HeuristicLab.Problems.Programmable-3.3.dll</HintPath>
     367      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Programmable-3.3.dll</HintPath>
    368368      <Private>False</Private>
    369369    </Reference>
    370370    <Reference Include="HeuristicLab.Problems.Programmable.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    371371      <SpecificVersion>False</SpecificVersion>
    372       <HintPath>..\bin\HeuristicLab.Problems.Programmable.Views-3.3.dll</HintPath>
     372      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Programmable.Views-3.3.dll</HintPath>
    373373      <Private>False</Private>
    374374    </Reference>
    375375    <Reference Include="HeuristicLab.Problems.Orienteering-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    376       <HintPath>..\bin\HeuristicLab.Problems.Orienteering-3.3.dll</HintPath>
     376      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Orienteering-3.3.dll</HintPath>
    377377      <Private>False</Private>
    378378    </Reference>
    379379    <Reference Include="HeuristicLab.Problems.PTSP-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    380380      <SpecificVersion>False</SpecificVersion>
    381       <HintPath>..\bin\HeuristicLab.Problems.PTSP-3.3.dll</HintPath>
     381      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.PTSP-3.3.dll</HintPath>
    382382      <Private>False</Private>
    383383    </Reference>
    384384    <Reference Include="HeuristicLab.Problems.QuadraticAssignment-3.3">
    385       <HintPath>..\bin\HeuristicLab.Problems.QuadraticAssignment-3.3.dll</HintPath>
     385      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.QuadraticAssignment-3.3.dll</HintPath>
    386386      <Private>False</Private>
    387387    </Reference>
    388388    <Reference Include="HeuristicLab.Problems.Scheduling-3.3">
    389       <HintPath>..\bin\HeuristicLab.Problems.Scheduling-3.3.dll</HintPath>
     389      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.Scheduling-3.3.dll</HintPath>
    390390      <Private>False</Private>
    391391    </Reference>
    392392    <Reference Include="HeuristicLab.Problems.TestFunctions-3.3">
    393       <HintPath>..\bin\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>
     393      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>
    394394      <Private>False</Private>
    395395    </Reference>
    396396    <Reference Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    397397      <SpecificVersion>False</SpecificVersion>
    398       <HintPath>..\bin\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.dll</HintPath>
     398      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.dll</HintPath>
    399399      <Private>False</Private>
    400400    </Reference>
    401401    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3">
    402       <HintPath>..\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
     402      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
    403403      <Private>False</Private>
    404404    </Reference>
    405405    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.4">
    406       <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.4.dll</HintPath>
     406      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.VehicleRouting-3.4.dll</HintPath>
    407407      <Private>False</Private>
    408408    </Reference>
    409409    <Reference Include="HeuristicLab.Random-3.3">
    410       <HintPath>..\bin\HeuristicLab.Random-3.3.dll</HintPath>
     410      <HintPath>..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll</HintPath>
    411411      <Private>False</Private>
    412412    </Reference>
    413413    <Reference Include="HeuristicLab.Scripting-3.3">
    414       <HintPath>..\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
     414      <HintPath>..\..\..\trunk\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
    415415      <Private>False</Private>
    416416    </Reference>
    417417    <Reference Include="HeuristicLab.Selection-3.3">
    418       <HintPath>..\bin\HeuristicLab.Selection-3.3.dll</HintPath>
     418      <HintPath>..\..\..\trunk\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    419419      <Private>False</Private>
    420420    </Reference>
    421421    <Reference Include="HeuristicLab.SequentialEngine-3.3">
    422       <HintPath>..\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
     422      <HintPath>..\..\..\trunk\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
    423423      <Private>False</Private>
    424424    </Reference>
    425425    <Reference Include="LibSVM-3.12">
    426       <HintPath>..\bin\LibSVM-3.12.dll</HintPath>
     426      <HintPath>..\..\..\trunk\bin\LibSVM-3.12.dll</HintPath>
    427427      <Private>False</Private>
    428428    </Reference>
     
    592592    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
    593593    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\Util.cs" />
     594    <Compile Include="HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3\ApproximateLocalSearchTest.cs" />
     595    <Compile Include="HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3\CordeauCrossoverTest.cs" />
     596    <Compile Include="HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3\GQAPNMoveEvaluatorTest.cs" />
     597    <Compile Include="HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3\GRASPTest.cs" />
    594598    <Compile Include="HeuristicLab.Problems.Instances-3.3\DIMACSGcolInstanceProviderTest.cs" />
    595599    <Compile Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3\RegressionInstanceProviderTest.cs" />
     
    699703    </EmbeddedResource>
    700704  </ItemGroup>
    701   <ItemGroup />
     705  <ItemGroup>
     706    <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj">
     707      <Project>{577239ec-7d7f-4505-a0a4-572e34010dba}</Project>
     708      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3</Name>
     709    </ProjectReference>
     710    <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj">
     711      <Project>{c739e6d2-5680-4804-a810-8017da0c238f}</Project>
     712      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</Name>
     713    </ProjectReference>
     714  </ItemGroup>
    702715  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    703716  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.