Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationChannel.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationProcessChannel.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationServiceClient.cs (modified) (4 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationStreamChannel.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationTCPChannel.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationChannel.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 HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("EvaluationChannel", "Abstract base class for channels to be used in an external evaluation problem.")]
-  [StorableClass]
+  [StorableType("2BE4FE9D-D5FE-45C3-9F85-3BF7200F0913")]
   public abstract class EvaluationChannel : NamedItem, IEvaluationChannel {
     public override bool CanChangeName { get { return false; } }
@@ -33 +33 @@
 
     [StorableConstructor]
-    protected EvaluationChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationChannel(StorableConstructorFlag _) : base(_) { }
     protected EvaluationChannel(EvaluationChannel original, Cloner cloner) : base(original, cloner) { }
     protected EvaluationChannel()

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationProcessChannel.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.
@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("EvaluationProcessChannel", "A channel that launches an external application in a new process and communicates with that process via stdin and stdout.")]
-  [StorableClass]
+  [StorableType("ECC07782-60E0-483C-8632-476697A058D2")]
   public class EvaluationProcessChannel : EvaluationChannel {
 
@@ -64 +64 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected EvaluationProcessChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationProcessChannel(StorableConstructorFlag _) : base(_) { }
     protected EvaluationProcessChannel(EvaluationProcessChannel original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationServiceClient.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.
@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("EvaluationServiceClient", "An RPC client that evaluates a solution.")]
-  [StorableClass]
+  [StorableType("97F11C34-F32B-4AD2-92FB-F4A12311C962")]
   public class EvaluationServiceClient : ParameterizedNamedItem, IEvaluationServiceClient {
 
@@ -53 +53 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected EvaluationServiceClient(bool deserializing) : base(deserializing) { }
+    protected EvaluationServiceClient(StorableConstructorFlag _) : base(_) { }
     protected EvaluationServiceClient(EvaluationServiceClient original, Cloner cloner)
       : base(original, cloner) {
@@ -150 +150 @@
       OnNameChanged();
     }
+
+    [StorableType("9f1ab6e1-fe6e-4624-afbd-9bfdfdb75d44")]
     #endregion
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationStreamChannel.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.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("EvaluationStreamChannel", "A channel that communicates via an input and an output stream.")]
-  [StorableClass]
+  [StorableType("15DD5556-3C31-4D18-BE18-D438B45591D8")]
   public class EvaluationStreamChannel : EvaluationChannel {
 
@@ -36 +36 @@
 
     [StorableConstructor]
-    protected EvaluationStreamChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationStreamChannel(StorableConstructorFlag _) : base(_) { }
     protected EvaluationStreamChannel(EvaluationStreamChannel original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Drivers/EvaluationTCPChannel.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.
@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("EvaluationTCPChannel", "A channel that creates a TCP connection over a network.")]
-  [StorableClass]
+  [StorableType("FECC0F5B-B22A-4117-888D-5B8B84332D24")]
   public class EvaluationTCPChannel : EvaluationChannel {
 
@@ -63 +63 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected EvaluationTCPChannel(bool deserializing) : base(deserializing) { }
+    protected EvaluationTCPChannel(StorableConstructorFlag _) : base(_) { }
     protected EvaluationTCPChannel(EvaluationTCPChannel original, Cloner cloner)
       : base(original, cloner) {