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
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    • Property svn:mergeinfo set to (toggle deleted branches)
      /stable/HeuristicLab.Problems.TravelingSalesmanmergedeligible
      /trunk/sources/HeuristicLab.Problems.TravelingSalesmanmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Problems.TravelingSalesman5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Problems.TravelingSalesman6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.TravelingSalesman4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.TravelingSalesman5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.TravelingSalesman5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.TravelingSalesman4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.TravelingSalesman6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.TravelingSalesman5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.TravelingSalesman6123-9799
      /branches/NET40/sources/HeuristicLab.Problems.TravelingSalesman5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.TravelingSalesman5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.TravelingSalesman7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.TravelingSalesman6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.TravelingSalesman6828
      /branches/RuntimeOptimizer/HeuristicLab.Problems.TravelingSalesman8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman7787-8333
      /branches/SlaveShutdown/HeuristicLab.Problems.TravelingSalesman8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.TravelingSalesman5370-5682
      /branches/Trunk/HeuristicLab.Problems.TravelingSalesman6829-6865
      /branches/UnloadJobs/HeuristicLab.Problems.TravelingSalesman9168-9215
      /branches/VNS/HeuristicLab.Problems.TravelingSalesman5594-5752
      /branches/histogram/HeuristicLab.Problems.TravelingSalesman5959-6341

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

    r9848 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>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    … …  
    6363  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     65    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <DebugType>full</DebugType>
    … …  
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
    … …  
    8383  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8484    <DebugSymbols>true</DebugSymbols>
    85     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     85    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8686    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8787    <DebugType>full</DebugType>
    … …  
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     93    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <DocumentationFile>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Analysis-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     106      <Private>False</Private>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Collections-3.3">
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     110      <Private>False</Private>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Common-3.3">
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Common.Resources-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     118      <Private>False</Private>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     121      <SpecificVersion>False</SpecificVersion>
     122      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     123      <Private>False</Private>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Data-3.3">
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     127      <Private>False</Private>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     130      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     131      <Private>False</Private>
     132    </Reference>
     133    <Reference Include="HeuristicLab.Operators-3.3">
     134      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     135      <Private>False</Private>
     136    </Reference>
     137    <Reference Include="HeuristicLab.Optimization-3.3">
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     139      <Private>False</Private>
     140    </Reference>
     141    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     142      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     143      <Private>False</Private>
     144    </Reference>
     145    <Reference Include="HeuristicLab.Parameters-3.3">
     146      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     147      <Private>False</Private>
     148    </Reference>
     149    <Reference Include="HeuristicLab.Persistence-3.3">
     150      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     151      <Private>False</Private>
     152    </Reference>
     153    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     154      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     155      <Private>False</Private>
     156    </Reference>
     157    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     158      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     159      <Private>False</Private>
     160    </Reference>
    104161    <Reference Include="System" />
    105162    <Reference Include="System.Core">
    … …  
    113170  <ItemGroup>
    114171    <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
     172    <Compile Include="Analyzers\TSPGenealogyAnalyzer.cs" />
    115173    <Compile Include="Analyzers\TSPPopulationDiversityAnalyzer.cs" />
    116174    <Compile Include="Analyzers\TSPAlleleFrequencyAnalyzer.cs" />
    … …  
    150208  </ItemGroup>
    151209  <ItemGroup>
    152     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    153       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    154       <Name>HeuristicLab.Analysis-3.3</Name>
    155       <Private>False</Private>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    158       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    159       <Name>HeuristicLab.Collections-3.3</Name>
    160       <Private>False</Private>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    163       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    164       <Name>HeuristicLab.Common.Resources-3.3</Name>
    165       <Private>False</Private>
    166     </ProjectReference>
    167     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    168       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    169       <Name>HeuristicLab.Common-3.3</Name>
    170       <Private>False</Private>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    173       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    174       <Name>HeuristicLab.Core-3.3</Name>
    175       <Private>False</Private>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    178       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    179       <Name>HeuristicLab.Data-3.3</Name>
    180       <Private>False</Private>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    183       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    184       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    185       <Private>False</Private>
    186     </ProjectReference>
    187     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    188       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    189       <Name>HeuristicLab.Operators-3.3</Name>
    190       <Private>False</Private>
    191     </ProjectReference>
    192     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    193       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    194       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    195     </ProjectReference>
    196     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    197       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    198       <Name>HeuristicLab.Optimization-3.3</Name>
    199       <Private>False</Private>
    200     </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    202       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    203       <Name>HeuristicLab.Parameters-3.3</Name>
    204       <Private>False</Private>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    207       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    208       <Name>HeuristicLab.Persistence-3.3</Name>
    209       <Private>False</Private>
    210     </ProjectReference>
    211     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    212       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    213       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    214       <Private>False</Private>
    215     </ProjectReference>
    216     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    217       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    218       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    219       <Private>False</Private>
    220     </ProjectReference>
    221   </ItemGroup>
    222   <ItemGroup>
    223210    <None Include="HeuristicLab.snk" />
    224211    <None Include="Plugin.cs.frame" />
    … …  
    242229    </BootstrapperPackage>
    243230  </ItemGroup>
     231  <ItemGroup>
     232    <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj">
     233      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
     234      <Name>HeuristicLab.EvolutionTracking-3.4</Name>
     235    </ProjectReference>
     236  </ItemGroup>
    244237  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    245238  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    … …  
    251244  -->
    252245  <PropertyGroup>
    253    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     246    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    254247set ProjectDir=$(ProjectDir)
    255248set SolutionDir=$(SolutionDir)
    … …  
    258251call PreBuildEvent.cmd
    259252</PreBuildEvent>
    260 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     253    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    261254export ProjectDir=$(ProjectDir)
    262255export SolutionDir=$(SolutionDir)
Note: See TracChangeset for help on using the changeset viewer.