Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/03/17 11:41:43 (7 years ago)
Author:
gkronber
Message:

#2520

  • renamed StorableClass -> StorableType
  • changed persistence to use GUIDs instead of type names
Location:
branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/BoolConverter.cs

    r13368 r14711  
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [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   [StorableClass("D2FDE528-079E-4F52-9094-AB17757D7001")]
     31  [StorableType("D2FDE528-079E-4F52-9094-AB17757D7001")]
    3232  public class BoolConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<bool>), typeof(ValueTypeArray<bool>), typeof(ValueTypeMatrix<bool>) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/DateTimeValueConverter.cs

    r13368 r14711  
    2828namespace HeuristicLab.Problems.ExternalEvaluation {
    2929  [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   [StorableClass("48435B55-095F-489D-8772-F37CAF503B1D")]
     30  [StorableType("48435B55-095F-489D-8772-F37CAF503B1D")]
    3131  public class DateTimeValueConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(DateTimeValue) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/DoubleConverter.cs

    r13368 r14711  
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [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   [StorableClass("E30FB893-DC93-410A-A74E-FD07330B2622")]
     31  [StorableType("E30FB893-DC93-410A-A74E-FD07330B2622")]
    3232  public class DoubleConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<double>), typeof(ValueTypeArray<double>), typeof(ValueTypeMatrix<double>) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/IntegerConverter.cs

    r13368 r14711  
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [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   [StorableClass("CC1127E7-0F10-4C31-924D-74091BC5E8B6")]
     31  [StorableType("CC1127E7-0F10-4C31-924D-74091BC5E8B6")]
    3232  public class IntegerConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<int>), typeof(ValueTypeArray<int>), typeof(ValueTypeMatrix<int>) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/StringConverter.cs

    r13368 r14711  
    2828namespace HeuristicLab.Problems.ExternalEvaluation {
    2929  [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   [StorableClass("4CFC699A-5BF0-44E8-99B5-42358EB78D52")]
     30  [StorableType("4CFC699A-5BF0-44E8-99B5-42358EB78D52")]
    3131  public class StringConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(StringValue), typeof(StringArray), typeof(StringMatrix), typeof(IStringConvertibleValue), typeof(IStringConvertibleArray), typeof(IStringConvertibleMatrix) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/TimeSpanValueConverter.cs

    r13368 r14711  
    2828namespace HeuristicLab.Problems.ExternalEvaluation {
    2929  [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   [StorableClass("9B79E328-2BAC-4CD2-876C-A86FA146A207")]
     30  [StorableType("9B79E328-2BAC-4CD2-876C-A86FA146A207")]
    3131  public class TimeSpanValueConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(TimeSpanValue) };

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationChannel.cs

    r13368 r14711  
    2727namespace HeuristicLab.Problems.ExternalEvaluation {
    2828  [Item("EvaluationChannel", "Abstract base class for channels to be used in an external evaluation problem.")]
    29   [StorableClass("594F3729-E6BE-41BE-9117-255B7A17D40D")]
     29  [StorableType("594F3729-E6BE-41BE-9117-255B7A17D40D")]
    3030  public abstract class EvaluationChannel : NamedItem, IEvaluationChannel {
    3131    public override bool CanChangeName { get { return false; } }

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationProcessChannel.cs

    r13368 r14711  
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("EvaluationProcessChannel", "A channel that launches an external application in a new process and communicates with that process via stdin and stdout.")]
    32   [StorableClass("9067F50C-CCD0-47F7-A03B-E29B15610C73")]
     32  [StorableType("9067F50C-CCD0-47F7-A03B-E29B15610C73")]
    3333  public class EvaluationProcessChannel : EvaluationChannel {
    3434

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationServiceClient.cs

    r13368 r14711  
    3131namespace HeuristicLab.Problems.ExternalEvaluation {
    3232  [Item("EvaluationServiceClient", "An RPC client that evaluates a solution.")]
    33   [StorableClass("AB30EDF1-6188-43A9-8BAF-67F892BA8AA2")]
     33  [StorableType("AB30EDF1-6188-43A9-8BAF-67F892BA8AA2")]
    3434  public class EvaluationServiceClient : ParameterizedNamedItem, IEvaluationServiceClient {
    3535

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationStreamChannel.cs

    r13368 r14711  
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [Item("EvaluationStreamChannel", "A channel that communicates via an input and an output stream.")]
    31   [StorableClass("2B11783B-9E33-485A-9F59-106EAC9BE40A")]
     31  [StorableType("2B11783B-9E33-485A-9F59-106EAC9BE40A")]
    3232  public class EvaluationStreamChannel : EvaluationChannel {
    3333

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationTCPChannel.cs

    r13368 r14711  
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("EvaluationTCPChannel", "A channel that creates a TCP connection over a network.")]
    32   [StorableClass("1CDD7F3C-51F7-4D64-BE01-2663DF5509AE")]
     32  [StorableType("1CDD7F3C-51F7-4D64-BE01-2663DF5509AE")]
    3333  public class EvaluationTCPChannel : EvaluationChannel {
    3434

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/EvaluationCache.cs

    r13368 r14711  
    4141
    4242  [Item("EvaluationCache", "Cache for external evaluation values")]
    43   [StorableClass("FAEB5479-B4D4-4BCC-99C2-D2A6E8F40917")]
     43  [StorableType("FAEB5479-B4D4-4BCC-99C2-D2A6E8F40917")]
    4444  public class EvaluationCache : ParameterizedNamedItem {
    4545

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

    r13368 r14711  
    3737  [Item("External Evaluation Problem (single-objective)", "A problem that is evaluated in a different process.")]
    3838  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 100)]
    39   [StorableClass("CFB83F63-CF43-4D94-AFD7-997022ABAFE0")]
     39  [StorableType("CFB83F63-CF43-4D94-AFD7-997022ABAFE0")]
    4040  // BackwardsCompatibility3.3
    4141  // Rename class to SingleObjectiveExternalEvaluationProblem

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

    r13368 r14711  
    3636  [Item("External Evaluation Problem (multi-objective)", "A multi-objective problem that is evaluated in a different process.")]
    3737  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 200)]
    38   [StorableClass("46F8D88B-FADF-4E9E-867F-7451FE37B6B9")]
     38  [StorableType("46F8D88B-FADF-4E9E-867F-7451FE37B6B9")]
    3939  public class MultiObjectiveExternalEvaluationProblem : MultiObjectiveBasicProblem<IEncoding>, IExternalEvaluationProblem {
    4040

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs

    r13368 r14711  
    2828namespace HeuristicLab.Problems.ExternalEvaluation {
    2929  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    30   [StorableClass("868702DE-4514-4F32-8E73-F602D9E8B7A8")]
     30  [StorableType("868702DE-4514-4F32-8E73-F602D9E8B7A8")]
    3131  public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport {
    3232    [StorableConstructor]

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs

    r13368 r14711  
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    31   [StorableClass("B494EF47-B663-4015-8022-693E327E2764")]
     31  [StorableType("B494EF47-B663-4015-8022-693E327E2764")]
    3232  public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport {
    3333    [StorableConstructor]

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/Templates.resx

    r13183 r14711  
    119119  </resheader>
    120120  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
    121   <data name="CompiledMultiObjectiveOptimizationSupport" type="System.Resources.ResXFileRef, System.Windows.Forms">
     121  <data name="CompiledMultiObjectiveOptimizationSupport" memberSelection="System.Resources.ResXFileRef, System.Windows.Forms">
    122122    <value>compiledmultiobjectiveoptimizationsupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
    123123  </data>
    124   <data name="CompiledSingleObjectiveOptimizationSupport" type="System.Resources.ResXFileRef, System.Windows.Forms">
     124  <data name="CompiledSingleObjectiveOptimizationSupport" memberSelection="System.Resources.ResXFileRef, System.Windows.Forms">
    125125    <value>CompiledSingleObjectiveOptimizationSupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
    126126  </data>

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/Protos/ExternalEvaluationMessages.proto

    r13180 r14711  
    6767message QualityMessage {
    6868  required int32 solutionId = 1;
    69   enum Type {
     69  enum MemberSelection {
    7070    SingleObjectiveQualityMessage = 1;
    7171    MultiObjectiveQualityMessage = 2;
    7272  }
    73   required Type type = 2;
     73  required Type memberSelection = 2;
    7474  extensions 1000 to max;
    7575}

  • branches/PersistenceOverhaul/HeuristicLab.Problems.ExternalEvaluation/3.4/SolutionMessageBuilder.cs

    r13368 r14711  
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("SolutionMessageBuilder", "Holds and uses a number of converters to translate HeuristicLab objects into appropriate fields of a solution message.")]
    32   [StorableClass("240E62E6-9C29-45FC-A93E-45759CE99B7E")]
     32  [StorableType("240E62E6-9C29-45FC-A93E-45759CE99B7E")]
    3333  public class SolutionMessageBuilder : NamedItem {
    3434    public override bool CanChangeName { get { return false; } }
Note: See TracChangeset for help on using the changeset viewer.