Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/13/19 09:30:18 (5 years ago)
Author:
gkronber
Message:

#2974: merged r16478:16672 from trunk:HeuristicLab.Problems.DataAnalysis.Symbolic to branch:HeuristicLab.Problems.DataAnalysis.Symbolic

Location:
branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic

  • branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r16507 r16676  
    1111    <RootNamespace>HeuristicLab.Problems.DataAnalysis.Symbolic</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    164164      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    165165      <Private>False</Private>
     166    </Reference>
     167    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     168      <SpecificVersion>False</SpecificVersion>
     169      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    166170    </Reference>
    167171    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.NativeInterpreter-0.1, Version=0.0.0.1, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     
    242246    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs" />
    243247    <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs" />
     248    <Compile Include="Selectors\DiversitySelector.cs" />
    244249    <Compile Include="SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs" />
    245250    <Compile Include="SymbolicDataAnalysisModelComplexityCalculator.cs" />
     
    305310    <Compile Include="Symbols\Absolute.cs" />
    306311    <Compile Include="Symbols\CubeRoot.cs" />
     312    <Compile Include="Symbols\HyperbolicTangent.cs" />
    307313    <Compile Include="Symbols\VariableBase.cs" />
    308314    <Compile Include="Symbols\VariableTreeNodeBase.cs" />
     
    392398    </BootstrapperPackage>
    393399  </ItemGroup>
     400  <ItemGroup>
     401    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     402      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     403      <Name>HeuristicLab.Analysis-3.3</Name>
     404      <Private>False</Private>
     405    </ProjectReference>
     406    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     407      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     408      <Name>HeuristicLab.Collections-3.3</Name>
     409      <Private>False</Private>
     410    </ProjectReference>
     411    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     412      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     413      <Name>HeuristicLab.Common.Resources-3.3</Name>
     414      <Private>False</Private>
     415    </ProjectReference>
     416    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     417      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     418      <Name>HeuristicLab.Common-3.3</Name>
     419      <Private>False</Private>
     420    </ProjectReference>
     421    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     422      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     423      <Name>HeuristicLab.Core-3.3</Name>
     424      <Private>False</Private>
     425    </ProjectReference>
     426    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     427      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     428      <Name>HeuristicLab.Data-3.3</Name>
     429      <Private>False</Private>
     430    </ProjectReference>
     431    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     432      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     433      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     434      <Private>False</Private>
     435    </ProjectReference>
     436    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     437      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     438      <Name>HeuristicLab.Operators-3.3</Name>
     439      <Private>False</Private>
     440    </ProjectReference>
     441    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     442      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     443      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     444      <Private>False</Private>
     445    </ProjectReference>
     446    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     447      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     448      <Name>HeuristicLab.Optimization-3.3</Name>
     449    </ProjectReference>
     450    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     451      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     452      <Name>HeuristicLab.Parameters-3.3</Name>
     453      <Private>False</Private>
     454    </ProjectReference>
     455    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     456      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     457      <Name>HeuristicLab.Persistence-3.3</Name>
     458      <Private>False</Private>
     459    </ProjectReference>
     460    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     461      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     462      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     463      <Private>False</Private>
     464    </ProjectReference>
     465    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     466      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     467      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     468      <Private>False</Private>
     469    </ProjectReference>
     470    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     471      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     472      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     473      <Private>False</Private>
     474    </ProjectReference>
     475    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     476      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     477      <Name>HeuristicLab.Random-3.3</Name>
     478      <Private>False</Private>
     479    </ProjectReference>
     480    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     481      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
     482      <Name>HeuristicLab.Selection-3.3</Name>
     483    </ProjectReference>
     484  </ItemGroup>
    394485  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    395486  <!-- 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.