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.Problems.DataAnalysis.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /trunk/sources/HeuristicLab.Problems.DataAnalysis.Viewsmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Problems.DataAnalysis.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Views5815-6180
      /branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis.Views8036-8538
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Views6284-6795
      /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Views6828
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.DataAnalysis.Views7787-8333
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Views5370-5682
      /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Views6829-6865
      /branches/VNS/HeuristicLab.Problems.DataAnalysis.Views5594-5752
      /branches/histogram/HeuristicLab.Problems.DataAnalysis.Views5959-6341

  • branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r8085 r8660  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.6.0.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
    9599    <Reference Include="System" />
    96100    <Reference Include="System.Core">
    … …  
    122126      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
    123127    </Compile>
     128    <Compile Include="Clustering\ClusteringSolutionVisualizationView.cs">
     129      <SubType>UserControl</SubType>
     130    </Compile>
     131    <Compile Include="Clustering\ClusteringSolutionVisualizationView.Designer.cs">
     132      <DependentUpon>ClusteringSolutionVisualizationView.cs</DependentUpon>
     133    </Compile>
     134    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.cs">
     135      <SubType>UserControl</SubType>
     136    </Compile>
     137    <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.Designer.cs">
     138      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     139    </Compile>
    124140    <Compile Include="DataAnalysisSolutionEvaluationView.cs">
    125141      <SubType>UserControl</SubType>
    … …  
    128144      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
    129145    </Compile>
     146    <Compile Include="FeatureCorrelation\FeatureCorrelationView.cs">
     147      <SubType>UserControl</SubType>
     148    </Compile>
     149    <Compile Include="FeatureCorrelation\FeatureCorrelationView.Designer.cs">
     150      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
     151    </Compile>
     152    <Compile Include="FeatureCorrelation\FeatureCorrelationCache.cs" />
     153    <Compile Include="FeatureCorrelation\FeatureCorrelationTimeframeCache.cs" />
    130154    <Compile Include="Plugin.cs" />
     155    <Compile Include="ProblemDataView.cs">
     156      <SubType>UserControl</SubType>
     157    </Compile>
     158    <Compile Include="ProblemDataView.Designer.cs">
     159      <DependentUpon>ProblemDataView.cs</DependentUpon>
     160    </Compile>
    131161    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    132162      <SubType>UserControl</SubType>
    … …  
    256286    <Compile Include="Solution Views\RegressionSolutionView.Designer.cs">
    257287      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
     288    </Compile>
     289    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.cs">
     290      <SubType>UserControl</SubType>
     291    </Compile>
     292    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationView.Designer.cs">
     293      <DependentUpon>TimeframeFeatureCorrelationView.cs</DependentUpon>
    258294    </Compile>
    259295    <None Include="HeuristicLab.snk" />
    … …  
    263299  </ItemGroup>
    264300  <ItemGroup>
     301    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
     302      <Project>{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}</Project>
     303      <Name>HeuristicLab.Analysis.Views-3.3</Name>
     304      <Private>False</Private>
     305    </ProjectReference>
     306    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     307      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     308      <Name>HeuristicLab.Analysis-3.3</Name>
     309      <Private>False</Private>
     310    </ProjectReference>
    265311    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    266312      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    … …  
    366412    </BootstrapperPackage>
    367413  </ItemGroup>
     414  <ItemGroup />
    368415  <ItemGroup>
    369     <Folder Include="obj\" />
     416    <EmbeddedResource Include="FeatureCorrelation\AbstractFeatureCorrelationView.resx">
     417      <DependentUpon>AbstractFeatureCorrelationView.cs</DependentUpon>
     418    </EmbeddedResource>
    370419  </ItemGroup>
    371420  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    378427  -->
    379428  <PropertyGroup>
    380     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     429   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    381430set ProjectDir=$(ProjectDir)
    382431set SolutionDir=$(SolutionDir)
    … …  
    385434call PreBuildEvent.cmd
    386435</PreBuildEvent>
     436<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     437export ProjectDir=$(ProjectDir)
     438export SolutionDir=$(SolutionDir)
     439
     440$SolutionDir/PreBuildEvent.sh
     441</PreBuildEvent>
    387442  </PropertyGroup>
    388443</Project>
Note: See TracChangeset for help on using the changeset viewer.