Changeset 13484


Ignore:
Timestamp:
12/17/15 23:06:38 (5 years ago)
Author:
abeham
Message:

#2221: integrated PTSP into trunk

Location:
trunk/sources
Files:
7 added
1 deleted
12 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r13231 r13484  
    22Microsoft Visual Studio Solution File, Format Version 12.00
    33# Visual Studio 2013
    4 VisualStudioVersion = 12.0.31101.0
     4VisualStudioVersion = 12.0.40629.0
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
     
    2424    {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E}
    2525    {5AC82412-911B-4FA2-A013-EDC5E3F3FCC2} = {5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}
     26    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B} = {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}
    2627    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}
    2728    {E2419315-B10A-4BC1-B517-A24DCF4C59AC} = {E2419315-B10A-4BC1-B517-A24DCF4C59AC}
     
    7475    {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
    7576    {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF}
     77    {97198965-AFEA-496B-B3B1-316905C43FD6} = {97198965-AFEA-496B-B3B1-316905C43FD6}
    7678    {3B90F866-70F8-43EF-A541-51819D255B7B} = {3B90F866-70F8-43EF-A541-51819D255B7B}
    7779    {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB}
     
    449451EndProject
    450452Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ALPS-3.3", "HeuristicLab.Algorithms.ALPS\3.3\HeuristicLab.Algorithms.ALPS-3.3.csproj", "{59F354CB-FE13-4253-AED2-AD86372BEC27}"
     453EndProject
     454Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP-3.3", "HeuristicLab.Problems.PTSP\3.3\HeuristicLab.Problems.PTSP-3.3.csproj", "{97198965-AFEA-496B-B3B1-316905C43FD6}"
     455EndProject
     456Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP.Views-3.3", "HeuristicLab.Problems.PTSP.Views\3.3\HeuristicLab.Problems.PTSP.Views-3.3.csproj", "{90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}"
    451457EndProject
    452458Global
     
    21882194    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.ActiveCfg = Release|x86
    21892195    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.Build.0 = Release|x86
     2196    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2197    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2198    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x64.ActiveCfg = Debug|x64
     2199    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x64.Build.0 = Debug|x64
     2200    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x86.ActiveCfg = Debug|x86
     2201    {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x86.Build.0 = Debug|x86
     2202    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2203    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|Any CPU.Build.0 = Release|Any CPU
     2204    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x64.ActiveCfg = Release|x64
     2205    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x64.Build.0 = Release|x64
     2206    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x86.ActiveCfg = Release|x86
     2207    {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x86.Build.0 = Release|x86
     2208    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2209    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2210    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.ActiveCfg = Debug|x64
     2211    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.Build.0 = Debug|x64
     2212    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.ActiveCfg = Debug|x86
     2213    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.Build.0 = Debug|x86
     2214    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2215    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.Build.0 = Release|Any CPU
     2216    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.ActiveCfg = Release|x64
     2217    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.Build.0 = Release|x64
     2218    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.ActiveCfg = Release|x86
     2219    {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.Build.0 = Release|x86
    21902220  EndGlobalSection
    21912221  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj

    r11650 r13484  
    115115  </ItemGroup>
    116116  <ItemGroup>
     117    <Compile Include="TSPLIBHeterogeneousPTSPDataDescriptor.cs" />
     118    <Compile Include="TSPLIBHomogeneousPTSPDataDescriptor.cs" />
     119    <Compile Include="TSPLIBHeterogeneousPTSPInstanceProvider.cs" />
     120    <Compile Include="TSPLIBPTSPInstanceProvider.cs" />
    117121    <Compile Include="TSPLIBInstanceProvider.cs" />
    118122    <Compile Include="TSPLIBATSPInstanceProvider.cs" />
    119123    <Compile Include="TSPLIBCVRPInstanceProvider.cs" />
    120124    <Compile Include="TSPLIBDataDescriptor.cs" />
     125    <Compile Include="TSPLIBHomogeneousPTSPInstanceProvider.cs" />
    121126    <Compile Include="TSPLIBTSPInstanceProvider.cs" />
    122127    <Compile Include="TSPLIBParser.cs" />
     
    150155    </ProjectReference>
    151156  </ItemGroup>
    152   <ItemGroup />
    153157  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    154158  <PropertyGroup>
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs

    r12012 r13484  
    3636    protected override string FileExtension { get { return "atsp"; } }
    3737
    38     protected override ATSPData LoadInstance(TSPLIBParser parser) {
     38    protected override ATSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) {
    3939      var instance = new ATSPData();
    4040
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs

    r12012 r13484  
    3636    protected override string FileExtension { get { return "vrp"; } }
    3737
    38     protected override CVRPData LoadInstance(TSPLIBParser parser) {
     38    protected override CVRPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) {
    3939      parser.Parse();
    4040      var instance = new CVRPData();
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs

    r12012 r13484  
    4545    protected abstract string FileExtension { get; }
    4646
    47     protected abstract T LoadInstance(TSPLIBParser parser);
     47    protected abstract T LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null);
    4848    protected abstract void LoadSolution(TSPLIBParser parser, T instance);
    4949
     
    7474        var stream = entry.Open();
    7575        var parser = new TSPLIBParser(stream);
    76         var instance = LoadInstance(parser);
     76        var instance = LoadInstance(parser, id);
    7777
    7878        if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) {
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

    r12012 r13484  
    3737    protected override string FileExtension { get { return "tsp"; } }
    3838
    39     protected override TSPData LoadInstance(TSPLIBParser parser) {
     39    protected override TSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) {
    4040      parser.Parse();
    4141      if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
  • trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r12722 r13484  
    121121    <Compile Include="ProblemInstanceManager.cs" />
    122122    <Compile Include="IProblemInstanceExporter.cs" />
     123    <Compile Include="Types\PTSPData.cs" />
    123124    <Compile Include="Types\ATSPData.cs" />
    124125    <Compile Include="Types\JSSPData.cs" />
  • trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/DistanceHelper.cs

    r12012 r13484  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623
    2724namespace HeuristicLab.Problems.Instances {
    2825  public enum DistanceMeasure { Direct, Euclidean, RoundedEuclidean, UpperEuclidean, Geo, Manhattan, Maximum, Att };
    29  
     26
    3027  public static class DistanceHelper {
    3128    /// <summary>
     
    3532    public static double[,] GetDistanceMatrix(DistanceMeasure distanceMeasure, double[,] coordinates, double[,] distances, int dimension) {
    3633      if (distances != null) return distances;
    37      
     34
    3835      distances = new double[dimension, dimension];
    3936      for (int i = 0; i < dimension - 1; i++)
     
    4441
    4542      return distances;
     43    }
     44
     45    public static double GetDistance(DistanceMeasure distanceMeasure, double x1, double y1, double x2, double y2) {
     46      switch (distanceMeasure) {
     47        case DistanceMeasure.Att:
     48          return AttDistance(x1, y1, x2, y2);
     49        case DistanceMeasure.Direct:
     50          throw new ArgumentException("Direct distance measure requires distance matrix for distance calculation.");
     51        case DistanceMeasure.Euclidean:
     52          return EuclideanDistance(x1, y1, x2, y2);
     53        case DistanceMeasure.Geo:
     54          return GeoDistance(x1, y1, x2, y2);
     55        case DistanceMeasure.Manhattan:
     56          return ManhattanDistance(x1, y1, x2, y2);
     57        case DistanceMeasure.Maximum:
     58          return MaximumDistance(x1, y1, x2, y2);
     59        case DistanceMeasure.RoundedEuclidean:
     60          return Math.Round(EuclideanDistance(x1, y1, x2, y2));
     61        case DistanceMeasure.UpperEuclidean:
     62          return Math.Ceiling(EuclideanDistance(x1, y1, x2, y2));
     63        default:
     64          throw new InvalidOperationException("Distance measure is not known.");
     65      }
    4666    }
    4767
  • trunk/sources/HeuristicLab.Problems.PTSP.Views/3.3/HeuristicLab.Problems.PTSP.Views-3.3.csproj

    r13470 r13484  
    1717    <DebugType>full</DebugType>
    1818    <Optimize>false</Optimize>
    19     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     19    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2020    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2121    <ErrorReport>prompt</ErrorReport>
     
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
     
    3333  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    3434    <DebugSymbols>true</DebugSymbols>
    35     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     35    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3636    <DefineConstants>DEBUG;TRACE</DefineConstants>
    3737    <DebugType>full</DebugType>
     
    4141  </PropertyGroup>
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>TRACE</DefineConstants>
    4545    <Optimize>true</Optimize>
     
    5151  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    5252    <DebugSymbols>true</DebugSymbols>
    53     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5555    <DebugType>full</DebugType>
     
    5959  </PropertyGroup>
    6060  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    61     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6262    <DefineConstants>TRACE</DefineConstants>
    6363    <Optimize>true</Optimize>
     
    6868  </PropertyGroup>
    6969  <ItemGroup>
    70     <Reference Include="HeuristicLab.Collections-3.3">
    71       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    72       <Private>False</Private>
    73     </Reference>
    74     <Reference Include="HeuristicLab.Common-3.3">
    75       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    76       <Private>False</Private>
    77     </Reference>
    78     <Reference Include="HeuristicLab.Core-3.3">
    79       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    80       <Private>False</Private>
    81     </Reference>
    82     <Reference Include="HeuristicLab.Core.Views-3.3">
    83       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    84       <Private>False</Private>
    85     </Reference>
    86     <Reference Include="HeuristicLab.Data-3.3">
    87       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    88       <Private>False</Private>
    89     </Reference>
    90     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    91       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    92       <Private>False</Private>
    93     </Reference>
    94     <Reference Include="HeuristicLab.MainForm-3.3">
    95       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    96       <Private>False</Private>
    97     </Reference>
    98     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    99       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    100       <Private>False</Private>
    101     </Reference>
    102     <Reference Include="HeuristicLab.Optimization-3.3">
    103       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    104       <Private>False</Private>
    105     </Reference>
    106     <Reference Include="HeuristicLab.Optimization.Views-3.3">
    107       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    108       <Private>False</Private>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Parameters-3.3">
    111       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    112       <Private>False</Private>
    113     </Reference>
    114     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    115       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    116       <Private>False</Private>
    117     </Reference>
    118     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    119       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    120       <Private>False</Private>
    121     </Reference>
    122     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123       <SpecificVersion>False</SpecificVersion>
    124       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    125       <Private>False</Private>
    126     </Reference>
     70    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     71      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     72      <Name>HeuristicLab.Collections-3.3</Name>
     73      <Private>False</Private>
     74    </ProjectReference>
     75    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     76      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     77      <Name>HeuristicLab.Common-3.3</Name>
     78      <Private>False</Private>
     79    </ProjectReference>
     80    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     81      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     82      <Name>HeuristicLab.Core.Views-3.3</Name>
     83      <Private>False</Private>
     84    </ProjectReference>
     85    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     86      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     87      <Name>HeuristicLab.Core-3.3</Name>
     88      <Private>False</Private>
     89    </ProjectReference>
     90    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     91      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     92      <Name>HeuristicLab.Data-3.3</Name>
     93      <Private>False</Private>
     94    </ProjectReference>
     95    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     96      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     97      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     98      <Private>False</Private>
     99    </ProjectReference>
     100    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     101      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     102      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     103      <Private>False</Private>
     104    </ProjectReference>
     105    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     106      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     107      <Name>HeuristicLab.MainForm-3.3</Name>
     108      <Private>False</Private>
     109    </ProjectReference>
     110    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
     111      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
     112      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     113      <Private>False</Private>
     114    </ProjectReference>
     115    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     116      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     117      <Name>HeuristicLab.Optimization-3.3</Name>
     118      <Private>False</Private>
     119    </ProjectReference>
     120    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     121      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     122      <Name>HeuristicLab.Parameters-3.3</Name>
     123      <Private>False</Private>
     124    </ProjectReference>
     125    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     126      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     127      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     128      <Private>False</Private>
     129    </ProjectReference>
     130    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     131      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     132      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     133      <Private>False</Private>
     134    </ProjectReference>
     135    <ProjectReference Include="..\..\HeuristicLab.Problems.PTSP\3.3\HeuristicLab.Problems.PTSP-3.3.csproj">
     136      <Project>{97198965-afea-496b-b3b1-316905c43fd6}</Project>
     137      <Name>HeuristicLab.Problems.PTSP-3.3</Name>
     138      <Private>False</Private>
     139    </ProjectReference>
     140    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     141      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     142      <Name>HeuristicLab.Random-3.3</Name>
     143      <Private>False</Private>
     144    </ProjectReference>
    127145    <Reference Include="System" />
    128146    <Reference Include="System.Core" />
     
    156174    <None Include="Properties\AssemblyInfo.cs.frame" />
    157175  </ItemGroup>
    158   <ItemGroup>
    159     <ProjectReference Include="..\..\HeuristicLab.Problems.PTSP\3.3\HeuristicLab.Problems.PTSP-3.3.csproj">
    160       <Project>{97198965-afea-496b-b3b1-316905c43fd6}</Project>
    161       <Name>HeuristicLab.Problems.PTSP-3.3</Name>
    162       <Private>False</Private>
    163     </ProjectReference>
    164   </ItemGroup>
    165176  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    166177  <PropertyGroup>
    167     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     178    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    168179set ProjectDir=$(ProjectDir)
    169180set SolutionDir=$(SolutionDir)
    170 set Outdir=$(Outdir)
     181set OutDir=$(OutDir)
     182set TargetDir=$(TargetDir)
    171183
    172 call PreBuildEvent.cmd</PreBuildEvent>
     184call PreBuildEvent.cmd
     185    </PreBuildEvent>
     186    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     187export ProjectDir=$(ProjectDir)
     188export SolutionDir=$(SolutionDir)
     189
     190$SolutionDir/PreBuildEvent.sh
     191    </PreBuildEvent>
    173192  </PropertyGroup>
    174193  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/sources/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj

    r13470 r13484  
    1717    <DebugType>full</DebugType>
    1818    <Optimize>false</Optimize>
    19     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     19    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2020    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2121    <ErrorReport>prompt</ErrorReport>
     
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
     
    3939  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4040    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4242    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4343    <DebugType>full</DebugType>
     
    4747  </PropertyGroup>
    4848  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    49     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     49    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5050    <DefineConstants>TRACE</DefineConstants>
    5151    <Optimize>true</Optimize>
     
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    5858    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6161    <DebugType>full</DebugType>
     
    6565  </PropertyGroup>
    6666  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    67     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     67    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6868    <DefineConstants>TRACE</DefineConstants>
    6969    <Optimize>true</Optimize>
     
    7474  </PropertyGroup>
    7575  <ItemGroup>
    76     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    77       <SpecificVersion>False</SpecificVersion>
    78       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    79       <Private>False</Private>
    80     </Reference>
    81     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    82       <SpecificVersion>False</SpecificVersion>
    83       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    84       <Private>False</Private>
    85     </Reference>
    86     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    87       <SpecificVersion>False</SpecificVersion>
    88       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    89       <Private>False</Private>
    90     </Reference>
    91     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    92       <SpecificVersion>False</SpecificVersion>
    93       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    94       <Private>False</Private>
    95     </Reference>
    96     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    97       <SpecificVersion>False</SpecificVersion>
    98       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    99       <Private>False</Private>
    100     </Reference>
    101     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <SpecificVersion>False</SpecificVersion>
    103       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    104       <Private>False</Private>
    105     </Reference>
    106     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    107       <SpecificVersion>False</SpecificVersion>
    108       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    109       <Private>False</Private>
    110     </Reference>
    111     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <SpecificVersion>False</SpecificVersion>
    113       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization\3.3\obj\Release\HeuristicLab.Optimization-3.3.dll</HintPath>
    114       <Private>False</Private>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117       <SpecificVersion>False</SpecificVersion>
    118       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    119       <Private>False</Private>
    120     </Reference>
    121     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    122       <SpecificVersion>False</SpecificVersion>
    123       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    124       <Private>False</Private>
    125     </Reference>
    126     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    127       <SpecificVersion>False</SpecificVersion>
    128       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    129       <Private>False</Private>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132       <SpecificVersion>False</SpecificVersion>
    133       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    134       <Private>False</Private>
    135     </Reference>
     76    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     77      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     78      <Name>HeuristicLab.Collections-3.3</Name>
     79      <Private>False</Private>
     80    </ProjectReference>
     81    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     82      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     83      <Name>HeuristicLab.Common.Resources-3.3</Name>
     84      <Private>False</Private>
     85    </ProjectReference>
     86    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     87      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     88      <Name>HeuristicLab.Common-3.3</Name>
     89      <Private>False</Private>
     90    </ProjectReference>
     91    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     92      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     93      <Name>HeuristicLab.Core-3.3</Name>
     94      <Private>False</Private>
     95    </ProjectReference>
     96    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     97      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     98      <Name>HeuristicLab.Data-3.3</Name>
     99      <Private>False</Private>
     100    </ProjectReference>
     101    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     102      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     103      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     104      <Private>False</Private>
     105    </ProjectReference>
     106    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     107      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     108      <Name>HeuristicLab.Operators-3.3</Name>
     109      <Private>False</Private>
     110    </ProjectReference>
     111    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     112      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     113      <Name>HeuristicLab.Optimization-3.3</Name>
     114      <Private>False</Private>
     115    </ProjectReference>
     116    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     117      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     118      <Name>HeuristicLab.Parameters-3.3</Name>
     119      <Private>False</Private>
     120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     122      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     123      <Name>HeuristicLab.Persistence-3.3</Name>
     124      <Private>False</Private>
     125    </ProjectReference>
     126    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     127      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     128      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     129      <Private>False</Private>
     130    </ProjectReference>
     131    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     132      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     133      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     134      <Private>False</Private>
     135    </ProjectReference>
     136    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     137      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     138      <Name>HeuristicLab.Random-3.3</Name>
     139      <Private>False</Private>
     140    </ProjectReference>
    136141    <Reference Include="System" />
    137142    <Reference Include="System.Core" />
     
    192197    <None Include="HeuristicLab.snk" />
    193198  </ItemGroup>
    194   <ItemGroup>
    195     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    196       <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
    197       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200   </ItemGroup>
    201199  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    202200  <PropertyGroup>
    203     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     201    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    204202set ProjectDir=$(ProjectDir)
    205203set SolutionDir=$(SolutionDir)
     204set OutDir=$(OutDir)
     205set TargetDir=$(TargetDir)
    206206
    207 call PreBuildEvent.cmd</PreBuildEvent>
     207call PreBuildEvent.cmd
     208    </PreBuildEvent>
    208209    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    209       export ProjectDir=$(ProjectDir)
    210       export SolutionDir=$(SolutionDir)
     210export ProjectDir=$(ProjectDir)
     211export SolutionDir=$(SolutionDir)
    211212
    212       $SolutionDir/PreBuildEvent.sh
     213$SolutionDir/PreBuildEvent.sh
    213214    </PreBuildEvent>
    214215  </PropertyGroup>
  • trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

    r12722 r13484  
    4646        typeof (HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution),
    4747        typeof (HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution),
    48         typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix)
     48        typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix),
     49        typeof (HeuristicLab.Problems.PTSP.DistanceMatrix)
    4950      };
    5051      excludedTypes.Add(typeof(SymbolicExpressionGrammar).Assembly.GetType("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.EmptySymbolicExpressionTreeGrammar"));
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r13395 r13484  
    201201      <SpecificVersion>False</SpecificVersion>
    202202      <HintPath>..\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.dll</HintPath>
     203      <Private>False</Private>
    203204    </Reference>
    204205    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     
    367368    <Reference Include="HeuristicLab.Problems.Orienteering-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    368369      <HintPath>..\bin\HeuristicLab.Problems.Orienteering-3.3.dll</HintPath>
     370      <Private>False</Private>
     371    </Reference>
     372    <Reference Include="HeuristicLab.Problems.PTSP-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     373      <SpecificVersion>False</SpecificVersion>
     374      <HintPath>..\bin\HeuristicLab.Problems.PTSP-3.3.dll</HintPath>
    369375      <Private>False</Private>
    370376    </Reference>
     
    572578    <Compile Include="HeuristicLab.Problems.Instances-3.3\TSPLIBInstanceProviderTest.cs" />
    573579    <Compile Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3\ClassificationInstanceProviderTest.cs" />
     580    <Compile Include="HeuristicLab.Problems.PTSP-3.3\PTSPMoveEvaluatorTest.cs" />
    574581    <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIBInstancesTest.cs" />
    575582    <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPMoveEvaluatorTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.