Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (6 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Data;
    2625using HeuristicLab.Encodings.ScheduleEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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()

  • stable/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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.Attic;
    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) {

  • stable/HeuristicLab.Problems.Scheduling/3.3/Evaluators/ScheduleEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Encodings.ScheduleEncoding;
    2626using HeuristicLab.Operators;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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()

  • stable/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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()
Note: See TracChangeset for help on using the changeset viewer.