Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/01/13 13:01:40 (11 years ago)
Author:
bburlacu
Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:
branches/HeuristicLab.EvolutionaryTracking
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.EvolutionaryTracking

  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

    r9834 r9835  
    9494  </PropertyGroup>
    9595  <ItemGroup>
     96    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     97      <SpecificVersion>False</SpecificVersion>
     98      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     99      <Private>False</Private>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     104      <Private>False</Private>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <SpecificVersion>False</SpecificVersion>
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     117      <SpecificVersion>False</SpecificVersion>
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     119      <Private>False</Private>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122      <SpecificVersion>False</SpecificVersion>
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     127      <SpecificVersion>False</SpecificVersion>
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     132      <SpecificVersion>False</SpecificVersion>
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     137      <SpecificVersion>False</SpecificVersion>
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     139      <Private>False</Private>
     140    </Reference>
     141    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     142      <SpecificVersion>False</SpecificVersion>
     143      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     144      <Private>False</Private>
     145    </Reference>
     146    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     147      <SpecificVersion>False</SpecificVersion>
     148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     149      <Private>False</Private>
     150    </Reference>
    96151    <Reference Include="System" />
    97152    <Reference Include="System.Core">
    … …  
    134189    </Compile>
    135190    <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
     191    <Compile Include="Crossovers\TracingSymbolicExpressionTreeCrossover.cs" />
    136192    <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
     193    <Compile Include="Fragment.cs" />
     194    <Compile Include="GenericWrapper.cs" />
     195    <Compile Include="GeneticExchange.cs" />
     196    <Compile Include="Interfaces\IFragment.cs" />
    137197    <Compile Include="Interfaces\IReadOnlySymbol.cs" />
    138198    <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
    139199    <Compile Include="Interfaces\ISymbolicExpressionGrammarBase.cs" />
    140200    <Compile Include="Interfaces\ISymbolicExpressionTreeGrammar.cs" />
     201    <Compile Include="Interfaces\ISymbolicExpressionTreeNodeComparer.cs" />
     202    <Compile Include="Interfaces\ISymbolicExpressionTreeNodeSimilarityComparer.cs" />
    141203    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeArchitectureAlteringOperator.cs" />
    142204    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeGrammarBasedOperator.cs" />
    … …  
    154216    <Compile Include="Interfaces\ISymbolicExpressionTreeStringFormatter.cs" />
    155217    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeSizeConstraintOperator.cs" />
     218    <Compile Include="Interfaces\Operators\ITracingSymbolicExpressionTreeOperator.cs" />
    156219    <Compile Include="Manipulators\ChangeNodeTypeManipulation.cs" />
    157220    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeManipulator.cs" />
    … …  
    162225    <Compile Include="Manipulators\OnePointShaker.cs" />
    163226    <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
     227    <Compile Include="Manipulators\TracingSymbolicExpressionTreeManipulator.cs" />
    164228    <Compile Include="Plugin.cs" />
    165229    <Compile Include="SymbolicExpressionGrammarBase.cs" />
    … …  
    188252    <Compile Include="Symbols\ProgramRootSymbol.cs" />
    189253    <Compile Include="Symbols\Symbol.cs" />
     254    <Compile Include="TracingSymbolicExpressionTreeOperator.cs" />
    190255  </ItemGroup>
    191256  <ItemGroup>
    … …  
    193258    <None Include="Plugin.cs.frame" />
    194259    <None Include="Properties\AssemblyInfo.cs.frame" />
    195   </ItemGroup>
    196   <ItemGroup>
    197     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    198       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    199       <Name>HeuristicLab.Analysis-3.3</Name>
    200       <Private>False</Private>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    203       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    204       <Name>HeuristicLab.Collections-3.3</Name>
    205       <Private>False</Private>
    206     </ProjectReference>
    207     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    208       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    209       <Name>HeuristicLab.Common.Resources-3.3</Name>
    210       <Private>False</Private>
    211     </ProjectReference>
    212     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    213       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    214       <Name>HeuristicLab.Common-3.3</Name>
    215       <Private>False</Private>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    218       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    219       <Name>HeuristicLab.Core-3.3</Name>
    220       <Private>False</Private>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    223       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    224       <Name>HeuristicLab.Data-3.3</Name>
    225       <Private>False</Private>
    226     </ProjectReference>
    227     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    228       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    229       <Name>HeuristicLab.Operators-3.3</Name>
    230       <Private>False</Private>
    231     </ProjectReference>
    232     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    233       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    234       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    235       <Private>False</Private>
    236     </ProjectReference>
    237     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    238       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    239       <Name>HeuristicLab.Optimization-3.3</Name>
    240       <Private>False</Private>
    241     </ProjectReference>
    242     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    243       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    244       <Name>HeuristicLab.Parameters-3.3</Name>
    245       <Private>False</Private>
    246     </ProjectReference>
    247     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    248       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    249       <Name>HeuristicLab.Persistence-3.3</Name>
    250       <Private>False</Private>
    251     </ProjectReference>
    252     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    253       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    254       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    255       <Private>False</Private>
    256     </ProjectReference>
    257     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    258       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    259       <Name>HeuristicLab.Random-3.3</Name>
    260       <Private>False</Private>
    261     </ProjectReference>
    262260  </ItemGroup>
    263261  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.