Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/12 11:58:17 (12 years ago)
Author:
mkommend
Message:

#1081: Merged trunk changes and fixed compilation errors due to the merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r8477 r8742  
    105105      <Private>False</Private>
    106106    </Reference>
    107     <Reference Include="HeuristicLab.Algorithms.Benchmarks-3.3">
    108       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.Benchmarks-3.3.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Algorithms.GradientDescent-3.3">
    111       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GradientDescent-3.3.dll</HintPath>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Analysis-3.3">
    114       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    121     </Reference>
    122     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    127     </Reference>
    128     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    129       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    132       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    133     </Reference>
    134     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    135       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    136     </Reference>
    137     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    138       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    139     </Reference>
    140     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    141       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    142     </Reference>
    143     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    144       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    145     </Reference>
    146     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    147       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    148     </Reference>
    149     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4">
    150       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath>
    151     </Reference>
    152     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
    153       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
    154     </Reference>
    155     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    156       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    157     </Reference>
    158     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    159       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    160     </Reference>
    161     <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    162       <HintPath>..\..\..\..\trunk\sources\bin\LibSVM-1.6.3.dll</HintPath>
     107    <Reference Include="HeuristicLab.Algorithms.GradientDescent-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     108    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     109    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     110    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     111    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     112    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     113    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     114    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     115    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     116    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     117    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     118    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     119    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     120    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     121    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     122    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     123    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     124    <Reference Include="LibSVM-3.12, Version=3.12.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     125      <HintPath>..\..\..\..\trunk\sources\bin\LibSVM-3.12.dll</HintPath>
    163126      <Private>False</Private>
    164127    </Reference>
    … …  
    174137    </Compile>
    175138    <Compile Include="FixedDataAnalysisAlgorithm.cs" />
    176     <Compile Include="GaussianProcess\CovarianceRQiso.cs" />
     139    <Compile Include="GaussianProcess\CovarianceMask.cs" />
     140    <Compile Include="GaussianProcess\GaussianProcessClassificationSolutionCreator.cs" />
     141    <Compile Include="GaussianProcess\GaussianProcessClassificationModelCreator.cs" />
     142    <Compile Include="GaussianProcess\GaussianProcessClassification.cs" />
     143    <Compile Include="GaussianProcess\CovarianceProduct.cs" />
     144    <Compile Include="GaussianProcess\CovarianceScale.cs" />
     145    <Compile Include="GaussianProcess\CovarianceRationalQuadraticArd.cs" />
     146    <Compile Include="GaussianProcess\CovarianceRationalQuadraticIso.cs" />
     147    <Compile Include="GaussianProcess\CovarianceSquaredExponentialArd.cs" />
     148    <Compile Include="GaussianProcess\CovarianceSquaredExponentialIso.cs" />
     149    <Compile Include="GaussianProcess\HyperParameter.cs" />
     150    <Compile Include="GaussianProcess\CovarianceMaternIso.cs" />
     151    <Compile Include="GaussianProcess\CovarianceLinearArd.cs" />
    177152    <Compile Include="GaussianProcess\CovarianceNoise.cs" />
    178153    <Compile Include="GaussianProcess\CovarianceConst.cs" />
    179     <Compile Include="GaussianProcess\MeanProd.cs" />
     154    <Compile Include="GaussianProcess\MeanProduct.cs" />
    180155    <Compile Include="GaussianProcess\MeanSum.cs" />
    181     <Compile Include="GaussianProcess\CovarianceProd.cs" />
    182156    <Compile Include="GaussianProcess\CovarianceSum.cs" />
    183157    <Compile Include="GaussianProcess\CovariancePeriodic.cs" />
    … …  
    194168    <Compile Include="GaussianProcess\MeanConst.cs" />
    195169    <Compile Include="GaussianProcess\IMeanFunction.cs" />
    196     <Compile Include="GaussianProcess\CovarianceSEard.cs" />
    197     <Compile Include="GaussianProcess\CovarianceSEiso.cs" />
    198170    <Compile Include="GaussianProcess\GaussianProcessModel.cs" />
    199171    <Compile Include="GaussianProcess\GaussianProcessRegression.cs" />
    … …  
    295267      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    296268    </ProjectReference>
    297     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    298       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    299       <Name>HeuristicLab.Random-3.3</Name>
    300       <Private>False</Private>
    301     </ProjectReference>
    302269  </ItemGroup>
    303270  <ItemGroup>
    … …  
    332299  -->
    333300  <PropertyGroup>
    334     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     301    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    335302set ProjectDir=$(ProjectDir)
    336303set SolutionDir=$(SolutionDir)
    … …  
    339306call PreBuildEvent.cmd
    340307</PreBuildEvent>
     308    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     309export ProjectDir=$(ProjectDir)
     310export SolutionDir=$(SolutionDir)
     311
     312$SolutionDir/PreBuildEvent.sh
     313</PreBuildEvent>
    341314  </PropertyGroup>
    342315</Project>
Note: See TracChangeset for help on using the changeset viewer.