Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/15/12 16:47:25 (11 years ago)
Author:
mkommend
Message:

#1763: merged changes from trunk into the tree simplifier branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r8388 r8915  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.5.0">
    96       <HintPath>..\..\..\..\Trunk\sources\bin\ALGLIB-3.5.0.dll</HintPath>
     95    <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <SpecificVersion>False</SpecificVersion>
     97      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath>
     98      <Private>False</Private>
     99    </Reference>
     100    <Reference Include="AutoDiff-1.0, Version=1.0.0.14388, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     101      <HintPath>..\..\bin\AutoDiff-1.0.dll</HintPath>
     102      <Private>False</Private>
    97103    </Reference>
    98104    <Reference Include="HeuristicLab.Analysis-3.3">
    99105      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     106      <Private>False</Private>
    100107    </Reference>
    101108    <Reference Include="HeuristicLab.Collections-3.3">
    102109      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     110      <Private>False</Private>
    103111    </Reference>
    104112    <Reference Include="HeuristicLab.Common-3.3">
    105113      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     114      <Private>False</Private>
    106115    </Reference>
    107116    <Reference Include="HeuristicLab.Core-3.3">
    108117      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
    109119    </Reference>
    110120    <Reference Include="HeuristicLab.Data-3.3">
    111121      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     122      <Private>False</Private>
    112123    </Reference>
    113124    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    114125      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     126      <Private>False</Private>
    115127    </Reference>
    116128    <Reference Include="HeuristicLab.Operators-3.3">
    117129      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
    118131    </Reference>
    119132    <Reference Include="HeuristicLab.Optimization-3.3">
    120133      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     134      <Private>False</Private>
    121135    </Reference>
    122136    <Reference Include="HeuristicLab.Parameters-3.3">
    123137      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     138      <Private>False</Private>
    124139    </Reference>
    125140    <Reference Include="HeuristicLab.Persistence-3.3">
    126141      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     142      <Private>False</Private>
    127143    </Reference>
    128144    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    129145      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     146      <Private>False</Private>
    130147    </Reference>
    131148    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    132149      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     150      <Private>False</Private>
    133151    </Reference>
    134152    <Reference Include="HeuristicLab.Problems.Instances-3.3">
    135153      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     154      <Private>False</Private>
    136155    </Reference>
    137156    <Reference Include="System" />
     
    152171    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
    153172    <Compile Include="Plugin.cs" />
     173    <Compile Include="SingleObjective\ConstantOptimizationAnalyzer.cs" />
    154174    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" />
    155175    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" />
     
    176196    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
    177197    <Compile Include="SymbolicRegressionSolution.cs" />
    178     <Compile Include="SymbolicRegressionSolutionValuesCalculator.cs" />
    179198    <None Include="HeuristicLab.snk" />
    180199    <None Include="Plugin.cs.frame" />
     
    215234  -->
    216235  <PropertyGroup>
    217     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     236    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    218237set ProjectDir=$(ProjectDir)
    219238set SolutionDir=$(SolutionDir)
     
    222241call PreBuildEvent.cmd
    223242</PreBuildEvent>
     243    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     244export ProjectDir=$(ProjectDir)
     245export SolutionDir=$(SolutionDir)
     246
     247$SolutionDir/PreBuildEvent.sh
     248</PreBuildEvent>
    224249  </PropertyGroup>
    225250</Project>
Note: See TracChangeset for help on using the changeset viewer.