Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/12 18:58:15 (12 years ago)
Author:
gkronber
Message:

#1847 merged r8205:8635 from trunk into branch

Location:
branches/GP-MoveOperators
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis/3.4

    • Property svn:ignore

      •  

        old new  
        55*.vs10x
        66Plugin.cs
         7*.user

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r8085 r8660  
    101101  </PropertyGroup>
    102102  <ItemGroup>
    103     <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    104       <HintPath>..\..\bin\ALGLIB-3.5.0.dll</HintPath>
     103    <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104      <HintPath>..\..\bin\ALGLIB-3.6.0.dll</HintPath>
    105105      <Private>False</Private>
    106106    </Reference>
    107     <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     107    <Reference Include="LibSVM-3.12, Version=3.12.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <HintPath>..\..\bin\LibSVM-3.12.dll</HintPath>
    109109      <Private>False</Private>
    110110    </Reference>
    … …  
    113113      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    114114    </Reference>
    115     <Reference Include="System.Data" />
    116115    <Reference Include="System.Drawing" />
    117     <Reference Include="System.Xml" />
    118116  </ItemGroup>
    119117  <ItemGroup>
    … …  
    122120    </Compile>
    123121    <Compile Include="FixedDataAnalysisAlgorithm.cs" />
     122    <Compile Include="GaussianProcess\GaussianProcessDiscriminantFunctionClassificationSolution.cs" />
     123    <Compile Include="GaussianProcess\GaussianProcessDiscriminantFunctionClassificationModel.cs" />
     124    <Compile Include="GaussianProcess\GaussianProcessClassificationSolutionCreator.cs" />
     125    <Compile Include="GaussianProcess\GaussianProcessClassificationModelCreator.cs" />
     126    <Compile Include="GaussianProcess\GaussianProcessClassification.cs" />
     127    <Compile Include="GaussianProcess\CovarianceProduct.cs" />
     128    <Compile Include="GaussianProcess\CovarianceScale.cs" />
     129    <Compile Include="GaussianProcess\CovarianceRationalQuadraticArd.cs" />
     130    <Compile Include="GaussianProcess\CovarianceRationalQuadraticIso.cs" />
     131    <Compile Include="GaussianProcess\CovarianceSquaredExponentialArd.cs" />
     132    <Compile Include="GaussianProcess\CovarianceSquaredExponentialIso.cs" />
     133    <Compile Include="GaussianProcess\HyperParameter.cs" />
     134    <Compile Include="GaussianProcess\CovarianceMaternIso.cs" />
     135    <Compile Include="GaussianProcess\CovarianceLinearArd.cs" />
     136    <Compile Include="GaussianProcess\CovarianceNoise.cs" />
     137    <Compile Include="GaussianProcess\CovarianceConst.cs" />
     138    <Compile Include="GaussianProcess\MeanProduct.cs" />
     139    <Compile Include="GaussianProcess\MeanSum.cs" />
     140    <Compile Include="GaussianProcess\CovarianceSum.cs" />
     141    <Compile Include="GaussianProcess\CovariancePeriodic.cs" />
     142    <Compile Include="GaussianProcess\GaussianProcessHyperparameterInitializer.cs" />
     143    <Compile Include="GaussianProcess\GaussianProcessRegressionSolutionCreator.cs" />
     144    <Compile Include="GaussianProcess\GaussianProcessRegressionModelCreator.cs" />
     145    <Compile Include="GaussianProcess\CovarianceLinear.cs" />
     146    <Compile Include="GaussianProcess\GaussianProcessModelCreator.cs">
     147      <SubType>Code</SubType>
     148    </Compile>
     149    <Compile Include="GaussianProcess\MeanLinear.cs" />
     150    <Compile Include="GaussianProcess\Util.cs" />
     151    <Compile Include="GaussianProcess\MeanZero.cs" />
     152    <Compile Include="GaussianProcess\MeanConst.cs" />
     153    <Compile Include="GaussianProcess\IMeanFunction.cs" />
     154    <Compile Include="GaussianProcess\GaussianProcessModel.cs" />
     155    <Compile Include="GaussianProcess\GaussianProcessRegression.cs" />
     156    <Compile Include="GaussianProcess\GaussianProcessRegressionSolution.cs" />
     157    <Compile Include="GaussianProcess\ICovarianceFunction.cs" />
     158    <Compile Include="Interfaces\IGaussianProcessModel.cs" />
     159    <Compile Include="Interfaces\IGaussianProcessSolution.cs" />
     160    <Compile Include="Interfaces\INcaClassificationSolution.cs" />
     161    <Compile Include="Interfaces\INcaModel.cs" />
    124162    <Compile Include="Interfaces\INearestNeighbourClassificationSolution.cs" />
    125163    <Compile Include="Interfaces\INearestNeighbourRegressionSolution.cs" />
    … …  
    144182    </Compile>
    145183    <Compile Include="Linear\AlglibUtil.cs" />
     184    <Compile Include="Linear\Scaling.cs" />
    146185    <Compile Include="Linear\LinearDiscriminantAnalysis.cs" />
    147186    <Compile Include="Linear\LinearRegression.cs">
    … …  
    151190    <Compile Include="Linear\MultinomialLogitClassificationSolution.cs" />
    152191    <Compile Include="Linear\MultinomialLogitModel.cs" />
     192    <Compile Include="Nca\Initialization\INcaInitializer.cs" />
     193    <Compile Include="Nca\Initialization\LdaInitializer.cs" />
     194    <Compile Include="Nca\Initialization\PcaInitializer.cs" />
     195    <Compile Include="Nca\Initialization\RandomInitializer.cs" />
     196    <Compile Include="Nca\Matrix.cs" />
     197    <Compile Include="Nca\NcaAlgorithm.cs" />
     198    <Compile Include="Nca\NcaClassificationSolution.cs" />
     199    <Compile Include="Nca\NcaModel.cs" />
    153200    <Compile Include="NearestNeighbour\NearestNeighbourClassification.cs" />
    154201    <Compile Include="NearestNeighbour\NearestNeighbourClassificationSolution.cs" />
    … …  
    187234  </ItemGroup>
    188235  <ItemGroup>
     236    <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent.csproj">
     237      <Project>{1256B945-EEA9-4BE4-9880-76B5B113F089}</Project>
     238      <Name>HeuristicLab.Algorithms.GradientDescent</Name>
     239      <Private>False</Private>
     240    </ProjectReference>
     241    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     242      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     243      <Name>HeuristicLab.Analysis-3.3</Name>
     244      <Private>False</Private>
     245    </ProjectReference>
    189246    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    190247      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    … …  
    212269      <Private>False</Private>
    213270    </ProjectReference>
     271    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     272      <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
     273      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     274      <Private>False</Private>
     275    </ProjectReference>
    214276    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    215277      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    … …  
    217279      <Private>False</Private>
    218280    </ProjectReference>
     281    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     282      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     283      <Name>HeuristicLab.Operators-3.3</Name>
     284      <Private>False</Private>
     285    </ProjectReference>
    219286    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    220287      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    260327      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    261328      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     329      <Private>False</Private>
     330    </ProjectReference>
     331    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     332      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     333      <Name>HeuristicLab.Random-3.3</Name>
    262334      <Private>False</Private>
    263335    </ProjectReference>
    … …  
    294366  -->
    295367  <PropertyGroup>
    296     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     368    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    297369set ProjectDir=$(ProjectDir)
    298370set SolutionDir=$(SolutionDir)
    … …  
    301373call PreBuildEvent.cmd
    302374</PreBuildEvent>
     375    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     376export ProjectDir=$(ProjectDir)
     377export SolutionDir=$(SolutionDir)
     378
     379$SolutionDir/PreBuildEvent.sh
     380</PreBuildEvent>
    303381  </PropertyGroup>
    304382</Project>
Note: See TracChangeset for help on using the changeset viewer.