Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/14/11 13:59:25 (13 years ago)
Author:
epitzer
Message:

#1530 integrate changes from trunk

Location:
branches/PersistenceSpeedUp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceSpeedUp

  • branches/PersistenceSpeedUp/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r6184 r6760  
    110110  </ItemGroup>
    111111  <ItemGroup>
    112     <Compile Include="ClassificationSolutionView.cs">
    113       <SubType>UserControl</SubType>
    114     </Compile>
    115     <Compile Include="ClassificationSolutionView.Designer.cs">
     112    <Compile Include="Classification\ClassificationEnsembleSolutionEstimatedClassValuesView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
     115    <Compile Include="Classification\ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs">
     116      <DependentUpon>ClassificationEnsembleSolutionEstimatedClassValuesView.cs</DependentUpon>
     117    </Compile>
     118    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="Classification\ClassificationEnsembleSolutionModelView.Designer.cs">
     122      <DependentUpon>ClassificationEnsembleSolutionModelView.cs</DependentUpon>
     123    </Compile>
     124    <Compile Include="DataAnalysisSolutionEvaluationView.cs">
     125      <SubType>UserControl</SubType>
     126    </Compile>
     127    <Compile Include="DataAnalysisSolutionEvaluationView.Designer.cs">
     128      <DependentUpon>DataAnalysisSolutionEvaluationView.cs</DependentUpon>
     129    </Compile>
     130    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.Designer.cs">
     134      <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
     135    </Compile>
     136    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     137      <SubType>UserControl</SubType>
     138    </Compile>
     139    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     140      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     141    </Compile>
     142    <Compile Include="Solution Views\ClassificationSolutionView.cs">
     143      <SubType>UserControl</SubType>
     144    </Compile>
     145    <Compile Include="Solution Views\ClassificationSolutionView.Designer.cs">
    116146      <DependentUpon>ClassificationSolutionView.cs</DependentUpon>
    117147    </Compile>
    … …  
    152182      <DependentUpon>ClusteringSolutionEstimatedClusterView.cs</DependentUpon>
    153183    </Compile>
    154     <Compile Include="ClusteringSolutionView.cs">
    155       <SubType>UserControl</SubType>
    156     </Compile>
    157     <Compile Include="ClusteringSolutionView.Designer.cs">
     184    <Compile Include="Solution Views\ClusteringSolutionView.cs">
     185      <SubType>UserControl</SubType>
     186    </Compile>
     187    <Compile Include="Solution Views\ClusteringSolutionView.Designer.cs">
    158188      <DependentUpon>ClusteringSolutionView.cs</DependentUpon>
    159189    </Compile>
    160     <Compile Include="Interfaces\IRegressionEnsembleSolutionEvaluationView.cs" />
    161     <Compile Include="RegressionEnsembleSolutionView.cs">
    162       <SubType>UserControl</SubType>
    163     </Compile>
    164     <Compile Include="RegressionEnsembleSolutionView.Designer.cs">
    165       <DependentUpon>RegressionEnsembleSolutionView.cs</DependentUpon>
    166     </Compile>
    167     <Compile Include="DiscriminantFunctionClassificationSolutionView.cs">
    168       <SubType>UserControl</SubType>
    169     </Compile>
    170     <Compile Include="DiscriminantFunctionClassificationSolutionView.Designer.cs">
     190    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.cs">
     191      <SubType>UserControl</SubType>
     192    </Compile>
     193    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.Designer.cs">
     194      <DependentUpon>ClassificationEnsembleSolutionView.cs</DependentUpon>
     195    </Compile>
     196    <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.cs">
     197      <SubType>UserControl</SubType>
     198    </Compile>
     199    <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.Designer.cs">
    171200      <DependentUpon>DiscriminantFunctionClassificationSolutionView.cs</DependentUpon>
    172201    </Compile>
    173     <Compile Include="Interfaces\IDataAnalysisSolutionEvaluationView.cs" />
    174     <Compile Include="Interfaces\IDiscriminantFunctionClassificationSolutionEvaluationView.cs" />
    175     <Compile Include="Interfaces\IClusteringSolutionEvaluationView.cs" />
    176     <Compile Include="Interfaces\IClassificationSolutionEvaluationView.cs" />
    177     <Compile Include="DataAnalysisSolutionView.cs">
    178       <SubType>UserControl</SubType>
    179     </Compile>
    180     <Compile Include="DataAnalysisSolutionView.Designer.cs">
     202    <Compile Include="Solution Views\DataAnalysisSolutionView.cs">
     203      <SubType>UserControl</SubType>
     204    </Compile>
     205    <Compile Include="Solution Views\DataAnalysisSolutionView.Designer.cs">
    181206      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
    182207    </Compile>
    … …  
    187212      <DependentUpon>DoubleLimitView.cs</DependentUpon>
    188213    </Compile>
    189     <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" />
    190     <Compile Include="RegressionSolutionView.cs">
    191       <SubType>UserControl</SubType>
    192     </Compile>
    193     <Compile Include="RegressionSolutionView.Designer.cs">
     214    <Compile Include="Interfaces\IDataAnalysisSolutionEvaluationView.cs" />
     215    <Compile Include="MenuItems\CreateEnsembleMenuItem.cs" />
     216    <Compile Include="Solution Views\NamedDataAnalysisSolutionView.cs">
     217      <SubType>UserControl</SubType>
     218    </Compile>
     219    <Compile Include="Solution Views\NamedDataAnalysisSolutionView.Designer.cs">
     220      <DependentUpon>NamedDataAnalysisSolutionView.cs</DependentUpon>
     221    </Compile>
     222    <Compile Include="Solution Views\RegressionEnsembleSolutionView.cs">
     223      <SubType>UserControl</SubType>
     224    </Compile>
     225    <Compile Include="Solution Views\RegressionEnsembleSolutionView.Designer.cs">
     226      <DependentUpon>RegressionEnsembleSolutionView.cs</DependentUpon>
     227    </Compile>
     228    <Compile Include="Solution Views\RegressionSolutionView.cs">
     229      <SubType>UserControl</SubType>
     230    </Compile>
     231    <Compile Include="Solution Views\RegressionSolutionView.Designer.cs">
    194232      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    195     </Compile>
    196     <Compile Include="Regression\RegressionEnsembleSolutionLineChartView.cs">
    197       <SubType>UserControl</SubType>
    198     </Compile>
    199     <Compile Include="Regression\RegressionEnsembleSolutionLineChartView.Designer.cs">
    200       <DependentUpon>RegressionEnsembleSolutionLineChartView.cs</DependentUpon>
    201     </Compile>
    202     <Compile Include="Regression\RegressionEnsembleSolutionScatterPlotView.cs">
    203       <SubType>UserControl</SubType>
    204     </Compile>
    205     <Compile Include="Regression\RegressionEnsembleSolutionScatterPlotView.Designer.cs">
    206       <DependentUpon>RegressionEnsembleSolutionScatterPlotView.cs</DependentUpon>
    207233    </Compile>
    208234    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
    … …  
    288314      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    289315      <Name>HeuristicLab.Optimization-3.3</Name>
     316    </ProjectReference>
     317    <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
     318      <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
     319      <Name>HeuristicLab.Optimizer-3.3</Name>
    290320    </ProjectReference>
    291321    <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    … …  
    327357    </BootstrapperPackage>
    328358  </ItemGroup>
    329   <ItemGroup />
    330359  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    331360  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.