Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification

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.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.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.
@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
 
-  [StorableClass]
+  [StorableType("6C41AF6F-5F02-4510-B1B5-222651C4021B")]
   public class Calculator : IDeepCloneable {
 
@@ -54 +54 @@
 
     [StorableConstructor]
-    protected Calculator(bool deserializing) { }
+    protected Calculator(StorableConstructorFlag _) { }
     public Calculator() { }
     protected Calculator(Calculator original, Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.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 System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
@@ -34 +33 @@
     "Creates several levels from the distribution of a certain result accross a run collection and " +
     "assigns a discretized value. Non-existing numbers as well as NaN and infinities are excluded from the caluclation.")]
-  [StorableClass]
+  [StorableType("6EFD185F-FE23-4E23-90F0-63CB9D38E57D")]
   public class RunCollectionDiscretizer : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -69 +68 @@
       #region Construction & Cloning
     [StorableConstructor]
-    protected RunCollectionDiscretizer(bool deserializing) : base(deserializing) { }
+    protected RunCollectionDiscretizer(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionDiscretizer(RunCollectionDiscretizer original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.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.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Formula Modifier", "Modifies a RunCollection by adding results using the given formula.")]
-  [StorableClass]
+  [StorableType("EEE365F2-8BEB-41C6-9DE6-94CA8FAC5108")]
   public class RunCollectionFormulaModifer : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -52 +50 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RunCollectionFormulaModifer(bool deserializing) : base(deserializing) { }
+    protected RunCollectionFormulaModifer(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionFormulaModifer(RunCollectionFormulaModifer original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.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.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Group Creater", "Regroups existing runs according to equal values in GroupBy and prefixes them according to their value in Prefix.")]
-  [StorableClass]
+  [StorableType("5D3A55DE-DC75-4932-B3D2-2C59810143A5")]
   public class RunCollectionGroupCreater : ParameterizedNamedItem, IRunCollectionModifier {
     
@@ -48 +47 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RunCollectionGroupCreater(bool deserializing) : base(deserializing) { }
+    protected RunCollectionGroupCreater(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionGroupCreater(RunCollectionGroupCreater original, Cloner cloner) : base(original, cloner) { }
     public RunCollectionGroupCreater() {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.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.Optimization {
   [Item("RunCollection Run Remover", "Removes all currently visible runs. Use the filtering tab to selectively remove runs.")]
-  [StorableClass]
+  [StorableType("F66D03A7-6BF8-4DB5-9341-B1BFAA8AA023")]
   public class RunCollectionRunRemover : ParameterizedNamedItem, IRunCollectionModifier {
 
     #region Construction & Cloning
     [StorableConstructor]
-    protected RunCollectionRunRemover(bool deserializing) : base(deserializing) { }
+    protected RunCollectionRunRemover(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionRunRemover(RunCollectionRunRemover original, Cloner cloner) : base(original, cloner) {}
     public RunCollectionRunRemover() {}

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.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 System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
   [Item("RunCollection Sorter", "Sorts a run collection according the specified key variable.")]
-  [StorableClass]
+  [StorableType("0F64D1D2-8934-4697-B997-A8072ADB4CF3")]
   public class RunCollectionSorter : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -48 +47 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RunCollectionSorter(bool deserializing) : base(deserializing) { }
+    protected RunCollectionSorter(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionSorter(RunCollectionSorter original, Cloner cloner)
       : base(original, cloner) {
@@ -80 +79 @@
     }
 
+    [StorableType("824092f4-863b-4ba8-ac0a-98f871876a6e")]
     private class ValueComparer : IComparer<IComparable> {
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.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.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Value Remover", "Modifies a RunCollection by removing results or parameters.")]
-  [StorableClass]
+  [StorableType("300726A9-3E81-4F8E-A11F-4A5B3CDCA796")]
   public class RunCollectionValueRemover : ParameterizedNamedItem, IRunCollectionModifier {
     
@@ -46 +44 @@
     #region Construction & Cloning    
     [StorableConstructor]
-    protected RunCollectionValueRemover(bool deserializing) : base(deserializing) { }
+    protected RunCollectionValueRemover(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionValueRemover(RunCollectionValueRemover original, Cloner cloner)
       : base(original, cloner) {