Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/18/12 11:18:51 (12 years ago)
Author:
sforsten
Message:

#1758:

  • merged trunk r7330:8022 into branch
  • importButton shows a message, if clicked and it can't be used
Location:
branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

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

    r7487 r8032  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    9595    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9696      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     97      <Private>False</Private>
    9798    </Reference>
    9899    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    99100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     101      <Private>False</Private>
    100102    </Reference>
    101103    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     105      <Private>False</Private>
    103106    </Reference>
    104107    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     109      <Private>False</Private>
    106110    </Reference>
    107111    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     113      <Private>False</Private>
    109114    </Reference>
    110115    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     117      <Private>False</Private>
    112118    </Reference>
    113119    <Reference Include="HeuristicLab.Data.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     121      <Private>False</Private>
    115122    </Reference>
    116123    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     125      <Private>False</Private>
    118126    </Reference>
    119127    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     129      <Private>False</Private>
    121130    </Reference>
    122131    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     133      <Private>False</Private>
    124134    </Reference>
    125135    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     137      <Private>False</Private>
    127138    </Reference>
    128139    <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    129140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
     141      <Private>False</Private>
    130142    </Reference>
    131143    <Reference Include="HeuristicLab.Parameters.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132144      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters.Views-3.3.dll</HintPath>
     145      <Private>False</Private>
    133146    </Reference>
    134147    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    135148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     149      <Private>False</Private>
    136150    </Reference>
    137151    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    138152      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     153      <Private>False</Private>
    139154    </Reference>
    140155    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    141156      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     157      <Private>False</Private>
    142158    </Reference>
    143159    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    144160      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    145     </Reference>
    146     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
     161      <Private>False</Private>
     162    </Reference>
     163    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
     164      <Private>False</Private>
     165    </Reference>
    147166    <Reference Include="System" />
    148167    <Reference Include="System.Core">
    … …  
    181200    </Compile>
    182201    <Compile Include="Plugin.cs" />
     202    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     203      <SubType>UserControl</SubType>
     204    </Compile>
     205    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     206      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     207    </Compile>
    183208    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
    184209      <SubType>UserControl</SubType>
    … …  
    187212      <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    188213    </Compile>
    189     <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    190       <SubType>UserControl</SubType>
    191     </Compile>
    192     <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
    193       <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     214    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
     215      <SubType>UserControl</SubType>
     216    </Compile>
     217    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
     218      <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
     219    </Compile>
     220    <Compile Include="Regression\RegressionSolutionLineChartView.cs">
     221      <SubType>UserControl</SubType>
     222    </Compile>
     223    <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
     224      <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
     225    </Compile>
     226    <Compile Include="Regression\RegressionSolutionResidualHistogram.cs">
     227      <SubType>UserControl</SubType>
     228    </Compile>
     229    <Compile Include="Regression\RegressionSolutionResidualHistogram.Designer.cs">
     230      <DependentUpon>RegressionSolutionResidualHistogram.cs</DependentUpon>
     231    </Compile>
     232    <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
     233      <SubType>UserControl</SubType>
     234    </Compile>
     235    <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
     236      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    194237    </Compile>
    195238    <Compile Include="Solution Views\ClassificationSolutionView.cs">
    … …  
    285328      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    286329    </Compile>
    287     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
    288       <SubType>UserControl</SubType>
    289     </Compile>
    290     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
    291       <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
    292     </Compile>
    293     <Compile Include="Regression\RegressionSolutionLineChartView.cs">
    294       <SubType>UserControl</SubType>
    295     </Compile>
    296     <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
    297       <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
    298     </Compile>
    299     <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
    300       <SubType>UserControl</SubType>
    301     </Compile>
    302     <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
    303       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    304     </Compile>
    305330    <None Include="HeuristicLab.snk" />
    306331    <None Include="Plugin.cs.frame" />
    307332    <None Include="Properties\AssemblyInfo.cs.frame" />
    308     <Compile Include="DataAnalysisProblemView.cs">
    309       <SubType>UserControl</SubType>
    310     </Compile>
    311     <Compile Include="DataAnalysisProblemView.Designer.cs">
    312       <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    313     </Compile>
    314333    <Compile Include="Properties\AssemblyInfo.cs" />
    315334  </ItemGroup>
    … …  
    331350    </BootstrapperPackage>
    332351  </ItemGroup>
     352  <ItemGroup>
     353    <Folder Include="obj\" />
     354  </ItemGroup>
    333355  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    334356  <!-- 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.