Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/22/12 10:36:20 (12 years ago)
Author:
sforsten
Message:

#1776:

  • merged r7454:7863 trunk into branch to make it compatible again
  • adjusted GetConfidence of MajorityVoteWeightCalculator to be in an interval of [0, 1]
Location:
branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views

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

    r7729 r7866  
    161161    </Compile>
    162162    <Compile Include="Plugin.cs" />
     163    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     164      <SubType>UserControl</SubType>
     165    </Compile>
     166    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     167      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     168    </Compile>
    163169    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
    164170      <SubType>UserControl</SubType>
    … …  
    167173      <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    168174    </Compile>
    169     <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    170       <SubType>UserControl</SubType>
    171     </Compile>
    172     <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
    173       <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     175    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
     176      <SubType>UserControl</SubType>
     177    </Compile>
     178    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
     179      <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
     180    </Compile>
     181    <Compile Include="Regression\RegressionSolutionLineChartView.cs">
     182      <SubType>UserControl</SubType>
     183    </Compile>
     184    <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
     185      <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
     186    </Compile>
     187    <Compile Include="Regression\RegressionSolutionResidualHistogram.cs">
     188      <SubType>UserControl</SubType>
     189    </Compile>
     190    <Compile Include="Regression\RegressionSolutionResidualHistogram.Designer.cs">
     191      <DependentUpon>RegressionSolutionResidualHistogram.cs</DependentUpon>
     192    </Compile>
     193    <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
     194      <SubType>UserControl</SubType>
     195    </Compile>
     196    <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
     197      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    174198    </Compile>
    175199    <Compile Include="Solution Views\ClassificationSolutionView.cs">
    … …  
    265289      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    266290    </Compile>
    267     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
    268       <SubType>UserControl</SubType>
    269     </Compile>
    270     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
    271       <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
    272     </Compile>
    273     <Compile Include="Regression\RegressionSolutionLineChartView.cs">
    274       <SubType>UserControl</SubType>
    275     </Compile>
    276     <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
    277       <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
    278     </Compile>
    279     <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
    280       <SubType>UserControl</SubType>
    281     </Compile>
    282     <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
    283       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    284     </Compile>
    285291    <None Include="HeuristicLab.snk" />
    286292    <None Include="Plugin.cs.frame" />
    287293    <None Include="Properties\AssemblyInfo.cs.frame" />
    288     <Compile Include="DataAnalysisProblemView.cs">
    289       <SubType>UserControl</SubType>
    290     </Compile>
    291     <Compile Include="DataAnalysisProblemView.Designer.cs">
    292       <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    293     </Compile>
    294294    <Compile Include="Properties\AssemblyInfo.cs" />
    295295  </ItemGroup>
    … …  
    317317      <Install>true</Install>
    318318    </BootstrapperPackage>
     319  </ItemGroup>
     320  <ItemGroup>
     321    <Folder Include="obj\" />
    319322  </ItemGroup>
    320323  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.