- Timestamp:
- 10/23/16 09:44:29 (8 years ago)
- Location:
- branches/symbreg-factors-2650
- Files:
-
- 5 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/symbreg-factors-2650
- Property svn:mergeinfo changed
/trunk/sources merged: 14332,14340-14350
- Property svn:mergeinfo changed
-
branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views (added) merged: 14345-14346
- Property svn:mergeinfo changed
-
branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj
r14242 r14351 131 131 <DependentUpon>OneFactorClassificationModelView.cs</DependentUpon> 132 132 </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> 133 157 <Compile Include="MeanProdView.cs"> 134 158 <SubType>UserControl</SubType> … … 198 222 <Compile Include="SupportVectorMachineModelView.Designer.cs"> 199 223 <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> 200 230 </Compile> 201 231 </ItemGroup> … … 251 281 <Private>False</Private> 252 282 </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> 253 287 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj"> 254 288 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project> … … 275 309 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 276 310 <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> 277 327 </ProjectReference> 278 328 <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 19 19 */ 20 20 #endregion 21 using System;22 21 using System.Linq; 23 using System.IO;24 using System.Windows.Forms;25 22 using HeuristicLab.MainForm; 26 23 using HeuristicLab.MainForm.WindowsForms; -
branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/Plugin.cs.frame
r14195 r14351 37 37 [PluginDependency("HeuristicLab.Data", "3.3")] 38 38 [PluginDependency("HeuristicLab.Data.Views", "3.3")] 39 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 39 40 [PluginDependency("HeuristicLab.LibSVM", "3.12")] 40 41 [PluginDependency("HeuristicLab.MainForm", "3.3")] … … 44 45 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 45 46 [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")] 46 50 public class HeuristicLabAlgorithmsDataAnalysisViewsPlugin : PluginBase { 47 51 }
Note: See TracChangeset
for help on using the changeset viewer.