Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/15/12 09:11:17 (12 years ago)
Author:
gkronber
Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7042 r7615  
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="Microsoft.CSharp" />
    101102    <Reference Include="System" />
    102103    <Reference Include="System.Core">
    … …  
    137138    </Compile>
    138139    <Compile Include="Plugin.cs" />
     140    <Compile Include="ProblemInstanceProviderView.cs">
     141      <SubType>UserControl</SubType>
     142    </Compile>
     143    <Compile Include="ProblemInstanceProviderView.Designer.cs">
     144      <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
     145    </Compile>
     146    <Compile Include="ProblemView.cs">
     147      <SubType>UserControl</SubType>
     148    </Compile>
     149    <Compile Include="ProblemView.designer.cs">
     150      <DependentUpon>ProblemView.cs</DependentUpon>
     151    </Compile>
    139152    <Compile Include="RunCollectionModifierListView.cs">
    140153      <SubType>UserControl</SubType>
    … …  
    143156      <DependentUpon>RunCollectionModifierListView.cs</DependentUpon>
    144157    </Compile>
    145     <Compile Include="RunCollectionContentConstraintView.cs">
    146       <SubType>UserControl</SubType>
    147     </Compile>
    148     <Compile Include="RunCollectionContentConstraintView.Designer.cs">
     158    <Compile Include="RunCollectionConstraintViews\RunCollectionContentConstraintView.cs">
     159      <SubType>UserControl</SubType>
     160    </Compile>
     161    <Compile Include="RunCollectionConstraintViews\RunCollectionContentConstraintView.Designer.cs">
    149162      <DependentUpon>RunCollectionContentConstraintView.cs</DependentUpon>
    150163    </Compile>
    … …  
    167180      <DependentUpon>ResultValueView.cs</DependentUpon>
    168181    </Compile>
    169     <Compile Include="RunCollectionBoxPlotView.cs">
    170       <SubType>UserControl</SubType>
    171     </Compile>
    172     <Compile Include="RunCollectionBoxPlotView.Designer.cs">
     182    <Compile Include="RunCollectionViews\RunCollectionBoxPlotView.cs">
     183      <SubType>UserControl</SubType>
     184    </Compile>
     185    <Compile Include="RunCollectionViews\RunCollectionBoxPlotView.Designer.cs">
    173186      <DependentUpon>RunCollectionBoxPlotView.cs</DependentUpon>
    174187    </Compile>
    175     <Compile Include="RunCollectionComparisonConstraintView.cs">
    176       <SubType>UserControl</SubType>
    177     </Compile>
    178     <Compile Include="RunCollectionComparisonConstraintView.Designer.cs">
     188    <Compile Include="RunCollectionConstraintViews\RunCollectionComparisonConstraintView.cs">
     189      <SubType>UserControl</SubType>
     190    </Compile>
     191    <Compile Include="RunCollectionConstraintViews\RunCollectionComparisonConstraintView.Designer.cs">
    179192      <DependentUpon>RunCollectionComparisonConstraintView.cs</DependentUpon>
    180193    </Compile>
    181     <Compile Include="RunCollectionTypeCompatibilityConstraintView.cs">
    182       <SubType>UserControl</SubType>
    183     </Compile>
    184     <Compile Include="RunCollectionTypeCompatibilityConstraintView.Designer.cs">
     194    <Compile Include="RunCollectionConstraintViews\RunCollectionTypeCompatibilityConstraintView.cs">
     195      <SubType>UserControl</SubType>
     196    </Compile>
     197    <Compile Include="RunCollectionConstraintViews\RunCollectionTypeCompatibilityConstraintView.Designer.cs">
    185198      <DependentUpon>RunCollectionTypeCompatibilityConstraintView.cs</DependentUpon>
    186199    </Compile>
    187     <Compile Include="RunCollectionConstraintCollectionView.cs">
    188       <SubType>UserControl</SubType>
    189     </Compile>
    190     <Compile Include="RunCollectionConstraintCollectionView.Designer.cs">
     200    <Compile Include="RunCollectionConstraintViews\RunCollectionConstraintCollectionView.cs">
     201      <SubType>UserControl</SubType>
     202    </Compile>
     203    <Compile Include="RunCollectionConstraintViews\RunCollectionConstraintCollectionView.Designer.cs">
    191204      <DependentUpon>RunCollectionConstraintCollectionView.cs</DependentUpon>
    192205    </Compile>
    193     <Compile Include="RunCollectionColumnConstraintView.cs">
    194       <SubType>UserControl</SubType>
    195     </Compile>
    196     <Compile Include="RunCollectionColumnConstraintView.Designer.cs">
     206    <Compile Include="RunCollectionConstraintViews\RunCollectionColumnConstraintView.cs">
     207      <SubType>UserControl</SubType>
     208    </Compile>
     209    <Compile Include="RunCollectionConstraintViews\RunCollectionColumnConstraintView.Designer.cs">
    197210      <DependentUpon>RunCollectionColumnConstraintView.cs</DependentUpon>
    198211    </Compile>
    … …  
    209222      <DependentUpon>ExperimentView.cs</DependentUpon>
    210223    </Compile>
    211     <Compile Include="RunCollectionBubbleChartView.cs">
    212       <SubType>UserControl</SubType>
    213     </Compile>
    214     <Compile Include="RunCollectionBubbleChartView.Designer.cs">
     224    <Compile Include="RunCollectionViews\RunCollectionBubbleChartView.cs">
     225      <SubType>UserControl</SubType>
     226    </Compile>
     227    <Compile Include="RunCollectionViews\RunCollectionBubbleChartView.Designer.cs">
    215228      <DependentUpon>RunCollectionBubbleChartView.cs</DependentUpon>
    216229    </Compile>
    217     <Compile Include="RunCollectionEqualityConstraintView.cs">
    218       <SubType>UserControl</SubType>
    219     </Compile>
    220     <Compile Include="RunCollectionEqualityConstraintView.Designer.cs">
     230    <Compile Include="RunCollectionConstraintViews\RunCollectionEqualityConstraintView.cs">
     231      <SubType>UserControl</SubType>
     232    </Compile>
     233    <Compile Include="RunCollectionConstraintViews\RunCollectionEqualityConstraintView.Designer.cs">
    221234      <DependentUpon>RunCollectionEqualityConstraintView.cs</DependentUpon>
    222235    </Compile>
    223     <Compile Include="RunCollectionTabularView.cs">
    224       <SubType>UserControl</SubType>
    225     </Compile>
    226     <Compile Include="RunCollectionTabularView.Designer.cs">
     236    <Compile Include="RunCollectionViews\RunCollectionTabularView.cs">
     237      <SubType>UserControl</SubType>
     238    </Compile>
     239    <Compile Include="RunCollectionViews\RunCollectionTabularView.Designer.cs">
    227240      <DependentUpon>RunCollectionTabularView.cs</DependentUpon>
    228241    </Compile>
    229     <Compile Include="RunCollectionView.cs">
    230       <SubType>UserControl</SubType>
    231     </Compile>
    232     <Compile Include="RunCollectionView.Designer.cs">
     242    <Compile Include="RunCollectionViews\RunCollectionView.cs">
     243      <SubType>UserControl</SubType>
     244    </Compile>
     245    <Compile Include="RunCollectionViews\RunCollectionView.Designer.cs">
    233246      <DependentUpon>RunCollectionView.cs</DependentUpon>
    234247    </Compile>
    … …  
    251264      <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
    252265    </Compile>
    253     <Compile Include="ProblemView.cs">
    254       <SubType>UserControl</SubType>
    255     </Compile>
    256     <Compile Include="ProblemView.Designer.cs">
    257       <DependentUpon>ProblemView.cs</DependentUpon>
     266    <Compile Include="HeuristicOptimizationProblemView.cs">
     267      <SubType>UserControl</SubType>
     268    </Compile>
     269    <Compile Include="HeuristicOptimizationProblemView.Designer.cs">
     270      <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon>
    258271    </Compile>
    259272    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    335348      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    336349      <Private>False</Private>
     350    </ProjectReference>
     351    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     352      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     353      <Name>HeuristicLab.Problems.Instances-3.3</Name>
    337354    </ProjectReference>
    338355    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.