Changeset 16565 for trunk/HeuristicLab.Persistence/3.3/Core
- Timestamp:
- 01/28/19 13:41:42 (5 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Persistence
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Persistence (added) merged: 16452-16453,16462,16481-16482,16485-16486,16529,16539,16558-16559,16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Persistence/3.3/Core/Configuration.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Collections.Generic; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 using HeuristicLab.Persistence.Interfaces; 26 26 … … 50 50 51 51 [StorableConstructor] 52 protected Configuration( bool isDeserializing) {52 protected Configuration(StorableConstructorFlag _) { 53 53 compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>(); 54 if (isDeserializing) 55 return; 54 } 55 56 public Configuration() { 57 compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>(); 56 58 primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>(); 57 59 compositeSerializers = new List<ICompositeSerializer>(); 58 60 } 61 59 62 60 63 /// <summary> … … 67 70 IEnumerable<IPrimitiveSerializer> primitiveSerializers, 68 71 IEnumerable<ICompositeSerializer> compositeSerializers) 69 : this( false) {72 : this() { 70 73 this.Format = format; 71 74 this.compositeSerializers.AddRange(compositeSerializers); … … 131 134 /// <returns>A new <see cref="Configuration"/></returns> 132 135 public Configuration Copy() { 133 var config = new Configuration( false);136 var config = new Configuration(); 134 137 config.Format = Format; 135 138 foreach (var ps in primitiveSerializers) -
trunk/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using System.Reflection; 27 27 using System.Text; 28 using HEAL.Attic; 28 29 using HeuristicLab.Persistence.Default.Xml; 29 30 using HeuristicLab.Persistence.Interfaces; -
trunk/HeuristicLab.Persistence/3.3/Core/DataMemberAccessor.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Reflection; 24 24 using System.Reflection.Emit; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Persistence.Core { -
trunk/HeuristicLab.Persistence/3.3/Core/Deserializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Collections.Generic; 24 using HEAL.Attic; 24 25 using HeuristicLab.Persistence.Auxiliary; 25 26 using HeuristicLab.Persistence.Core.Tokens; -
trunk/HeuristicLab.Persistence/3.3/Core/FormatBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;23 using HEAL.Attic; 24 24 25 25 namespace HeuristicLab.Persistence.Interfaces { … … 44 44 45 45 [StorableConstructor] 46 protected FormatBase( bool deserializing) { }46 protected FormatBase(StorableConstructorFlag _) { } 47 47 protected FormatBase() { } 48 48 -
trunk/HeuristicLab.Persistence/3.3/Core/GeneratorBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/PrimitiveSerializerBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Text; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Persistence.Interfaces { -
trunk/HeuristicLab.Persistence/3.3/Core/Serializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using System.Reflection; 26 26 using System.Text; 27 using HEAL.Attic; 27 28 using HeuristicLab.Persistence.Auxiliary; 28 29 using HeuristicLab.Persistence.Core.Tokens; -
trunk/HeuristicLab.Persistence/3.3/Core/Tag.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/BeginToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/CompositeTokenBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/EndToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoBeginToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/MetaInfoEndToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/NullReferenceToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/PrimitiveToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/ReferenceToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/SerializationTokenBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/Tokens/TypeToken.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Persistence/3.3/Core/TypeMapping.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.