Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/07/14 21:44:36 (11 years ago)
Author:
bburlacu
Message:

#1772: Cleaned up the design of the generic genealogy analyzer and related classes, created generic genealogy graph view. Added instrumentation code to TravelingSalesmapProblem.cs allowing genealogy tracking. Merged trunk changes (instrumentation for multi operators).

Location:
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman.Views
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman.Views

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj

    r8600 r10300  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    6060  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6161    <DebugSymbols>true</DebugSymbols>
    62     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     62    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6363    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6464    <DebugType>full</DebugType>
    … …  
    6868  </PropertyGroup>
    6969  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    70     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     70    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7171    <DefineConstants>TRACE</DefineConstants>
    7272    <DocumentationFile>
    … …  
    8080  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8181    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     82    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8383    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8484    <DebugType>full</DebugType>
    … …  
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     90    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <DocumentationFile>
    … …  
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="HeuristicLab.Collections-3.3">
     102      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     103      <Private>False</Private>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Common-3.3">
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     107      <Private>False</Private>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <SpecificVersion>False</SpecificVersion>
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     112      <Private>False</Private>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Core.Views-3.3">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Data-3.3">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.MainForm-3.3">
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
     130    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     131      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     132      <Private>False</Private>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Optimization-3.3">
     135      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     136      <Private>False</Private>
     137    </Reference>
     138    <Reference Include="HeuristicLab.Optimization.Views-3.3">
     139      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     140      <Private>False</Private>
     141    </Reference>
     142    <Reference Include="HeuristicLab.Parameters-3.3">
     143      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     144      <Private>False</Private>
     145    </Reference>
     146    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     147      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     148      <Private>False</Private>
     149    </Reference>
     150    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     151      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     152      <Private>False</Private>
     153    </Reference>
     154    <Reference Include="HeuristicLab.Visualization-3.3, Version=3.3.0.9491, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     155      <SpecificVersion>False</SpecificVersion>
     156      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization-3.3.dll</HintPath>
     157    </Reference>
    101158    <Reference Include="System" />
    102159    <Reference Include="System.Core">
    … …  
    153210  </ItemGroup>
    154211  <ItemGroup>
    155     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    156       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    157       <Name>HeuristicLab.Collections-3.3</Name>
    158       <Private>False</Private>
     212    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking.Views\3.4\HeuristicLab.EvolutionTracking.Views-3.4.csproj">
     213      <Project>{318dfe8c-ca23-4f1b-a4ac-62b425060241}</Project>
     214      <Name>HeuristicLab.EvolutionTracking.Views-3.4</Name>
    159215    </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    161       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    162       <Name>HeuristicLab.Common-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    166       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    167       <Name>HeuristicLab.Core.Views-3.3</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    171       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    172       <Name>HeuristicLab.Core-3.3</Name>
    173       <Private>False</Private>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    176       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    177       <Name>HeuristicLab.Data-3.3</Name>
    178       <Private>False</Private>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    181       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    182       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    183       <Private>False</Private>
    184     </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    186       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    187       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    188       <Private>False</Private>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    191       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    192       <Name>HeuristicLab.MainForm-3.3</Name>
    193       <Private>False</Private>
    194     </ProjectReference>
    195     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    196       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    197       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    201       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    202       <Name>HeuristicLab.Optimization-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    206       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    207       <Name>HeuristicLab.Parameters-3.3</Name>
    208       <Private>False</Private>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    211       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    212       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    213       <Private>False</Private>
    214     </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    216       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    217       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    218       <Private>False</Private>
     216    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
     217      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
     218      <Name>HeuristicLab.EvolutionTracking-3.4</Name>
    219219    </ProjectReference>
    220220    <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    221       <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
     221      <Project>{d767c38d-8014-46b0-9a32-03a3aecce34a}</Project>
    222222      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
    223223      <Private>False</Private>
    … …  
    233233  -->
    234234  <PropertyGroup>
    235    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     235    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    236236set ProjectDir=$(ProjectDir)
    237237set SolutionDir=$(SolutionDir)
    … …  
    240240call PreBuildEvent.cmd
    241241</PreBuildEvent>
    242 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     242    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    243243export ProjectDir=$(ProjectDir)
    244244export SolutionDir=$(SolutionDir)
Note: See TracChangeset for help on using the changeset viewer.