- Timestamp:
- 11/20/18 15:26:57 (6 years ago)
- Location:
- branches/2845_EnhancedProgress
- Files:
-
- 29 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2845_EnhancedProgress
- Property svn:mergeinfo changed
-
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Views merged eligible /stable/HeuristicLab.Clients.Hive.Views merged eligible /trunk/HeuristicLab.Clients.Hive.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Hive.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Views 5516-5520 /branches/Async/HeuristicLab.Clients.Hive.Views 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Clients.Hive.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Hive.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Clients.Hive.Views 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Views 5060 /branches/HLScript/HeuristicLab.Clients.Hive.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Hive.Views 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Hive.Views 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Views 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Clients.Hive.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Clients.Hive.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Clients.Hive.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Clients.Hive.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Hive.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Views 5370-5682 /branches/Trunk/HeuristicLab.Clients.Hive.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Hive.Views 9168-9215 /branches/VNS/HeuristicLab.Clients.Hive.Views 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Clients.Hive.Views 12948-12950 /branches/histogram/HeuristicLab.Clients.Hive.Views 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Clients.Hive.Views 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj
r14125 r16311 101 101 </ItemGroup> 102 102 <ItemGroup> 103 <Compile Include="Extensions\FixedNumericUpDown.cs"> 104 <SubType>Component</SubType> 105 </Compile> 103 106 <Compile Include="HiveInformationDialog.cs"> 104 107 <SubType>Form</SubType> … … 168 171 <Compile Include="StateLog\StateLogView.designer.cs"> 169 172 <DependentUpon>StateLogView.cs</DependentUpon> 173 </Compile> 174 <Compile Include="TreeView\NoDoubleClickTreeView.cs"> 175 <SubType>Component</SubType> 170 176 </Compile> 171 177 <None Include="Plugin.cs.frame" /> -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveInformationDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveInformationDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 52 52 // storeButton 53 53 // 54 this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary. PublishToWeb;54 this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save; 55 55 this.storeButton.Location = new System.Drawing.Point(0, 0); 56 56 this.storeButton.Name = "storeButton"; -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskListView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 211 211 } 212 212 } 213 214 private void coresNeededComboBox_SelectedIndexChanged(object sender, EventArgs e) { 215 if (Content != null && Content.Task != null) { 216 int cores; 217 if (int.TryParse(coresNeededComboBox.SelectedItem.ToString(), out cores) && Content.Task.CoresNeeded != cores) 218 Content.Task.CoresNeeded = cores; 219 } 220 } 213 221 } 214 222 } -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/HiveTaskView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 292 292 "2", 293 293 "3", 294 "4"}); 294 "4", 295 "6", 296 "8", 297 "10", 298 "12"}); 295 299 this.coresNeededComboBox.Location = new System.Drawing.Point(134, 13); 296 300 this.coresNeededComboBox.Name = "coresNeededComboBox"; 297 301 this.coresNeededComboBox.Size = new System.Drawing.Size(134, 21); 298 302 this.coresNeededComboBox.TabIndex = 41; 303 this.coresNeededComboBox.SelectedIndexChanged += new System.EventHandler(this.coresNeededComboBox_SelectedIndexChanged); 299 304 // 300 305 // memoryNeededLabel -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/Plugin.cs.frame
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 28 28 namespace HeuristicLab.Clients.Hive.Views { 29 [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.1 4.$WCREV$")]29 [Plugin("HeuristicLab.Clients.Hive.Views", "3.3.15.$WCREV$")] 30 30 [PluginFile("HeuristicLab.Clients.Hive.Views-3.3.dll", PluginFileType.Assembly)] 31 31 [PluginDependency("HeuristicLab.Clients.Hive", "3.3")] -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/Properties/AssemblyInfo.cs.frame
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 6HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 4.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")] -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartListView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogGanttChartView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogListView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogListView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/StateLog/StateLogView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/HiveTaskItemTreeView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Hive.Views/3.3/TreeView/NewTaskTreeNodeAction.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.