Free cookie consent management tool by TermsFeed Policy Generator

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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
1 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Persistence

  • stable/HeuristicLab.Persistence/3.3/Core/Configuration.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.
    … …  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Persistence.Interfaces;
    2626
    … …  
    3232  /// <c>ConfigurationService</c>.
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("72F8B3EA-0BC3-43A8-9B58-EF798C154CF3")]
    3535  public class Configuration {
    3636
    … …  
    5050
    5151    [StorableConstructor]
    52     protected Configuration(bool isDeserializing) {
     52    protected Configuration(StorableConstructorFlag _) {
    5353      compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
    54       if (isDeserializing)
    55         return;
     54    }
     55
     56    public Configuration() {
     57      compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
    5658      primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>();
    5759      compositeSerializers = new List<ICompositeSerializer>();
    5860    }
     61
    5962
    6063    /// <summary>
    … …  
    6770        IEnumerable<IPrimitiveSerializer> primitiveSerializers,
    6871        IEnumerable<ICompositeSerializer> compositeSerializers)
    69       : this(false) {
     72      : this() {
    7073      this.Format = format;
    7174      this.compositeSerializers.AddRange(compositeSerializers);
    … …  
    131134    /// <returns>A new <see cref="Configuration"/></returns>
    132135    public Configuration Copy() {
    133       var config = new Configuration(false);
     136      var config = new Configuration();
    134137      config.Format = Format;
    135138      foreach (var ps in primitiveSerializers)

  • stable/HeuristicLab.Persistence/3.3/Core/ConfigurationService.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.
    … …  
    2626using System.Reflection;
    2727using System.Text;
     28using HEAL.Attic;
    2829using HeuristicLab.Persistence.Default.Xml;
    2930using HeuristicLab.Persistence.Interfaces;

  • stable/HeuristicLab.Persistence/3.3/Core/DataMemberAccessor.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 System.Reflection;
    2424using System.Reflection.Emit;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Persistence.Core {

  • stable/HeuristicLab.Persistence/3.3/Core/Deserializer.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.
    … …  
    2222using System;
    2323using System.Collections.Generic;
     24using HEAL.Attic;
    2425using HeuristicLab.Persistence.Auxiliary;
    2526using HeuristicLab.Persistence.Core.Tokens;

  • stable/HeuristicLab.Persistence/3.3/Core/FormatBase.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.
    … …  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    2424
    2525namespace HeuristicLab.Persistence.Interfaces {
    … …  
    2929  /// </summary>
    3030  /// <typeparam name="SerialDataFormat">The type of the serial data format.</typeparam>
    31   [StorableClass]
     31  [StorableType("4EC2B779-0778-4B95-BF4F-5F88C1C1FF1F")]
    3232  public abstract class FormatBase<SerialDataFormat> : IFormat<SerialDataFormat> where SerialDataFormat : ISerialData {
    3333
    … …  
    4444
    4545    [StorableConstructor]
    46     protected FormatBase(bool deserializing) { }
     46    protected FormatBase(StorableConstructorFlag _) { }
    4747    protected FormatBase() { }
    4848

  • stable/HeuristicLab.Persistence/3.3/Core/GeneratorBase.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.

  • stable/HeuristicLab.Persistence/3.3/Core/PrimitiveSerializerBase.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.
    … …  
    2222using System;
    2323using System.Text;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Persistence.Interfaces {
    … …  
    3232  /// <typeparam name="Source">The source type.</typeparam>
    3333  /// <typeparam name="SerialData">The serialized type.</typeparam>
    34   [StorableClass]
     34  [StorableType("A43393DF-4A1F-42A0-BA2D-1DFEA04EBD97")]
    3535  public abstract class PrimitiveSerializerBase<Source, SerialData> :
    3636      IPrimitiveSerializer<Source, SerialData>

  • stable/HeuristicLab.Persistence/3.3/Core/Serializer.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 System.Reflection;
    2626using System.Text;
     27using HEAL.Attic;
    2728using HeuristicLab.Persistence.Auxiliary;
    2829using HeuristicLab.Persistence.Core.Tokens;

  • stable/HeuristicLab.Persistence/3.3/Core/Tag.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/BeginToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/CompositeTokenBase.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/EndToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoBeginToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoEndToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/NullReferenceToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/PrimitiveToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/ReferenceToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/SerializationTokenBase.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.

  • stable/HeuristicLab.Persistence/3.3/Core/Tokens/TypeToken.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.

  • stable/HeuristicLab.Persistence/3.3/Core/TypeMapping.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.
Note: See TracChangeset for help on using the changeset viewer.