Changeset 17097 for stable/HeuristicLab.Parameters

Timestamp:

07/07/19 23:40:10 (6 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/FixedValueParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/LookupParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/OperatorParameter.cs (modified) (3 diffs)
• HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/OptionalValueParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/Parameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Parameters/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Parameters/3.3/ScopeParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/ValueLookupParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/ValueParameter.cs (modified) (4 diffs)
• HeuristicLab.Parameters/3.3/packages.config (copied) (copied from trunk/HeuristicLab.Parameters/3.3/packages.config) (1 diff)

stable/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.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.Parameters {
@@ -32 +32 @@
   /// </summary>
   [Item("ConstrainedValueParameter", "A parameter whose value has to be chosen from a set of valid values.")]
-  [StorableClass]
+  [StorableType("A9B43259-2687-4AE8-9803-B58CE01B81EE")]
   public class ConstrainedValueParameter<T> : OptionalConstrainedValueParameter<T> where T : class, IItem {
     public override T Value {
@@ -43 +43 @@
 
     [StorableConstructor]
-    protected ConstrainedValueParameter(bool deserializing) : base(deserializing) { }
+    protected ConstrainedValueParameter(StorableConstructorFlag _) : base(_) { }
     protected ConstrainedValueParameter(ConstrainedValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
     public ConstrainedValueParameter() : base() { }

stable/HeuristicLab.Parameters/3.3/FixedValueParameter.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.Parameters {
@@ -30 +30 @@
   /// </summary>
   [Item("FixedValueParameter", "A parameter whose value is defined in the parameter itself and cannot be set.")]
-  [StorableClass]
+  [StorableType("7787B99D-5F32-4639-B47A-76CB4D204392")]
   public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class,IItem, new() {
 
@@ -41 +41 @@
 
     [StorableConstructor]
-    protected FixedValueParameter(bool deserializing) : base(deserializing) { }
+    protected FixedValueParameter(StorableConstructorFlag _) : base(_) { }
     protected FixedValueParameter(FixedValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
 

stable/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Parameters</RootNamespace>
     <AssemblyName>HeuristicLab.Parameters-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -105 +105 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -110 +116 @@
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -120 +129 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />

stable/HeuristicLab.Parameters/3.3/LookupParameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +31 @@
   /// </summary>
   [Item("LookupParameter", "A parameter whose value is retrieved from or written to a scope.")]
-  [StorableClass]
+  [StorableType("84FE5F33-94B8-4E30-B1CB-CD15314FB83B")]
   public class LookupParameter<T> : Parameter, IStatefulItem, ILookupParameter<T> where T : class, IItem {
     [Storable]
@@ -78 +78 @@
 
     [StorableConstructor]
-    protected LookupParameter(bool deserializing)
-      : base(deserializing) {
+    protected LookupParameter(StorableConstructorFlag _) : base(_) {
       cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
       executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);

stable/HeuristicLab.Parameters/3.3/OperatorParameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -29 +29 @@
   /// </summary>
   [Item("OperatorParameter", "A parameter which represents an operator.")]
-  [StorableClass]
+  [StorableType("59C86C8F-CAE1-45FE-A17C-837925284D93")]
   public class OperatorParameter : OptionalValueParameter<IOperator> {
     [StorableConstructor]
-    protected OperatorParameter(bool deserializing) : base(deserializing) { }
+    protected OperatorParameter(StorableConstructorFlag _) : base(_) { }
     protected OperatorParameter(OperatorParameter original, Cloner cloner) : base(original, cloner) { }
     public OperatorParameter() : base("Anonymous") { }

stable/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.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.Parameters {
@@ -32 +32 @@
   /// </summary>
   [Item("OptionalConstrainedValueParameter", "A parameter whose value has to be chosen from a set of valid values or is null.")]
-  [StorableClass]
+  [StorableType("9B2BFAE8-CD6E-499C-83A0-401B6CEE3A08")]
   public class OptionalConstrainedValueParameter<T> : Parameter, IConstrainedValueParameter<T> where T : class, IItem {
     public override Image ItemImage {
@@ -88 +88 @@
     #region Constructors
     [StorableConstructor]
-    protected OptionalConstrainedValueParameter(bool deserializing) : base(deserializing) { }
+    protected OptionalConstrainedValueParameter(StorableConstructorFlag _) : base(_) { }
     protected OptionalConstrainedValueParameter(OptionalConstrainedValueParameter<T> original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Parameters/3.3/OptionalValueParameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +31 @@
   /// </summary>
   [Item("OptionalValueParameter", "A parameter whose value is defined in the parameter itself or is null.")]
-  [StorableClass]
+  [StorableType("1A825EE0-3A72-458C-B621-7CE989EE2F0D")]
   public class OptionalValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
     public override Image ItemImage {
@@ -104 +104 @@
     #region Constructors
     [StorableConstructor]
-    protected OptionalValueParameter(bool deserializing) : base(deserializing) { }
+    protected OptionalValueParameter(StorableConstructorFlag _) : base(_) { }
     protected OptionalValueParameter(OptionalValueParameter<T> original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Parameters/3.3/Parameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +31 @@
   /// </summary>
   [Item("Parameter", "A base class for parameters.")]
-  [StorableClass]
+  [StorableType("EB8A33BD-466A-4035-8544-8F86E5FDA458")]
   public abstract class Parameter : NamedItem, IParameter {
     public override Image ItemImage {
@@ -72 +72 @@
 
     [StorableConstructor]
-    protected Parameter(bool deserializing)
-      : base(deserializing) {
+    protected Parameter(StorableConstructorFlag _) : base(_) {
     }
     protected Parameter(Parameter original, Cloner cloner)

stable/HeuristicLab.Parameters/3.3/Plugin.cs.frame

@@ -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.

stable/HeuristicLab.Parameters/3.3/Properties/AssemblyInfo.cs.frame

@@ -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.

stable/HeuristicLab.Parameters/3.3/ScopeParameter.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.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +30 @@
   /// </summary>
   [Item("ScopeParameter", "A parameter which represents the current scope.")]
-  [StorableClass]
+  [StorableType("6A25C2F9-B184-4870-88B4-C16BF8534BD4")]
   public class ScopeParameter : LookupParameter<IScope> {
     public new IScope ActualValue {
@@ -39 +38 @@
 
     [StorableConstructor]
-    protected ScopeParameter(bool deserializing) : base(deserializing) { }
+    protected ScopeParameter(StorableConstructorFlag _) : base(_) { }
     protected ScopeParameter(ScopeParameter original, Cloner cloner) : base(original, cloner) { }
     public ScopeParameter()

stable/HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.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.Parameters {
@@ -32 +32 @@
   /// </summary>
   [Item("ScopeTreeLookupParameter", "A generic parameter representing instances of type T which are collected from or written to scope tree.")]
-  [StorableClass]
+  [StorableType("51F36637-C22C-4CDC-B34B-F49CA7896E35")]
   public class ScopeTreeLookupParameter<T> : LookupParameter<ItemArray<T>>, IScopeTreeLookupParameter<T> where T : class, IItem {
     [Storable]
@@ -48 +48 @@
 
     [StorableConstructor]
-    protected ScopeTreeLookupParameter(bool deserializing) : base(deserializing) { }
+    protected ScopeTreeLookupParameter(StorableConstructorFlag _) : base(_) { }
     protected ScopeTreeLookupParameter(ScopeTreeLookupParameter<T> original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Parameters/3.3/ValueLookupParameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +31 @@
   /// </summary>
   [Item("ValueLookupParameter", "A parameter whose value is either defined in the parameter itself or is retrieved from or written to a scope.")]
-  [StorableClass]
+  [StorableType("B34BB41A-CF50-4275-9BCD-1861EBA7C58F")]
   public class ValueLookupParameter<T> : LookupParameter<T>, IValueLookupParameter<T> where T : class, IItem {
     public override Image ItemImage {
@@ -80 +80 @@
     #region Constructors
     [StorableConstructor]
-    protected ValueLookupParameter(bool deserializing) : base(deserializing) { }
+    protected ValueLookupParameter(StorableConstructorFlag _) : base(_) { }
     protected ValueLookupParameter(ValueLookupParameter<T> original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Parameters/3.3/ValueParameter.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Parameters {
@@ -31 +31 @@
   /// </summary>
   [Item("ValueParameter", "A parameter whose value is defined in the parameter itself.")]
-  [StorableClass]
+  [StorableType("CB9B83B6-DE2B-45CC-AB0B-C551E1A6E0BD")]
   public class ValueParameter<T> : OptionalValueParameter<T> where T : class, IItem {
     public override T Value {
@@ -42 +42 @@
 
     [StorableConstructor]
-    protected ValueParameter(bool deserializing) : base(deserializing) { }
+    protected ValueParameter(StorableConstructorFlag _) : base(_) { }
     protected ValueParameter(ValueParameter<T> original, Cloner cloner) : base(original, cloner) { }
 

stable/HeuristicLab.Parameters/3.3/packages.config

@@ -2 +2 @@
 <packages>
   <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
-  <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
+  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
   <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
 </packages>