Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (7 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4
Files:
18 edited

Legend:

Unmodified
Added
Removed

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

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    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]
     31  [StorableType("cbb2f15b-e753-4e55-ae88-e593ca1f9599")]
    3232  public class BoolConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<bool>), typeof(ValueTypeArray<bool>), typeof(ValueTypeMatrix<bool>) };

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

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    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]
     30  [StorableType("6ef21fd9-1dfb-4288-a7e4-601663cb8ca0")]
    3131  public class DateTimeValueConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(DateTimeValue) };

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

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    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]
     31  [StorableType("d668fc8c-cc47-4d21-8a76-a904e17a1d49")]
    3232  public class DoubleConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<double>), typeof(ValueTypeArray<double>), typeof(ValueTypeMatrix<double>) };

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

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    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]
     31  [StorableType("0211c890-bab0-4be5-804d-d408ee523a31")]
    3232  public class IntegerConverter : Item, IItemToSolutionMessageConverter {
    3333    private static readonly Type[] itemTypes = new Type[] { typeof(ValueTypeValue<int>), typeof(ValueTypeArray<int>), typeof(ValueTypeMatrix<int>) };

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

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    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]
     30  [StorableType("c82c3567-34db-49df-af44-fbbfede3d6ea")]
    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/PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Converters/TimeSpanValueConverter.cs

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    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]
     30  [StorableType("f3225d81-ed32-4c80-b501-b6ed1004ac60")]
    3131  public class TimeSpanValueConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(TimeSpanValue) };

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

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.ExternalEvaluation {
    2828  [Item("EvaluationChannel", "Abstract base class for channels to be used in an external evaluation problem.")]
    29   [StorableClass]
     29  [StorableType("c482fe83-47d8-4cd9-8270-71339961576b")]
    3030  public abstract class EvaluationChannel : NamedItem, IEvaluationChannel {
    3131    public override bool CanChangeName { get { return false; } }

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

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    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]
     32  [StorableType("1a8626d1-3e6f-49f0-99d6-083f6d88f07c")]
    3333  public class EvaluationProcessChannel : EvaluationChannel {
    3434

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

    r14185 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.ExternalEvaluation {
    3232  [Item("EvaluationServiceClient", "An RPC client that evaluates a solution.")]
    33   [StorableClass]
     33  [StorableType("99f4f039-b9f1-47fd-8eb2-5ceea57d9197")]
    3434  public class EvaluationServiceClient : ParameterizedNamedItem, IEvaluationServiceClient {
    3535

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

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [Item("EvaluationStreamChannel", "A channel that communicates via an input and an output stream.")]
    31   [StorableClass]
     31  [StorableType("174e1468-0878-49ca-a3c4-bd3d30d814df")]
    3232  public class EvaluationStreamChannel : EvaluationChannel {
    3333

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

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.ExternalEvaluation {
    3131  [Item("EvaluationTCPChannel", "A channel that creates a TCP connection over a network.")]
    32   [StorableClass]
     32  [StorableType("f9331c3f-44d8-46ac-99cd-5c432ccb9306")]
    3333  public class EvaluationTCPChannel : EvaluationChannel {
    3434

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

    r14185 r14927  
    3636using HeuristicLab.Data;
    3737using HeuristicLab.Parameters;
    38 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     38using HeuristicLab.Persistence;
    3939
    4040namespace HeuristicLab.Problems.ExternalEvaluation {
    4141
    4242  [Item("EvaluationCache", "Cache for external evaluation values")]
    43   [StorableClass]
     43  [StorableType("fccab88b-ca22-46ad-b086-5d47877cc8cb")]
    4444  public class EvaluationCache : ParameterizedNamedItem {
    4545

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

    r14877 r14927  
    3232using HeuristicLab.Optimization;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HeuristicLab.Persistence;
    3535
    3636namespace HeuristicLab.Problems.ExternalEvaluation {
    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]
     39  [StorableType("2f87216f-3877-4577-8a10-435cb16bbb8a")]
    4040  // BackwardsCompatibility3.3
    4141  // Rename class to SingleObjectiveExternalEvaluationProblem
    … …  
    158158      try {
    159159        return client.Evaluate(message, GetQualityMessageExtensions());
    160       }
    161       finally {
     160      } finally {
    162161        lock (clientLock) {
    163162          activeClients.Remove(client);
    … …  
    174173          try {
    175174            MessageBuilder.AddToMessage(variable.Value, variable.Key, protobufBuilder);
    176           }
    177           catch (ArgumentException ex) {
     175          } catch (ArgumentException ex) {
    178176            throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
    179177          }

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

    r14877 r14927  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HeuristicLab.Persistence;
    3434
    3535namespace HeuristicLab.Problems.ExternalEvaluation {
    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]
     38  [StorableType("1fe3556f-ef0d-4443-a51b-4ec5f5d5a2bf")]
    3939  public class MultiObjectiveExternalEvaluationProblem : MultiObjectiveBasicProblem<IEncoding>, IExternalEvaluationProblem {
    4040
    … …  
    155155      try {
    156156        return client.Evaluate(message, GetQualityMessageExtensions());
    157       }
    158       finally {
     157      } finally {
    159158        lock (clientLock) {
    160159          activeClients.Remove(client);
    … …  
    171170          try {
    172171            MessageBuilder.AddToMessage(variable.Value, variable.Key, protobufBuilder);
    173           }
    174           catch (ArgumentException ex) {
     172          } catch (ArgumentException ex) {
    175173            throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
    176174          }

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

    r14185 r14927  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626using HeuristicLab.Problems.ExternalEvaluation.Programmable;
    2727
    2828namespace HeuristicLab.Problems.ExternalEvaluation {
    2929  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    30   [StorableClass]
     30  [StorableType("07da9156-b080-45a0-ba8b-fbc57d8d17cf")]
    3131  public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport {
    3232    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs

    r14185 r14927  
    2424using System.Reflection;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Scripting;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    30   [StorableClass]
     30  [StorableType("83604810-c01b-4a7d-9f2b-3bbe51bd5057")]
    3131  public abstract class OptimizationSupportScript<T> : Script
    3232    where T : class {

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

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Problems.ExternalEvaluation.Programmable;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation {
    3030  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    31   [StorableClass]
     31  [StorableType("b3772084-f7eb-4539-abe0-6b116048e192")]
    3232  public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport {
    3333    [StorableConstructor]

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

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    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]
     32  [StorableType("8ecf67de-fe65-43df-a95f-a8d9cdb45a28")]
    3333  public class SolutionMessageBuilder : NamedItem {
    3434    public override bool CanChangeName { get { return false; } }
Note: See TracChangeset for help on using the changeset viewer.