Changeset 9562


Ignore:
Timestamp:
05/31/13 17:20:17 (6 years ago)
Author:
gkronber
Message:

#1967 worked on Gaussian process evolution.

Location:
branches/HeuristicLab.Problems.GaussianProcessTuning
Files:
343 added
11 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Algorithms.DataAnalysis.Experimental/HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj

    r9112 r9562  
    3030    <ErrorReport>prompt</ErrorReport>
    3131    <WarningLevel>4</WarningLevel>
     32    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    3233  </PropertyGroup>
    3334  <PropertyGroup>
     
    128129  </ItemGroup>
    129130  <ItemGroup>
     131    <Compile Include="EigenGaussianProcessModel.cs">
     132      <SubType>Code</SubType>
     133    </Compile>
     134    <Compile Include="EigenGaussianProcessRegressionModelCreator.cs">
     135      <SubType>Code</SubType>
     136    </Compile>
    130137    <Compile Include="Plugin.cs" />
    131138    <Compile Include="Properties\AssemblyInfo.cs" />
     
    135142  </ItemGroup>
    136143  <ItemGroup>
     144    <ProjectReference Include="..\HeuristicLab.Eigen\HeuristicLab.Eigen.vcxproj">
     145      <Project>{2e530a92-9788-4cb8-a754-a91092e770a3}</Project>
     146      <Name>HeuristicLab.Eigen</Name>
     147    </ProjectReference>
    137148    <ProjectReference Include="..\ILNumerics.2.14.4735.573\ILNumerics.csproj">
    138149      <Project>{93b4a10e-8979-4028-8ccf-49d88d6fac0c}</Project>
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Algorithms.DataAnalysis.Experimental/TunedGaussianProcessModel.cs

    r9124 r9562  
    166166          .ToArray();
    167167
    168         var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, null);
     168        var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, Enumerable.Range(0, x.GetLength(1)));
    169169        ILArray<double> myL = ILMath.zeros<double>(n, n);
    170170
     
    301301      .Select(r => mean.Mean(newX, r))
    302302      .ToArray();
    303       var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, null);
     303      var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, Enumerable.Range(0, x.GetLength(1)));
    304304      for (int i = 0; i < newN; i++) {
    305305        for (int j = 0; j < n; j++) {
     
    320320      var kss = new double[newN];
    321321      ILArray<double> sWKs = ILMath.zeros(n, newN);
    322       var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, null);
     322      var cov = covarianceFunction.GetParameterizedCovarianceFunction(covarianceParameter, Enumerable.Range(0, x.GetLength(1)));
    323323
    324324      // for stddev
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning.Tests/GaussianProcessTuning.Tests.csproj

    r9112 r9562  
    3232    <ErrorReport>prompt</ErrorReport>
    3333    <WarningLevel>4</WarningLevel>
     34    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    3435  </PropertyGroup>
    3536  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     
    123124  </ItemGroup>
    124125  <ItemGroup>
     126    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.Experimental\HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj">
     127      <Project>{6142B24E-9C86-410B-A65A-1DE65C8C2349}</Project>
     128      <Name>HeuristicLab.Algorithms.DataAnalysis.Experimental</Name>
     129    </ProjectReference>
     130    <ProjectReference Include="..\HeuristicLab.Eigen\HeuristicLab.Eigen.vcxproj">
     131      <Project>{2e530a92-9788-4cb8-a754-a91092e770a3}</Project>
     132      <Name>HeuristicLab.Eigen</Name>
     133    </ProjectReference>
    125134    <ProjectReference Include="..\HeuristicLab.Problems.GaussianProcessTuning\GaussianProcessTuning.csproj">
    126135      <Project>{9A04599C-D608-4240-8DA6-D41F51C515A3}</Project>
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning.Tests/UnitTest.cs

    r9099 r9562  
    66using HeuristicLab.Problems.DataAnalysis;
    77using HeuristicLab.Random;
     8using HeuristicLabEigen;
    89using Microsoft.VisualStudio.TestTools.UnitTesting;
    910
     
    8586      }
    8687    }
    87      */
     88*/
     89
     90
     91
    8892  }
    8993}
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning.sln

    r9212 r9562  
    2929Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GaussianProcessDemo", "GaussianProcessDemo\GaussianProcessDemo.csproj", "{D18AE898-F600-4754-B3B4-C0C7A364F973}"
    3030EndProject
     31Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeuristicLab.Eigen", "HeuristicLab.Eigen\HeuristicLab.Eigen.vcxproj", "{2E530A92-9788-4CB8-A754-A91092E770A3}"
     32EndProject
    3133Global
    3234  GlobalSection(TestCaseManagementSettings) = postSolution
     
    3638    Debug|Any CPU = Debug|Any CPU
    3739    Debug|Mixed Platforms = Debug|Mixed Platforms
     40    Debug|Win32 = Debug|Win32
    3841    Debug|x64 = Debug|x64
    3942    Debug|x86 = Debug|x86
    4043    Release|Any CPU = Release|Any CPU
    4144    Release|Mixed Platforms = Release|Mixed Platforms
     45    Release|Win32 = Release|Win32
    4246    Release|x64 = Release|x64
    4347    Release|x86 = Release|x86
    4448    ReleaseBuild|Any CPU = ReleaseBuild|Any CPU
    4549    ReleaseBuild|Mixed Platforms = ReleaseBuild|Mixed Platforms
     50    ReleaseBuild|Win32 = ReleaseBuild|Win32
    4651    ReleaseBuild|x64 = ReleaseBuild|x64
    4752    ReleaseBuild|x86 = ReleaseBuild|x86
     
    5257    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    5358    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|Mixed Platforms.Build.0 = Debug|x86
     59    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|Win32.ActiveCfg = Debug|x86
     60    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|Win32.Build.0 = Debug|x86
    5461    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|x64.ActiveCfg = Debug|x64
    5562    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Debug|x64.Build.0 = Debug|x64
     
    6067    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|Mixed Platforms.ActiveCfg = Release|x86
    6168    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|Mixed Platforms.Build.0 = Release|x86
     69    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|Win32.ActiveCfg = Release|x86
     70    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|Win32.Build.0 = Release|x86
    6271    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|x64.ActiveCfg = Release|x64
    6372    {9A04599C-D608-4240-8DA6-D41F51C515A3}.Release|x64.Build.0 = Release|x64
     
    6877    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|x86
    6978    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|Mixed Platforms.Build.0 = Release|x86
     79    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|Win32.ActiveCfg = Release|x86
     80    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|Win32.Build.0 = Release|x86
    7081    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|x64.ActiveCfg = Release|Any CPU
    7182    {9A04599C-D608-4240-8DA6-D41F51C515A3}.ReleaseBuild|x86.ActiveCfg = Release|Any CPU
     
    7485    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    7586    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|Mixed Platforms.Build.0 = Debug|x86
     87    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|Win32.ActiveCfg = Debug|x86
     88    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|Win32.Build.0 = Debug|x86
    7689    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|x64.ActiveCfg = Debug|x64
    7790    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Debug|x64.Build.0 = Debug|x64
     
    8295    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|Mixed Platforms.ActiveCfg = Release|x86
    8396    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|Mixed Platforms.Build.0 = Release|x86
     97    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|Win32.ActiveCfg = Release|x86
     98    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|Win32.Build.0 = Release|x86
    8499    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|x64.ActiveCfg = Release|x64
    85100    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.Release|x64.Build.0 = Release|x64
     
    90105    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|x86
    91106    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|Mixed Platforms.Build.0 = Release|x86
     107    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|Win32.ActiveCfg = Release|x86
     108    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|Win32.Build.0 = Release|x86
    92109    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|x64.ActiveCfg = Release|Any CPU
    93110    {98C8AD2B-B035-4863-A01E-B659465FF6B2}.ReleaseBuild|x86.ActiveCfg = Release|Any CPU
     
    96113    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    97114    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Mixed Platforms.Build.0 = Debug|x86
     115    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Win32.ActiveCfg = Debug|x86
     116    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Win32.Build.0 = Debug|x86
    98117    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x64.ActiveCfg = Debug|x64
    99118    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x64.Build.0 = Debug|x64
     
    104123    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Mixed Platforms.ActiveCfg = Release|x86
    105124    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Mixed Platforms.Build.0 = Release|x86
     125    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Win32.ActiveCfg = Release|x86
     126    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Win32.Build.0 = Release|x86
    106127    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.ActiveCfg = Release|x64
    107128    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.Build.0 = Release|x64
     
    112133    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|x86
    113134    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|Mixed Platforms.Build.0 = Release|x86
     135    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|Win32.ActiveCfg = Release|x86
     136    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|Win32.Build.0 = Release|x86
    114137    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|x64.ActiveCfg = Release|x64
    115138    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.ReleaseBuild|x64.Build.0 = Release|x64
     
    120143    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    121144    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|Mixed Platforms.Build.0 = Debug|x86
     145    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|Win32.ActiveCfg = Debug|x86
     146    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|Win32.Build.0 = Debug|x86
    122147    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|x64.ActiveCfg = Debug|x64
    123148    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|x64.Build.0 = Debug|x64
    124149    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|x86.ActiveCfg = Debug|x86
    125150    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Debug|x86.Build.0 = Debug|x86
    126     {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    127     {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Any CPU.Build.0 = Release|Any CPU
     151    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Any CPU.ActiveCfg = Release|x64
     152    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Any CPU.Build.0 = Release|x64
    128153    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Mixed Platforms.ActiveCfg = Release|x86
    129154    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Mixed Platforms.Build.0 = Release|x86
     155    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Win32.ActiveCfg = Release|x86
     156    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|Win32.Build.0 = Release|x86
    130157    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|x64.ActiveCfg = Release|x64
    131158    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.Release|x64.Build.0 = Release|x64
     
    136163    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|Mixed Platforms.ActiveCfg = ReleaseBuild|x86
    137164    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|Mixed Platforms.Build.0 = ReleaseBuild|x86
     165    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|Win32.ActiveCfg = ReleaseBuild|x86
     166    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|Win32.Build.0 = ReleaseBuild|x86
    138167    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|x64.ActiveCfg = ReleaseBuild|x64
    139168    {93B4A10E-8979-4028-8CCF-49D88D6FAC0C}.ReleaseBuild|x64.Build.0 = ReleaseBuild|x64
     
    144173    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    145174    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|Mixed Platforms.Build.0 = Debug|x86
     175    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|Win32.ActiveCfg = Debug|x86
     176    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|Win32.Build.0 = Debug|x86
    146177    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|x64.ActiveCfg = Debug|x64
    147178    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Debug|x64.Build.0 = Debug|x64
     
    152183    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|Mixed Platforms.ActiveCfg = Release|x86
    153184    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|Mixed Platforms.Build.0 = Release|x86
     185    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|Win32.ActiveCfg = Release|x86
     186    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|Win32.Build.0 = Release|x86
    154187    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|x64.ActiveCfg = Release|x64
    155188    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.Release|x64.Build.0 = Release|x64
     
    160193    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|x86
    161194    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|Mixed Platforms.Build.0 = Release|x86
     195    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|Win32.ActiveCfg = Release|x86
     196    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|Win32.Build.0 = Release|x86
    162197    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|x64.ActiveCfg = Release|Any CPU
    163198    {6142B24E-9C86-410B-A65A-1DE65C8C2349}.ReleaseBuild|x86.ActiveCfg = Release|Any CPU
     
    166201    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    167202    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     203    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|Win32.ActiveCfg = Debug|x86
     204    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|Win32.Build.0 = Debug|x86
    168205    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|x64.ActiveCfg = Debug|Any CPU
    169206    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Debug|x86.ActiveCfg = Debug|Any CPU
     
    172209    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
    173210    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     211    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|Win32.ActiveCfg = Release|x86
     212    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|Win32.Build.0 = Release|x86
    174213    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|x64.ActiveCfg = Release|Any CPU
    175214    {D18AE898-F600-4754-B3B4-C0C7A364F973}.Release|x86.ActiveCfg = Release|x86
     
    179218    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|Any CPU
    180219    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|Mixed Platforms.Build.0 = Release|Any CPU
     220    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|Win32.ActiveCfg = Release|x86
     221    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|Win32.Build.0 = Release|x86
    181222    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|x64.ActiveCfg = Release|Any CPU
    182223    {D18AE898-F600-4754-B3B4-C0C7A364F973}.ReleaseBuild|x86.ActiveCfg = Release|Any CPU
     224    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|Any CPU.ActiveCfg = Debug|Win32
     225    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
     226    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
     227    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|Win32.ActiveCfg = Debug|Win32
     228    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|Win32.Build.0 = Debug|Win32
     229    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|x64.ActiveCfg = Debug|Win32
     230    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|x86.ActiveCfg = Debug|Win32
     231    {2E530A92-9788-4CB8-A754-A91092E770A3}.Debug|x86.Build.0 = Debug|Win32
     232    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Any CPU.ActiveCfg = Release|x64
     233    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Any CPU.Build.0 = Release|x64
     234    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
     235    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Mixed Platforms.Build.0 = Release|Win32
     236    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Win32.ActiveCfg = Release|Win32
     237    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|Win32.Build.0 = Release|Win32
     238    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|x64.ActiveCfg = Release|Win32
     239    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|x86.ActiveCfg = Release|Win32
     240    {2E530A92-9788-4CB8-A754-A91092E770A3}.Release|x86.Build.0 = Release|Win32
     241    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|Any CPU.ActiveCfg = Release|Win32
     242    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|Mixed Platforms.ActiveCfg = Release|Win32
     243    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|Mixed Platforms.Build.0 = Release|Win32
     244    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|Win32.ActiveCfg = Release|Win32
     245    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|Win32.Build.0 = Release|Win32
     246    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|x64.ActiveCfg = Release|Win32
     247    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|x86.ActiveCfg = Release|Win32
     248    {2E530A92-9788-4CB8-A754-A91092E770A3}.ReleaseBuild|x86.Build.0 = Release|Win32
    183249  EndGlobalSection
    184250  GlobalSection(SolutionProperties) = preSolution
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Evaluator.cs

    r8753 r9562  
    6565      InterpreterParameter.ActualValue.EvaluateGaussianProcessConfiguration(tree, ProblemDataParameter.ActualValue, out quality, out solution);
    6666
     67      if (double.IsInfinity(quality) || double.IsNaN(quality)) quality = 1E6; // a large value
    6768      QualityParameter.ActualValue = new DoubleValue(quality);
    6869      if (solution != null)
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/GaussianProcessTuning.csproj

    r9338 r9562  
    160160    <None Include="Properties\AssemblyInfo.cs.frame" />
    161161  </ItemGroup>
     162  <ItemGroup>
     163    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.Experimental\HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj">
     164      <Project>{6142B24E-9C86-410B-A65A-1DE65C8C2349}</Project>
     165      <Name>HeuristicLab.Algorithms.DataAnalysis.Experimental</Name>
     166    </ProjectReference>
     167  </ItemGroup>
    162168  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    163169  <PropertyGroup>
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Grammar.cs

    r9387 r9562  
    5959      var covRQiso = new CovRQIso();
    6060      var covNN = new CovNn();
     61      var covPoly = new CovPoly();
     62      var covPPoly = new CovPiecewisePoly();
    6163      var covMatern1 = new CovMatern(1);
    6264      covMatern1.Name = "CovMatern1";
     
    102104                            covMatern5,
    103105                            covNN,
     106                            covPoly,
     107                            covPPoly,
    104108                            covPeriodic,
    105109                            covPeriodic1,
     
    163167                            covMatern5,
    164168                            covNN,
     169                            covPoly,
     170                            covPPoly,
    165171                            covPeriodic,
    166172                            covPeriodic1,
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Interpreter.cs

    r9387 r9562  
    3636      gprAlg.GaussianProcessModelCreatorParameter.Value =
    3737        gprAlg.GaussianProcessModelCreatorParameter.ValidValues.First(
    38           v => v is GaussianProcessRegressionModelCreator);
     38          v => v is EigenGaussianProcessRegressionModelCreator);
    3939      gprAlg.MinimizationIterations = 50;
    4040
     
    111111      } else if (node.Symbol is CovNn) {
    112112        return new CovarianceNeuralNetwork();
     113      } else if (node.Symbol is CovPoly) {
     114        return new CovariancePolynomial();
     115      } else if (node.Symbol is CovPiecewisePoly) {
     116        return new CovariancePiecewisePolynomial();
    113117      } else if (node.Symbol is CovPeriodic) {
    114118        return new CovariancePeriodic();
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/Symbols.cs

    r9387 r9562  
    503503  }
    504504  [StorableClass]
     505  public sealed class CovPoly : Symbol {
     506    public override int MinimumArity {
     507      get { return 0; }
     508    }
     509    public override int MaximumArity {
     510      get { return 0; }
     511    }
     512
     513    [StorableConstructor]
     514    private CovPoly(bool deserializing) : base(deserializing) { }
     515    private CovPoly(CovPoly original, Cloner cloner)
     516      : base(original, cloner) {
     517    }
     518
     519    public CovPoly()
     520      : base("CovPoly", "") {
     521    }
     522    [StorableHook(HookType.AfterDeserialization)]
     523    private void AfterDeserialization() {
     524    }
     525
     526    public override ISymbolicExpressionTreeNode CreateTreeNode() {
     527      return new CovPolyTreeNode(this);
     528    }
     529    public override IDeepCloneable Clone(Cloner cloner) {
     530      return new CovPoly(this, cloner);
     531    }
     532  }
     533  [StorableClass]
     534  public sealed class CovPiecewisePoly : Symbol {
     535    public override int MinimumArity {
     536      get { return 0; }
     537    }
     538    public override int MaximumArity {
     539      get { return 0; }
     540    }
     541
     542    [StorableConstructor]
     543    private CovPiecewisePoly(bool deserializing) : base(deserializing) { }
     544    private CovPiecewisePoly(CovPiecewisePoly original, Cloner cloner)
     545      : base(original, cloner) {
     546    }
     547
     548    public CovPiecewisePoly()
     549      : base("CovPiecewisePoly", "") {
     550    }
     551    [StorableHook(HookType.AfterDeserialization)]
     552    private void AfterDeserialization() {
     553    }
     554
     555    public override ISymbolicExpressionTreeNode CreateTreeNode() {
     556      return new CovPiecewisePolyTreeNode(this);
     557    }
     558    public override IDeepCloneable Clone(Cloner cloner) {
     559      return new CovPiecewisePoly(this, cloner);
     560    }
     561  }
     562  [StorableClass]
    505563  public sealed class CovNn : Symbol {
    506564    public override int MinimumArity {
  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/TreeNodes.cs

    r9387 r9562  
    228228  }
    229229  [StorableClass]
     230  public sealed class CovPolyTreeNode : SymbolicExpressionTreeTerminalNode {
     231    public new CovPoly Symbol { get { return (CovPoly)base.Symbol; } }
     232
     233    [StorableConstructor]
     234    private CovPolyTreeNode(bool deserializing) : base(deserializing) { }
     235    private CovPolyTreeNode(CovPolyTreeNode original, Cloner cloner)
     236      : base(original, cloner) {
     237    }
     238
     239    public CovPolyTreeNode(CovPoly symbol)
     240      : base(symbol) {
     241    }
     242
     243    [StorableHook(HookType.AfterDeserialization)]
     244    private void AfterDeserialization() {
     245    }
     246    public override IDeepCloneable Clone(Cloner cloner) {
     247      return new CovPolyTreeNode(this, cloner);
     248    }
     249  }
     250  [StorableClass]
     251  public sealed class CovPiecewisePolyTreeNode : SymbolicExpressionTreeTerminalNode {
     252    public new CovPiecewisePoly Symbol { get { return (CovPiecewisePoly)base.Symbol; } }
     253
     254    [StorableConstructor]
     255    private CovPiecewisePolyTreeNode(bool deserializing) : base(deserializing) { }
     256    private CovPiecewisePolyTreeNode(CovPiecewisePolyTreeNode original, Cloner cloner)
     257      : base(original, cloner) {
     258    }
     259
     260    public CovPiecewisePolyTreeNode(CovPiecewisePoly symbol)
     261      : base(symbol) {
     262    }
     263
     264    [StorableHook(HookType.AfterDeserialization)]
     265    private void AfterDeserialization() {
     266    }
     267    public override IDeepCloneable Clone(Cloner cloner) {
     268      return new CovPiecewisePolyTreeNode(this, cloner);
     269    }
     270  }
     271  [StorableClass]
    230272  public sealed class CovNnTreeNode : SymbolicExpressionTreeTerminalNode {
    231273    public new CovNn Symbol { get { return (CovNn)base.Symbol; } }
Note: See TracChangeset for help on using the changeset viewer.