Ignore:
Timestamp:
10/23/16 09:44:29 (18 months ago)
Author:
gkronber
Message:

#2650: merged r14332:14350 from trunk to branch

Location:
branches/symbreg-factors-2650
Files:
5 edited
10 copied

Legend:

Unmodified
Added
Removed
  • branches/symbreg-factors-2650

  • branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views

  • branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r14242 r14351  
    131131      <DependentUpon>OneFactorClassificationModelView.cs</DependentUpon>
    132132    </Compile>
     133    <Compile Include="RandomForestClassificationSolutionView.cs">
     134      <SubType>UserControl</SubType>
     135    </Compile>
     136    <Compile Include="RandomForestClassificationSolutionView.Designer.cs">
     137      <DependentUpon>RandomForestClassificationSolutionView.cs</DependentUpon>
     138    </Compile>
     139    <Compile Include="RandomForestModelView.cs">
     140      <SubType>UserControl</SubType>
     141    </Compile>
     142    <Compile Include="RandomForestModelView.Designer.cs">
     143      <DependentUpon>RandomForestModelView.cs</DependentUpon>
     144    </Compile>
     145    <Compile Include="RandomForestRegressionSolutionView.cs">
     146      <SubType>UserControl</SubType>
     147    </Compile>
     148    <Compile Include="RandomForestRegressionSolutionView.Designer.cs">
     149      <DependentUpon>RandomForestRegressionSolutionView.cs</DependentUpon>
     150    </Compile>
     151    <Compile Include="GradientBoostedTreesModelView.cs">
     152      <SubType>UserControl</SubType>
     153    </Compile>
     154    <Compile Include="GradientBoostedTreesModelView.Designer.cs">
     155      <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon>
     156    </Compile>
    133157    <Compile Include="MeanProdView.cs">
    134158      <SubType>UserControl</SubType>
     
    198222    <Compile Include="SupportVectorMachineModelView.Designer.cs">
    199223      <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
     224    </Compile>
     225    <Compile Include="GradientBoostedTreesSolutionView.cs">
     226      <SubType>UserControl</SubType>
     227    </Compile>
     228    <Compile Include="GradientBoostedTreesSolutionView.Designer.cs">
     229      <DependentUpon>GradientBoostedTreesSolutionView.cs</DependentUpon>
    200230    </Compile>
    201231  </ItemGroup>
     
    251281      <Private>False</Private>
    252282    </ProjectReference>
     283    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     284      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     285      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     286    </ProjectReference>
    253287    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    254288      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     
    275309      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    276310      <Private>False</Private>
     311    </ProjectReference>
     312    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
     313      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
     314      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     315    </ProjectReference>
     316    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
     317      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
     318      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     319    </ProjectReference>
     320    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj">
     321      <Project>{7a2531ce-3f7c-4f13-bcca-ed6dc27a7086}</Project>
     322      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name>
     323    </ProjectReference>
     324    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     325      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
     326      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    277327    </ProjectReference>
    278328    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
  • branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/KMeansClusteringModelView.cs

    r14185 r14351  
    1919 */
    2020#endregion
    21 using System;
    2221using System.Linq;
    23 using System.IO;
    24 using System.Windows.Forms;
    2522using HeuristicLab.MainForm;
    2623using HeuristicLab.MainForm.WindowsForms;
  • branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame

    r14195 r14351  
    3737  [PluginDependency("HeuristicLab.Data", "3.3")]
    3838  [PluginDependency("HeuristicLab.Data.Views", "3.3")]
     39  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
    3940  [PluginDependency("HeuristicLab.LibSVM", "3.12")]
    4041  [PluginDependency("HeuristicLab.MainForm", "3.3")]
     
    4445  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4546  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
     47  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
     48  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
     49  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification", "3.4")]
    4650  public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase {
    4751  }
Note: See TracChangeset for help on using the changeset viewer.