- Timestamp:
- 12/28/18 16:10:48 (6 years ago)
- Location:
- branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/BoolConverter.cs
r16453 r16462 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Fossil; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 30 [Item("BoolConverter", "Converts a ValueTypeValue<bool>, ValueTypeArray<bool>, or ValueTypeMatrix<bool> and adds it to the SolutionMessage's BoolVars or BoolArrayVars. A matrix is encoded as array by concatenating all rows and setting length as the length of a row.")] 31 [Storable Class]31 [StorableType("8341D6D1-33C1-4CB7-AC4F-9A5447948022")] 32 32 public class BoolConverter : Item, IItemToSolutionMessageConverter { 33 33 private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<bool>), typeof(ValueTypeArray<bool>), typeof(ValueTypeMatrix<bool>) }; 34 34 [StorableConstructor] 35 protected BoolConverter( bool deserializing) : base(deserializing) { }35 protected BoolConverter(StorableConstructorFlag _) : base(_) { } 36 36 protected BoolConverter(BoolConverter original, Cloner cloner) : base(original, cloner) { } 37 37 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/DateTimeValueConverter.cs
r16453 r16462 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Fossil; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation { 29 29 [Item("DateTimeValueConverter", "Converts a DateTimeValue and adds it to the SolutionMessage's StringVars. The format is yyyy-MM-dd HH:mm:sszzz, e.g. 2010-05-31 19:15:33+01:00.")] 30 [Storable Class]30 [StorableType("99D4CC9B-B4F3-4A79-9EC9-6C5BB40C8C87")] 31 31 public class DateTimeValueConverter : Item, IItemToSolutionMessageConverter { 32 32 private static readonly Type[] itemTypes = new Type[] { typeof(DateTimeValue) }; 33 33 [StorableConstructor] 34 protected DateTimeValueConverter( bool deserializing) : base(deserializing) { }34 protected DateTimeValueConverter(StorableConstructorFlag _) : base(_) { } 35 35 protected DateTimeValueConverter(DateTimeValueConverter original, Cloner cloner) : base(original, cloner) { } 36 36 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/DoubleConverter.cs
r16453 r16462 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Fossil; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 30 [Item("DoubleConverter", "Converts a ValueTypeValue<double>, ValueTypeArray<double>, or ValueTypeMatrix<double> and adds it to the SolutionMessage's DoubleVars or DoubleArrayVars. A matrix is encoded as array by concatenating all rows and setting length as the length of a row.")] 31 [Storable Class]31 [StorableType("30B9F1EE-5D41-4EE3-97F5-39500BBC5172")] 32 32 public class DoubleConverter : Item, IItemToSolutionMessageConverter { 33 33 private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<double>), typeof(ValueTypeArray<double>), typeof(ValueTypeMatrix<double>) }; 34 34 35 35 [StorableConstructor] 36 protected DoubleConverter( bool deserializing) : base(deserializing) { }36 protected DoubleConverter(StorableConstructorFlag _) : base(_) { } 37 37 protected DoubleConverter(DoubleConverter original, Cloner cloner) : base(original, cloner) { } 38 38 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/IntegerConverter.cs
r16453 r16462 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Fossil; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 30 [Item("IntegerConverter", "Converts a ValueTypeValue<int>, ValueTypeArray<int>, or ValueTypeMatrix<int> and adds it to the SolutionMessage's IntegerVars or IntegerArrayVars. A matrix is encoded as array by concatenating all rows and setting length as the length of a row.")] 31 [Storable Class]31 [StorableType("540B4803-05EC-4AB8-AFAC-A8E35A98F4D7")] 32 32 public class IntegerConverter : Item, IItemToSolutionMessageConverter { 33 33 private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<int>), typeof(ValueTypeArray<int>), typeof(ValueTypeMatrix<int>) }; 34 34 35 35 [StorableConstructor] 36 protected IntegerConverter( bool deserializing) : base(deserializing) { }36 protected IntegerConverter(StorableConstructorFlag _) : base(_) { } 37 37 protected IntegerConverter(IntegerConverter original, Cloner cloner) : base(original, cloner) { } 38 38 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/StringConverter.cs
r16453 r16462 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Fossil; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation { 29 29 [Item("StringConverter", "Converts a StringValue, StringArray, StringMatrix, IStringConvertibleValue, IStringConvertibleArray, or IStringConvertibleMatrix and adds it to the SolutionMessage's StringVars or StringArrayVars. A matrix is encoded as array by concatenating all rows and setting length as the length of a row.")] 30 [Storable Class]30 [StorableType("FD48F37D-DA07-442D-85B9-EC7D5D1A6740")] 31 31 public class StringConverter : Item, IItemToSolutionMessageConverter { 32 32 private static readonly Type[] itemTypes = new Type[] { typeof(StringValue), typeof(StringArray), typeof(StringMatrix), typeof(IStringConvertibleValue), typeof(IStringConvertibleArray), typeof(IStringConvertibleMatrix) }; 33 33 34 34 [StorableConstructor] 35 protected StringConverter( bool deserializing) : base(deserializing) { }35 protected StringConverter(StorableConstructorFlag _) : base(_) { } 36 36 protected StringConverter(StringConverter original, Cloner cloner) : base(original, cloner) { } 37 37 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/TimeSpanValueConverter.cs
r16453 r16462 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Fossil; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation { 29 29 [Item("TimeSpanValueConverter", "Converts a TimeSpanValue and adds it to the SolutionMessage's StringVars. The format is d.hh:mm:ss, e.g. 1113.10:55:00 (1113 days 10 hours, 55 minutes, 0 seconds).")] 30 [Storable Class]30 [StorableType("4617C8B5-89CF-42B5-82B5-C57E9B924C0F")] 31 31 public class TimeSpanValueConverter : Item, IItemToSolutionMessageConverter { 32 32 private static readonly Type[] itemTypes = new Type[] { typeof(TimeSpanValue) }; 33 33 34 34 [StorableConstructor] 35 protected TimeSpanValueConverter( bool deserializing) : base(deserializing) { }35 protected TimeSpanValueConverter(StorableConstructorFlag _) : base(_) { } 36 36 protected TimeSpanValueConverter(TimeSpanValueConverter original, Cloner cloner) : base(original, cloner) { } 37 37 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationChannel.cs
r16453 r16462 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Fossil; 26 26 27 27 namespace HeuristicLab.Problems.ExternalEvaluation { 28 28 [Item("EvaluationChannel", "Abstract base class for channels to be used in an external evaluation problem.")] 29 [Storable Class]29 [StorableType("2BE4FE9D-D5FE-45C3-9F85-3BF7200F0913")] 30 30 public abstract class EvaluationChannel : NamedItem, IEvaluationChannel { 31 31 public override bool CanChangeName { get { return false; } } … … 33 33 34 34 [StorableConstructor] 35 protected EvaluationChannel( bool deserializing) : base(deserializing) { }35 protected EvaluationChannel(StorableConstructorFlag _) : base(_) { } 36 36 protected EvaluationChannel(EvaluationChannel original, Cloner cloner) : base(original, cloner) { } 37 37 protected EvaluationChannel() -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationProcessChannel.cs
r16453 r16462 26 26 using HeuristicLab.Common; 27 27 using HeuristicLab.Core; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Fossil; 29 29 30 30 namespace HeuristicLab.Problems.ExternalEvaluation { 31 31 [Item("EvaluationProcessChannel", "A channel that launches an external application in a new process and communicates with that process via stdin and stdout.")] 32 [Storable Class]32 [StorableType("ECC07782-60E0-483C-8632-476697A058D2")] 33 33 public class EvaluationProcessChannel : EvaluationChannel { 34 34 … … 64 64 #region Construction & Cloning 65 65 [StorableConstructor] 66 protected EvaluationProcessChannel( bool deserializing) : base(deserializing) { }66 protected EvaluationProcessChannel(StorableConstructorFlag _) : base(_) { } 67 67 protected EvaluationProcessChannel(EvaluationProcessChannel original, Cloner cloner) 68 68 : base(original, cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationServiceClient.cs
r16453 r16462 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Fossil; 30 30 31 31 namespace HeuristicLab.Problems.ExternalEvaluation { 32 32 [Item("EvaluationServiceClient", "An RPC client that evaluates a solution.")] 33 [Storable Class]33 [StorableType("97F11C34-F32B-4AD2-92FB-F4A12311C962")] 34 34 public class EvaluationServiceClient : ParameterizedNamedItem, IEvaluationServiceClient { 35 35 … … 53 53 #region Construction & Cloning 54 54 [StorableConstructor] 55 protected EvaluationServiceClient( bool deserializing) : base(deserializing) { }55 protected EvaluationServiceClient(StorableConstructorFlag _) : base(_) { } 56 56 protected EvaluationServiceClient(EvaluationServiceClient original, Cloner cloner) 57 57 : base(original, cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationStreamChannel.cs
r16453 r16462 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Fossil; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 30 [Item("EvaluationStreamChannel", "A channel that communicates via an input and an output stream.")] 31 [Storable Class]31 [StorableType("15DD5556-3C31-4D18-BE18-D438B45591D8")] 32 32 public class EvaluationStreamChannel : EvaluationChannel { 33 33 … … 36 36 37 37 [StorableConstructor] 38 protected EvaluationStreamChannel( bool deserializing) : base(deserializing) { }38 protected EvaluationStreamChannel(StorableConstructorFlag _) : base(_) { } 39 39 protected EvaluationStreamChannel(EvaluationStreamChannel original, Cloner cloner) : base(original, cloner) { } 40 40 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationTCPChannel.cs
r16453 r16462 26 26 using HeuristicLab.Common; 27 27 using HeuristicLab.Core; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Fossil; 29 29 30 30 namespace HeuristicLab.Problems.ExternalEvaluation { 31 31 [Item("EvaluationTCPChannel", "A channel that creates a TCP connection over a network.")] 32 [Storable Class]32 [StorableType("FECC0F5B-B22A-4117-888D-5B8B84332D24")] 33 33 public class EvaluationTCPChannel : EvaluationChannel { 34 34 … … 63 63 #region Construction & Cloning 64 64 [StorableConstructor] 65 protected EvaluationTCPChannel( bool deserializing) : base(deserializing) { }65 protected EvaluationTCPChannel(StorableConstructorFlag _) : base(_) { } 66 66 protected EvaluationTCPChannel(EvaluationTCPChannel original, Cloner cloner) 67 67 : base(original, cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs
r16453 r16462 36 36 using HeuristicLab.Data; 37 37 using HeuristicLab.Parameters; 38 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;38 using HEAL.Fossil; 39 39 40 40 namespace HeuristicLab.Problems.ExternalEvaluation { 41 41 42 42 [Item("EvaluationCache", "Cache for external evaluation values")] 43 [Storable Class]43 [StorableType("FDB10541-FA1C-4CF9-8175-83A55700C052")] 44 44 public class EvaluationCache : ParameterizedNamedItem { 45 45 … … 199 199 #region Construction & Cloning 200 200 [StorableConstructor] 201 protected EvaluationCache( bool deserializing) : base(deserializing) { }201 protected EvaluationCache(StorableConstructorFlag _) : base(_) { } 202 202 protected EvaluationCache(EvaluationCache original, Cloner cloner) 203 203 : base(original, cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs
r16453 r16462 32 32 using HeuristicLab.Optimization; 33 33 using HeuristicLab.Parameters; 34 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;34 using HEAL.Fossil; 35 35 36 36 namespace HeuristicLab.Problems.ExternalEvaluation { 37 37 [Item("External Evaluation Problem (single-objective)", "A problem that is evaluated in a different process.")] 38 38 [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 100)] 39 [Storable Class]39 [StorableType("115EB3A5-A8A8-4A2E-9799-9485FE896DEC")] 40 40 // BackwardsCompatibility3.3 41 41 // Rename class to SingleObjectiveExternalEvaluationProblem … … 88 88 89 89 [StorableConstructor] 90 protected ExternalEvaluationProblem( bool deserializing) : base(deserializing) { }90 protected ExternalEvaluationProblem(StorableConstructorFlag _) : base(_) { } 91 91 protected ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { } 92 92 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/HeuristicLab.Problems.ExternalEvaluation-3.4.csproj
r16454 r16462 108 108 <Private>False</Private> 109 109 </Reference> 110 <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">110 <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 111 111 <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath> 112 112 </Reference> -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs
r16453 r16462 31 31 using HeuristicLab.Optimization; 32 32 using HeuristicLab.Parameters; 33 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;33 using HEAL.Fossil; 34 34 35 35 namespace HeuristicLab.Problems.ExternalEvaluation { 36 36 [Item("External Evaluation Problem (multi-objective)", "A multi-objective problem that is evaluated in a different process.")] 37 37 [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 200)] 38 [Storable Class]38 [StorableType("CCA50199-A6AB-4C84-B4FA-0262CAF416EC")] 39 39 public class MultiObjectiveExternalEvaluationProblem : MultiObjectiveBasicProblem<IEncoding>, IExternalEvaluationProblem { 40 40 … … 85 85 86 86 [StorableConstructor] 87 protected MultiObjectiveExternalEvaluationProblem( bool deserializing) : base(deserializing) { }87 protected MultiObjectiveExternalEvaluationProblem(StorableConstructorFlag _) : base(_) { } 88 88 protected MultiObjectiveExternalEvaluationProblem(MultiObjectiveExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { } 89 89 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs
r16453 r16462 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Optimization; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Fossil; 26 26 using HeuristicLab.Problems.ExternalEvaluation.Programmable; 27 27 28 28 namespace HeuristicLab.Problems.ExternalEvaluation { 29 29 [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")] 30 [Storable Class]30 [StorableType("617A7BEE-1B2F-4E39-A814-54CC4DFA2F02")] 31 31 public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport { 32 32 [StorableConstructor] 33 private MultiObjectiveOptimizationSupportScript( bool deserializing) : base(deserializing) { }33 private MultiObjectiveOptimizationSupportScript(StorableConstructorFlag _) : base(_) { } 34 34 private MultiObjectiveOptimizationSupportScript(MultiObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { } 35 35 public MultiObjectiveOptimizationSupportScript() : base(Templates.CompiledMultiObjectiveOptimizationSupport) { } -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs
r16453 r16462 24 24 using System.Reflection; 25 25 using HeuristicLab.Common; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Fossil; 27 27 using HeuristicLab.Scripting; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 [Storable Class]30 [StorableType("F1BC4885-753B-4E47-9169-EFC2E744782C")] 31 31 public abstract class OptimizationSupportScript<T> : Script 32 32 where T : class { … … 39 39 40 40 [StorableConstructor] 41 protected OptimizationSupportScript( bool deserializing) : base(deserializing) { }41 protected OptimizationSupportScript(StorableConstructorFlag _) : base(_) { } 42 42 protected OptimizationSupportScript(OptimizationSupportScript<T> original, Cloner cloner) 43 43 : base(original, cloner) { -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs
r16453 r16462 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Optimization; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Fossil; 27 27 using HeuristicLab.Problems.ExternalEvaluation.Programmable; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation { 30 30 [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")] 31 [Storable Class]31 [StorableType("3EB74171-6ECB-4479-861E-DA4EB39FE70C")] 32 32 public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport { 33 33 [StorableConstructor] 34 private SingleObjectiveOptimizationSupportScript( bool deserializing) : base(deserializing) { }34 private SingleObjectiveOptimizationSupportScript(StorableConstructorFlag _) : base(_) { } 35 35 private SingleObjectiveOptimizationSupportScript(SingleObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { } 36 36 public SingleObjectiveOptimizationSupportScript() : base(Templates.CompiledSingleObjectiveOptimizationSupport) { } -
branches/2520_PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/SolutionMessageBuilder.cs
r16453 r16462 26 26 using HeuristicLab.Common; 27 27 using HeuristicLab.Core; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Fossil; 29 29 30 30 namespace HeuristicLab.Problems.ExternalEvaluation { 31 31 [Item("SolutionMessageBuilder", "Holds and uses a number of converters to translate HeuristicLab objects into appropriate fields of a solution message.")] 32 [Storable Class]32 [StorableType("8F406464-C1F6-4BBD-8791-C836846B473B")] 33 33 public class SolutionMessageBuilder : NamedItem { 34 34 public override bool CanChangeName { get { return false; } } … … 43 43 44 44 [StorableConstructor] 45 protected SolutionMessageBuilder( bool deserializing) : base(deserializing) { }45 protected SolutionMessageBuilder(StorableConstructorFlag _) : base(_) { } 46 46 [StorableHook(HookType.AfterDeserialization)] 47 47 private void AfterDeserialization() {
Note: See TracChangeset
for help on using the changeset viewer.