Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/Individuals

Timestamp:

03/31/19 14:40:15 (6 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/BasicProblems/Individuals/Individual.cs (modified) (2 diffs)
• 3.3/BasicProblems/Individuals/MultiEncodingIndividual.cs (modified) (2 diffs)
• 3.3/BasicProblems/Individuals/SingleEncodingIndividual.cs (modified) (2 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/Individual.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.
@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("b1388a9d-c85c-49f6-9916-ef4c93dffee0")]
   public abstract class Individual {
+    [Storable]
     protected IEncoding Encoding { get; private set; }
+    [Storable]
     protected IScope Scope { get; private set; }
     public string Name { get { return Encoding.Name; } }
+
+
+    [StorableConstructor]
+    protected Individual(StorableConstructorFlag _) {
+    }
 
     protected Individual(IEncoding encoding, IScope scope) {

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiEncodingIndividual.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.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("ec7201c7-3c9f-4a93-966b-d848d9538202")]
   public sealed class MultiEncodingIndividual : Individual {
     private new MultiEncoding Encoding {
       get { return (MultiEncoding)base.Encoding; }
+    }
+
+    [StorableConstructor]
+    private MultiEncodingIndividual(StorableConstructorFlag _) : base(_) {
     }
 

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/SingleEncodingIndividual.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 HeuristicLab.Common;
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("13a86161-9e5c-442b-ab1c-18018b1d9708")]
   public sealed class SingleEncodingIndividual : Individual {
+    [StorableConstructor]
+    private SingleEncodingIndividual(StorableConstructorFlag _) : base(_) {
+    }
+
     public SingleEncodingIndividual(IEncoding encoding, IScope scope)
       : base(encoding, scope) {