Changeset 16565 for trunk/HeuristicLab.Collections/3.3/BidirectionalLookup.cs

Timestamp:

01/28/19 13:41:42 (5 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Collections/3.3/BidirectionalLookup.cs (modified) (5 diffs)

trunk/HeuristicLab.Collections/3.3/BidirectionalLookup.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Collections {
-  [StorableClass]
+  [StorableType("30981E2A-09AD-49F4-964B-4C20B210116C")]
   [Serializable]
   public class BidirectionalLookup<TFirst, TSecond> {
@@ -35 +35 @@
 
     [StorableConstructor]
-    protected BidirectionalLookup(bool deserializing) : base() { }
+    protected BidirectionalLookup(StorableConstructorFlag _) : base() { }
     public BidirectionalLookup() {
       firstToSecond = new Dictionary<TFirst, HashSet<TSecond>>();
@@ -189 +189 @@
     #endregion
 
-    [StorableClass]
+    [StorableType("AF0C6143-9031-43CF-8952-49FE8089ACD2")]
     private class StorableGrouping<TKey, TValue> : IGrouping<TKey, TValue> {
 
@@ -197 +197 @@
       private readonly HashSet<TValue> values;
 
+      [StorableConstructor]
+      protected StorableGrouping(StorableConstructorFlag _) : base() { }
+
       public StorableGrouping(TKey key, IEnumerable<TValue> values, IEqualityComparer<TValue> comparer) {
         this.key = key;