Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Analyzers/BestSchedulingSolutionAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Scheduling {
    3232
    3333  [Item("BestSchedulingSolutionAnalyzer", "An operator for analyzing the best solution of Scheduling Problems given in schedule-representation.")]
    34   [StorableClass]
     34  [StorableType("FD6D4A80-1965-48FD-8D4C-E780BC2F8048")]
    3535  public sealed class BestSchedulingSolutionAnalyzer : SchedulingAnalyzer, IStochasticOperator {
    3636    [StorableConstructor]
    37     private BestSchedulingSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     37    private BestSchedulingSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    3838    private BestSchedulingSolutionAnalyzer(BestSchedulingSolutionAnalyzer original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Analyzers/SchedulingAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Scheduling {
    3232  [Item("SchedulingAnalyzer", "Represents the generalized form of Analyzers for Scheduling Problems.")]
    33   [StorableClass]
     33  [StorableType("59C3972B-1051-4CEE-A41C-B7AE0D05A3AC")]
    3434  public abstract class SchedulingAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3535    public virtual bool EnabledByDefault {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected SchedulingAnalyzer(bool deserializing) : base(deserializing) { }
     40    protected SchedulingAnalyzer(StorableConstructorFlag _) : base(_) { }
    4141    protected SchedulingAnalyzer(SchedulingAnalyzer original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Problems.Scheduling {
    3535  [Item("JobSequenceMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequence Matrix.")]
    36   [StorableClass]
     36  [StorableType("BEB71861-F5DE-4A00-87A8-97716C13895B")]
    3737  public class JSMDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3838
    … …  
    5959
    6060    [StorableConstructor]
    61     protected JSMDecoder(bool deserializing) : base(deserializing) { }
     61    protected JSMDecoder(StorableConstructorFlag _) : base(_) { }
    6262    protected JSMDecoder(JSMDecoder original, Cloner cloner) : base(original, cloner) { }
    6363    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecodingErrorPolicy.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.Scheduling {
    2929  [Item("JSMDecodingErrorPolicy", "Represents a policy for handling decoding errors.")]
    30   [StorableClass]
     30  [StorableType("835B8FE8-8BEA-4E05-BB68-2538341AC2D0")]
    3131  public sealed class JSMDecodingErrorPolicy : ValueTypeValue<JSMDecodingErrorPolicyTypes> {
    3232
    … …  
    3636
    3737    [StorableConstructor]
    38     private JSMDecodingErrorPolicy(bool deserializing) : base(deserializing) { }
     38    private JSMDecodingErrorPolicy(StorableConstructorFlag _) : base(_) { }
    3939    private JSMDecodingErrorPolicy(JSMDecodingErrorPolicy original, Cloner cloner) : base(original, cloner) { }
    4040    public JSMDecodingErrorPolicy() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMForcingStrategy.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.Scheduling {
    2929  [Item("JSMForcingStrategy", "Represents a forcing strategy.")]
    30   [StorableClass]
     30  [StorableType("B5170DC3-AEDD-46D2-9173-E37E0EEFD456")]
    3131  public sealed class JSMForcingStrategy : ValueTypeValue<JSMForcingStrategyTypes> {
    3232
    … …  
    3636
    3737    [StorableConstructor]
    38     private JSMForcingStrategy(bool deserializing) : base(deserializing) { }
     38    private JSMForcingStrategy(StorableConstructorFlag _) : base(_) { }
    3939    private JSMForcingStrategy(JSMForcingStrategy original, Cloner cloner) : base(original, cloner) { }
    4040    public JSMForcingStrategy() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Scheduling {
    3232  [Item("JobSequencingMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
    33   [StorableClass]
     33  [StorableType("4BECE53D-C72B-4F96-AE96-EA01E7DE4B92")]
    3434  public class PRVDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3535
    … …  
    169169
    170170    [StorableConstructor]
    171     protected PRVDecoder(bool deserializing) : base(deserializing) { }
     171    protected PRVDecoder(StorableConstructorFlag _) : base(_) { }
    172172    protected PRVDecoder(PRVDecoder original, Cloner cloner) : base(original, cloner) { }
    173173    public PRVDecoder()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/PWRDecoder.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Scheduling {
    3232  [Item("PWRDecoder", "An item used to convert a PWR-individual into a generalized schedule.")]
    33   [StorableClass]
     33  [StorableType("FE66781A-93CB-4312-8AC0-AA049220FEB8")]
    3434  public class PWRDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3535
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PWRDecoder(bool deserializing) : base(deserializing) { }
     44    protected PWRDecoder(StorableConstructorFlag _) : base(_) { }
    4545    protected PWRDecoder(PWRDecoder original, Cloner cloner) : base(original, cloner) { }
    4646    public PWRDecoder()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Decoders/ScheduleDecoder.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.Scheduling {
    3030  [Item("ScheduleDecoder", "A schedule decoder translates a respresentation into an actual schedule.")]
    31   [StorableClass]
     31  [StorableType("B48CB500-3983-4D83-98A8-3BC8FB167211")]
    3232  public abstract class ScheduleDecoder : SingleSuccessorOperator, IScheduleDecoder {
    3333
    … …  
    4040
    4141    [StorableConstructor]
    42     protected ScheduleDecoder(bool deserializing) : base(deserializing) { }
     42    protected ScheduleDecoder(StorableConstructorFlag _) : base(_) { }
    4343    protected ScheduleDecoder(ScheduleDecoder original, Cloner cloner) : base(original, cloner) { }
    4444    public ScheduleDecoder()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Data;
    2625using HeuristicLab.Encodings.ScheduleEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2827
    2928namespace HeuristicLab.Problems.Scheduling {
    3029  [Item("Makespan Evaluator", "Represents an evaluator using the maximum makespan of a schedule.")]
    31   [StorableClass]
     30  [StorableType("DCD90872-1FF9-482F-8FCF-AD34AC6DF051")]
    3231  public class MakespanEvaluator : ScheduleEvaluator {
    3332
    3433    [StorableConstructor]
    35     protected MakespanEvaluator(bool deserializing) : base(deserializing) { }
     34    protected MakespanEvaluator(StorableConstructorFlag _) : base(_) { }
    3635    protected MakespanEvaluator(MakespanEvaluator original, Cloner cloner) : base(original, cloner) {}
    3736    public MakespanEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Data;
    2726using HeuristicLab.Encodings.ScheduleEncoding;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3029
    3130namespace HeuristicLab.Problems.Scheduling {
    3231  [Item("Mean tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
    33   [StorableClass]
     32  [StorableType("75C00D86-4C81-43EC-A2D4-60736509C97E")]
    3433  public class MeanTardinessEvaluator : ScheduleEvaluator, IJSSPOperator {
    3534
    3635    [StorableConstructor]
    37     protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
     36    protected MeanTardinessEvaluator(StorableConstructorFlag _) : base(_) { }
    3837    protected MeanTardinessEvaluator(MeanTardinessEvaluator original, Cloner cloner) : base(original, cloner) { }
    3938    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Evaluators/ScheduleEvaluator.cs

    r16453 r16462  
    2525using HeuristicLab.Encodings.ScheduleEncoding;
    2626using HeuristicLab.Operators;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3029
    3130namespace HeuristicLab.Problems.Scheduling {
    3231  [Item("Schedule Evaluator", "Represents a base class for schedule evaluators.")]
    33   [StorableClass]
     32  [StorableType("F006A09C-C92E-4523-84B0-CF763A652C56")]
    3433  public abstract class ScheduleEvaluator : InstrumentedOperator, IScheduleEvaluator {
    3534
    … …  
    4241
    4342    [StorableConstructor]
    44     protected ScheduleEvaluator(bool deserializing) : base(deserializing) { }
     43    protected ScheduleEvaluator(StorableConstructorFlag _) : base(_) { }
    4544    protected ScheduleEvaluator(ScheduleEvaluator original, Cloner cloner) : base(original, cloner) { }
    4645    protected ScheduleEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.Scheduling {
    3333  [Item("SchedulingEvaluator", "First applies the decoder operator to obtain a schedule from an encoding and then applies the evaluator to obtain a quality.")]
    34   [StorableClass]
     34  [StorableType("A7AED7B7-C431-4E39-A002-8CBCA6223BCD")]
    3535  public class SchedulingEvaluator : InstrumentedOperator, ISchedulingEvaluator, IStochasticOperator {
    3636
    … …  
    5959
    6060    [StorableConstructor]
    61     protected SchedulingEvaluator(bool deserializing) : base(deserializing) { }
     61    protected SchedulingEvaluator(StorableConstructorFlag _) : base(_) { }
    6262    protected SchedulingEvaluator(SchedulingEvaluator original, Cloner cloner) : base(original, cloner) { }
    6363    public SchedulingEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/HeuristicLab.Problems.Scheduling-3.3.csproj

    r16454 r16462  
    110110      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    111111    </Reference>
    112     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     112    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113113      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    114114    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

    r16453 r16462  
    3232using HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Fossil;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Problems.Instances;
    … …  
    3939  [Item("Job Shop Scheduling Problem (JSSP)", "Represents a standard Job Shop Scheduling Problem")]
    4040  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 120)]
    41   [StorableClass]
     41  [StorableType("BB12CCEC-A109-4A26-A1C7-5A0703AB7687")]
    4242  public sealed class JobShopSchedulingProblem : SchedulingProblem, IProblemInstanceConsumer<JSSPData>, IProblemInstanceExporter<JSSPData>, IStorableContent {
    4343    #region Default Instance
    … …  
    130130
    131131    [StorableConstructor]
    132     private JobShopSchedulingProblem(bool deserializing) : base(deserializing) { }
     132    private JobShopSchedulingProblem(StorableConstructorFlag _) : base(_) { }
    133133    private JobShopSchedulingProblem(JobShopSchedulingProblem original, Cloner cloner)
    134134      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Scheduling/3.3/SchedulingProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.ScheduleEncoding;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.Scheduling {
    2929  [Item("SchedulingProblem", "Abstract class that represents a Scheduling Problem")]
    30   [StorableClass]
     30  [StorableType("D3EFE88B-7725-40DF-861F-37B17314D3F5")]
    3131  public abstract class SchedulingProblem : SingleObjectiveHeuristicOptimizationProblem<ISchedulingEvaluator, IScheduleCreator> {
    3232    [StorableConstructor]
    33     protected SchedulingProblem(bool deserializing) : base(deserializing) { }
     33    protected SchedulingProblem(StorableConstructorFlag _) : base(_) { }
    3434    protected SchedulingProblem(SchedulingProblem original, Cloner cloner) : base(original, cloner) { }
    3535    protected SchedulingProblem(ISchedulingEvaluator evaluator, IScheduleCreator creator) : base(evaluator, creator) { }
Note: See TracChangeset for help on using the changeset viewer.