- Timestamp:
- 03/28/19 16:54:20 (6 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive merged eligible /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive merged eligible /branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Clients.Hive merged eligible /branches/2965_CancelablePersistence/HeuristicLab.Clients.Hive merged eligible /stable/HeuristicLab.Clients.Hive merged eligible /trunk/HeuristicLab.Clients.Hive merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Hive 10321-10322 /branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive 15743-16388 /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive 15943-16355 /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Clients.Hive 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Hive 4656-4721 /branches/CodeEditor/HeuristicLab.Clients.Hive 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Hive 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Clients.Hive 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive 5060 /branches/HLScript/HeuristicLab.Clients.Hive 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Hive 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Hive 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Clients.Hive 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Clients.Hive 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Clients.Hive 10202-10483 /branches/NET40/sources/HeuristicLab.Clients.Hive 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Clients.Hive 12033-12122 /branches/ParallelEngine/HeuristicLab.Clients.Hive 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Hive 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Hive 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Hive 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Hive 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive 5370-5682 /branches/Trunk/HeuristicLab.Clients.Hive 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Hive 9168-9215 /branches/VNS/HeuristicLab.Clients.Hive 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Clients.Hive 12948-12950 /branches/histogram/HeuristicLab.Clients.Hive 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Clients.Hive { 29 [Storable Class]29 [StorableType("FFDE8A4B-FDEC-47AA-B8E2-B16E5B513055")] 30 30 public class EngineTask : ItemTask { 31 31 public override HiveTask CreateHiveTask() { … … 63 63 64 64 [StorableConstructor] 65 protected EngineTask( bool deserializing) : base(deserializing) { }65 protected EngineTask(StorableConstructorFlag _) : base(_) { } 66 66 protected EngineTask(EngineTask original, Cloner cloner) 67 67 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Core; 27 27 using HeuristicLab.Hive; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.PluginInfrastructure; 30 30 31 31 namespace HeuristicLab.Clients.Hive { 32 32 [Item("Item Task", "Represents a executable hive task which contains a HeuristicLab Item.")] 33 [Storable Class]33 [StorableType("69EB65A5-9132-41B6-BE1D-60EDA46EF3C5")] 34 34 public abstract class ItemTask : NamedItem, ITask { 35 35 public virtual HiveTask CreateHiveTask() { … … 72 72 73 73 [StorableConstructor] 74 protected ItemTask( bool deserializing) { }74 protected ItemTask(StorableConstructorFlag _) : base(_) { } 75 75 protected ItemTask(ItemTask original, Cloner cloner) 76 76 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Optimization; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Clients.Hive.Jobs { 29 29 [Item("Optimizer Task", "Represents Task which executes a IOptimizer object.")] 30 [Storable Class]30 [StorableType("9A59FAAF-3F5C-4629-B22D-714488DC2678")] 31 31 public class OptimizerTask : ItemTask { 32 32 public override HiveTask CreateHiveTask() { … … 60 60 } 61 61 [StorableConstructor] 62 protected OptimizerTask( bool deserializing) { }62 protected OptimizerTask(StorableConstructorFlag _) : base(_) { } 63 63 protected OptimizerTask(OptimizerTask original, Cloner cloner) 64 64 : base(original, cloner) {
Note: See TracChangeset
for help on using the changeset viewer.