Changeset 5026


Ignore:
Timestamp:
12/06/10 10:28:34 (11 years ago)
Author:
mkommend
Message:

Added branched projects for new GP symbols (ticket #1256).

Location:
branches/GP.Symbols (TimeLag, Diff, Integral)
Files:
10 added
9 edited
7 copied

Legend:

Unmodified
Added
Removed
  • branches/GP.Symbols (TimeLag, Diff, Integral)

    • Property svn:ignore set to
      GP.Symbols.suo
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj

    r4249 r5026  
    9292  </PropertyGroup>
    9393  <ItemGroup>
     94    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     95      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
     96    </Reference>
     97    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     98      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     99    </Reference>
     100    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     101      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     104      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     107      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     110      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     113      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     116      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     119      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     122      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     125      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     126    </Reference>
     127    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     128      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     131      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     132    </Reference>
    94133    <Reference Include="System" />
    95134    <Reference Include="System.Core">
     
    128167    <Compile Include="Interfaces\ISymbolicExpressionTreeCreator.cs" />
    129168    <Compile Include="Interfaces\ISymbolicExpressionTreeCrossover.cs" />
     169    <Compile Include="Interfaces\ISymbolicExpressionTreeNode.cs" />
    130170    <Compile Include="Manipulators\ChangeNodeTypeManipulation.cs" />
    131171    <Compile Include="Interfaces\ISymbolicExpressionTreeManipulator.cs" />
     
    172212  </ItemGroup>
    173213  <ItemGroup>
    174     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    175       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    176       <Name>HeuristicLab.Analysis-3.3</Name>
    177     </ProjectReference>
    178     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    179       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    180       <Name>HeuristicLab.Collections-3.3</Name>
    181     </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    183       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    184       <Name>HeuristicLab.Common.Resources-3.3</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    187       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    188       <Name>HeuristicLab.Common-3.3</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    191       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    192       <Name>HeuristicLab.Core-3.3</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    195       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    196       <Name>HeuristicLab.Data-3.3</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    199       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    200       <Name>HeuristicLab.Operators-3.3</Name>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    203       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    204       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    207       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    208       <Name>HeuristicLab.Optimization-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    211       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    212       <Name>HeuristicLab.Parameters-3.3</Name>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    215       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    216       <Name>HeuristicLab.Persistence-3.3</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    219       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    220       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    223       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    224       <Name>HeuristicLab.Random-3.3</Name>
    225     </ProjectReference>
    226   </ItemGroup>
    227   <ItemGroup>
    228214    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    229215      <Visible>False</Visible>
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r4980 r5026  
    9191  </PropertyGroup>
    9292  <ItemGroup>
     93    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     94      <HintPath>c:\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     95    </Reference>
     96    <Reference Include="HeuristicLab.ALGLIB-3.1.0, Version=2.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     97      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     100      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
     101    </Reference>
     102    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     103      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     106      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     109      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     112      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     115      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     118      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.LibSVM-1.6.3.dll</HintPath>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     124      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     127      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     130      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     133      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     134    </Reference>
     135    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     136      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     137    </Reference>
     138    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     139      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     140    </Reference>
     141    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     142      <HintPath>c:\Program Files\HeuristicLab 3.3\LibSVM-1.6.3.dll</HintPath>
     143    </Reference>
    93144    <Reference Include="System" />
    94145    <Reference Include="System.Core">
     
    148199  </ItemGroup>
    149200  <ItemGroup>
    150     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    151       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    152       <Name>HeuristicLab.Analysis-3.3</Name>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    155       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    156       <Name>HeuristicLab.Collections-3.3</Name>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    159       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    160       <Name>HeuristicLab.Common.Resources-3.3</Name>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    163       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    164       <Name>HeuristicLab.Common-3.3</Name>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    167       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    168       <Name>HeuristicLab.Core-3.3</Name>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    171       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    172       <Name>HeuristicLab.Data-3.3</Name>
    173     </ProjectReference>
    174     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    175       <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
    176       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    177     </ProjectReference>
    178201    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    179202      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    180203      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    181204    </ProjectReference>
    182     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    183       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    184       <Name>ALGLIB-3.1.0</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    187       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    188       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    191       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    192       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    195       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    196       <Name>LibSVM-1.6.3</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    199       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    200       <Name>HeuristicLab.Operators-3.3</Name>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    203       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    204       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    207       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    208       <Name>HeuristicLab.Optimization-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    211       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    212       <Name>HeuristicLab.Parameters-3.3</Name>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    215       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    216       <Name>HeuristicLab.Persistence-3.3</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    219       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    220       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    221     </ProjectReference>
    222205    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    223206      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    224207      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    225     </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
    227       <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
    228       <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>
    229     </ProjectReference>
    230     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    231       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    232       <Name>HeuristicLab.Random-3.3</Name>
    233208    </ProjectReference>
    234209  </ItemGroup>
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

    r4797 r5026  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
     28using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2829using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2930using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
     
    7677
    7778    protected override void RecalculateEstimatedValues() {
    78       int minLag = 0;
    79       var laggedTreeNodes = Model.SymbolicExpressionTree.IterateNodesPrefix().OfType<LaggedVariableTreeNode>();
    80       if (laggedTreeNodes.Any())
    81         minLag = laggedTreeNodes.Min(node => node.Lag);
     79      int minLag = GetMinimumLagFromTree(Model.SymbolicExpressionTree.Root);
    8280      IEnumerable<double> calculatedValues =
    8381          from x in Model.GetEstimatedValues(ProblemData, 0 - minLag, ProblemData.Dataset.Rows)
     
    9391        yield return estimatedValues[row];
    9492    }
     93
     94    protected int GetMinimumLagFromTree(SymbolicExpressionTreeNode node) {
     95      if (node == null) return 0;
     96      int lag = 0;
     97
     98      var laggedTreeNode = node as ILaggedTreeNode;
     99      if (laggedTreeNode != null) lag += laggedTreeNode.Lag;
     100
     101      int subtreeLag = 0;
     102      foreach (var subtree in node.SubTrees) {
     103        subtreeLag = Math.Min(subtreeLag, GetMinimumLagFromTree(subtree));
     104      }
     105      return lag + subtreeLag;
     106    }
    95107  }
    96108}
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

    r4988 r5026  
    9191  </PropertyGroup>
    9292  <ItemGroup>
     93    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     94      <HintPath>c:\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     95    </Reference>
     96    <Reference Include="HeuristicLab.ALGLIB-3.1.0, Version=2.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     97      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     100      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     101    </Reference>
     102    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     103      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     106      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     109      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     112      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Data.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     115      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     118      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.dll</HintPath>
     119    </Reference>
     120    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     122    </Reference>
     123    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     124      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     127      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     130      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Optimizer-3.3">
     133      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimizer-3.3.dll</HintPath>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     136      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     137    </Reference>
     138    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     139      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     140    </Reference>
     141    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     142      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     145      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     146    </Reference>
    93147    <Reference Include="System" />
    94148    <Reference Include="System.Core">
     
    211265  </ItemGroup>
    212266  <ItemGroup>
    213     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    214       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    215       <Name>HeuristicLab.Collections-3.3</Name>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    218       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    219       <Name>HeuristicLab.Common-3.3</Name>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    222       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    223       <Name>HeuristicLab.Core.Views-3.3</Name>
    224     </ProjectReference>
    225     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    226       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    227       <Name>HeuristicLab.Core-3.3</Name>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    230       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    231       <Name>HeuristicLab.Data.Views-3.3</Name>
    232     </ProjectReference>
    233     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    234       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    235       <Name>HeuristicLab.Data-3.3</Name>
    236     </ProjectReference>
    237     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj">
    238       <Project>{6F42C5F8-16CD-43EE-8208-FD4573A69D85}</Project>
    239       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
    240     </ProjectReference>
    241267    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    242268      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    243269      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    244     </ProjectReference>
    245     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    246       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    247       <Name>ALGLIB-3.1.0</Name>
    248     </ProjectReference>
    249     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    250       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    251       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    252     </ProjectReference>
    253     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    254       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    255       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    256     </ProjectReference>
    257     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    258       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    259       <Name>HeuristicLab.MainForm-3.3</Name>
    260     </ProjectReference>
    261     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    262       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    263       <Name>HeuristicLab.Operators-3.3</Name>
    264     </ProjectReference>
    265     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    266       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    267       <Name>HeuristicLab.Optimization-3.3</Name>
    268     </ProjectReference>
    269     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    270       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    271       <Name>HeuristicLab.Parameters-3.3</Name>
    272     </ProjectReference>
    273     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    274       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    275       <Name>HeuristicLab.Persistence-3.3</Name>
    276     </ProjectReference>
    277     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    278       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    279       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    280270    </ProjectReference>
    281271    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
     
    286276      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    287277      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    288     </ProjectReference>
    289     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    290       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    291       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    292278    </ProjectReference>
    293279  </ItemGroup>
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.Designer.cs

    r5005 r5026  
    2121
    2222namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic.Symbols {
    23   partial class LaggedVariableView {
     23  partial class TimeLagView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    5151      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5252      this.SuspendLayout();
    53       //
    54       // initializationGroupBox
    55       //
    56       this.initializationGroupBox.Location = new System.Drawing.Point(3, 131);
    57       this.initializationGroupBox.Size = new System.Drawing.Size(399, 73);
    58       //
    59       // mutationGroupBox
    60       //
    61       this.mutationGroupBox.Location = new System.Drawing.Point(6, 210);
    62       this.mutationGroupBox.Size = new System.Drawing.Size(396, 73);
    6353      //
    6454      // initialFrequencyLabel
     
    117107      this.maxTimeOffsetTextBox.TextChanged += new System.EventHandler(this.maxTimeOffsetTextBox_TextChanged);
    118108      //
    119       // LaggedVariableView
     109      // TimeLagView
    120110      //
    121111      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     
    125115      this.Controls.Add(this.maxTimeOffsetLabel);
    126116      this.Controls.Add(this.minTimeOffsetLabel);
    127       this.Name = "LaggedVariableView";
    128       this.Size = new System.Drawing.Size(408, 292);
    129       this.Controls.SetChildIndex(this.initializationGroupBox, 0);
     117      this.Name = "TimeLagView";
     118      this.Size = new System.Drawing.Size(408, 141);
    130119      this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);
    131120      this.Controls.SetChildIndex(this.initialFrequencyLabel, 0);
     
    134123      this.Controls.SetChildIndex(this.nameTextBox, 0);
    135124      this.Controls.SetChildIndex(this.descriptionTextBox, 0);
    136       this.Controls.SetChildIndex(this.mutationGroupBox, 0);
    137125      this.Controls.SetChildIndex(this.minTimeOffsetLabel, 0);
    138126      this.Controls.SetChildIndex(this.maxTimeOffsetLabel, 0);
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/TimeLagView.cs

    r5005 r5026  
    2525using HeuristicLab.MainForm.WindowsForms;
    2626using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
     27using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic.Symbols {
    29   [View("LaggedVariable View")]
    30   [Content(typeof(LaggedVariable), true)]
    31   public partial class LaggedVariableView : VariableView {
    32     public new LaggedVariable Content {
    33       get { return (LaggedVariable)base.Content; }
     30  [View("TimeLag View")]
     31  [Content(typeof(TimeLag), true)]
     32  public partial class TimeLagView : SymbolView {
     33    public new TimeLag Content {
     34      get { return (TimeLag)base.Content; }
    3435      set { base.Content = value; }
    3536    }
    3637
    37     public LaggedVariableView() {
     38    public TimeLagView() {
    3839      InitializeComponent();
    3940    }
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r5013 r5026  
    9191  </PropertyGroup>
    9292  <ItemGroup>
     93    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     94      <HintPath>c:\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     95    </Reference>
     96    <Reference Include="HeuristicLab.ALGLIB-3.1.0, Version=2.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     97      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     100      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     101    </Reference>
     102    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     103      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     106      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     109      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     112      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     115      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     116    </Reference>
     117    <Reference Include="HeuristicLab.LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     118      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.LibSVM-1.6.3.dll</HintPath>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     124      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     127      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     128    </Reference>
     129    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     130      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     131    </Reference>
     132    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     133      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     136      <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     137    </Reference>
     138    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     139      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\LibSVM-1.6.3.dll</HintPath>
     140    </Reference>
    93141    <Reference Include="System" />
    94142    <Reference Include="System.Core">
     
    129177    <Compile Include="Evaluators\SimpleVarianceAccountedForEvaluator.cs" />
    130178    <Compile Include="HeuristicLabProblemsDataAnalysisPlugin.cs" />
     179    <Compile Include="Interfaces\ILaggedTreeNode.cs" />
    131180    <Compile Include="Interfaces\ISingleObjectiveDataAnalysisProblem.cs" />
    132181    <Compile Include="Interfaces\IDataAnalysisModel.cs" />
     
    147196    <Compile Include="Symbolic\SymbolicSimplifier.cs" />
    148197    <Compile Include="Symbolic\Symbols\Addition.cs" />
     198    <Compile Include="Symbolic\Symbols\LaggedSymbol.cs" />
    149199    <Compile Include="Symbolic\Symbols\Constant.cs" />
    150200    <Compile Include="Symbolic\Symbols\ConstantTreeNode.cs" />
     201    <Compile Include="Symbolic\Symbols\LaggedTreeNode.cs" />
    151202    <Compile Include="Symbolic\Symbols\LaggedVariable.cs" />
    152203    <Compile Include="Symbolic\Symbols\LaggedVariableTreeNode.cs" />
     
    166217    <Compile Include="Symbolic\Symbols\Multiplication.cs" />
    167218    <Compile Include="Symbolic\Symbols\Subtraction.cs" />
     219    <Compile Include="Symbolic\Symbols\TimeLag.cs" />
    168220    <Compile Include="Symbolic\Symbols\Variable.cs" />
    169221    <Compile Include="Symbolic\Symbols\VariableTreeNode.cs" />
     
    171223  </ItemGroup>
    172224  <ItemGroup>
    173     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    174       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    175       <Name>HeuristicLab.Collections-3.3</Name>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    178       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    179       <Name>HeuristicLab.Common.Resources-3.3</Name>
    180     </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    182       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    183       <Name>HeuristicLab.Common-3.3</Name>
    184     </ProjectReference>
    185     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    186       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    187       <Name>HeuristicLab.Core-3.3</Name>
    188     </ProjectReference>
    189     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    190       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    191       <Name>HeuristicLab.Data-3.3</Name>
    192     </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    194       <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
    195       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    196     </ProjectReference>
    197225    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    198226      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    199227      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    200     </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    202       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    203       <Name>ALGLIB-3.1.0</Name>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    206       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    207       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    210       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    211       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    212     </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    214       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    215       <Name>LibSVM-1.6.3</Name>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    218       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    219       <Name>HeuristicLab.Operators-3.3</Name>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    222       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    223       <Name>HeuristicLab.Optimization-3.3</Name>
    224     </ProjectReference>
    225     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    226       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    227       <Name>HeuristicLab.Parameters-3.3</Name>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    230       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    231       <Name>HeuristicLab.Persistence-3.3</Name>
    232     </ProjectReference>
    233     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    234       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    235       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    236     </ProjectReference>
    237     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    238       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    239       <Name>HeuristicLab.Random-3.3</Name>
    240228    </ProjectReference>
    241229  </ItemGroup>
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/FullFunctionalExpressionGrammar.cs

    r4722 r5026  
    6060      var or = new Or();
    6161      var not = new Not();
     62      var timeLag = new TimeLag();
     63      timeLag.InitialFrequency = 0.0;
    6264      var constant = new Constant();
    6365      constant.MinValue = -20;
     
    6769      laggedVariable.InitialFrequency = 0.0;
    6870
    69       var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, constant, variableSymbol, laggedVariable };
    70       var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not };
     71      var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, exp, @if, gt, lt, and, or, not, timeLag, constant, variableSymbol, laggedVariable };
     72      var unaryFunctionSymbols = new List<Symbol>() { sin, cos, tan, log, exp, not, timeLag };
    7173      var binaryFunctionSymbols = new List<Symbol>() { gt, lt };
    7274      var functionSymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or };
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

    r4722 r5026  
    6666      public const byte Constant = 20;
    6767      public const byte Arg = 21;
     68
     69      public const byte TimeLag = 22;
    6870    }
    6971
     
    9092      { typeof(Constant), OpCodes.Constant },
    9193      { typeof(Argument), OpCodes.Arg },
     94      { typeof(TimeLag), OpCodes.TimeLag},
    9295    };
    9396    private const int ARGUMENT_STACK_SIZE = 1024;
     
    290293            return constTreeNode.Value;
    291294          }
     295        case OpCodes.TimeLag: {
     296            var timeLagTreeNode = (LaggedTreeNode)currentInstr.dynamicNode;
     297            row += timeLagTreeNode.Lag;
     298            if (row < 0 || row >= dataset.Rows) {
     299              row -= timeLagTreeNode.Lag;
     300              return double.NaN;
     301            }
     302            double result = Evaluate();
     303            row -= timeLagTreeNode.Lag;
     304            return result;
     305          }
    292306        default: throw new NotSupportedException();
    293307      }
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedTreeNode.cs

    r5005 r5026  
    2020#endregion
    2121
     22using System;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Random;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    2828  [StorableClass]
    29   public class VariableTreeNode : SymbolicExpressionTreeTerminalNode {
    30     public new Variable Symbol {
    31       get { return (Variable)base.Symbol; }
     29  public class LaggedTreeNode : SymbolicExpressionTreeNode, ILaggedTreeNode {
     30    public new LaggedSymbol Symbol {
     31      get { return (LaggedSymbol)base.Symbol; }
    3232    }
    3333    [Storable]
    34     private double weight;
    35     public double Weight {
    36       get { return weight; }
    37       set { weight = value; }
    38     }
    39     [Storable]
    40     private string variableName;
    41     public string VariableName {
    42       get { return variableName; }
    43       set { variableName = value; }
     34    private int lag;
     35    public int Lag {
     36      get { return lag; }
     37      set { lag = value; }
    4438    }
    4539
    4640    [StorableConstructor]
    47     protected VariableTreeNode(bool deserializing) : base(deserializing) { }
    48     protected VariableTreeNode(VariableTreeNode original, Cloner cloner)
     41    protected LaggedTreeNode(bool deserializing) : base(deserializing) { }
     42    protected LaggedTreeNode(LaggedTreeNode original, Cloner cloner)
    4943      : base(original, cloner) {
    50       weight = original.weight;
    51       variableName = original.variableName;
     44      lag = original.lag;
    5245    }
    53     protected VariableTreeNode() { }
    54     public VariableTreeNode(Variable variableSymbol) : base(variableSymbol) { }
     46    public LaggedTreeNode(LaggedSymbol timeLagSymbol) : base(timeLagSymbol) { }
    5547
    5648    public override bool HasLocalParameters {
    57       get {
    58         return true;
    59       }
     49      get { return true; }
    6050    }
    6151
    6252    public override void ResetLocalParameters(IRandom random) {
    6353      base.ResetLocalParameters(random);
    64       weight = NormalDistributedRandom.NextDouble(random, Symbol.WeightMu, Symbol.WeightSigma);
    65       variableName = Symbol.VariableNames.SelectRandom(random);
     54      lag = random.Next(Symbol.MinLag, Symbol.MaxLag + 1);
    6655    }
    6756
    6857    public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
    6958      base.ShakeLocalParameters(random, shakingFactor);
    70       double x = NormalDistributedRandom.NextDouble(random, Symbol.WeightManipulatorMu, Symbol.WeightManipulatorSigma);
    71       weight = weight + x * shakingFactor;
    72       variableName = Symbol.VariableNames.SelectRandom(random);
     59      lag = Math.Min(Symbol.MaxLag, Math.Max(Symbol.MinLag, lag + random.Next(-1, 2)));
    7360    }
    7461
    7562    public override IDeepCloneable Clone(Cloner cloner) {
    76       return new VariableTreeNode(this, cloner);
     63      return new LaggedTreeNode(this, cloner);
    7764    }
    7865
    7966    public override string ToString() {
    80       if (weight.IsAlmost(1.0)) return variableName;
    81       else return weight.ToString("E4") + " " + variableName;
     67      return base.ToString() + " " + lag.ToString();
    8268    }
    8369  }
  • branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariableTreeNode.cs

    r4722 r5026  
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
    2727  [StorableClass]
    28   public sealed class LaggedVariableTreeNode : VariableTreeNode {
     28  public sealed class LaggedVariableTreeNode : VariableTreeNode, ILaggedTreeNode {
    2929    public new LaggedVariable Symbol {
    3030      get { return (LaggedVariable)base.Symbol; }
Note: See TracChangeset for help on using the changeset viewer.