Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable

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.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Operators.Programmable/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (5 diffs)
• HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.cs (modified) (3 diffs)
• HeuristicLab.Operators.Programmable/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj

@@ -18 +18 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -188 +188 @@
       <Install>true</Install>
     </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable/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.
@@ -28 +28 @@
   [Plugin("HeuristicLab.Operators.Programmable", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.Operators.Programmable-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.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.
@@ -34 +34 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Auxiliary;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 using Microsoft.CSharp;
@@ -41 +41 @@
 
   [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
-  [StorableClass]
+  [StorableType("741279E4-4C38-4D66-B9F1-03E0F8B47A78")]
   public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent, IProgrammableItem {
 
@@ -129 +129 @@
     public void SelectNamespace(string ns) {
       namespaces.Add(ns);
-      OnSignatureChanged();
     }
 
     public void UnselectNamespace(string ns) {
       namespaces.Remove(ns);
-      OnSignatureChanged();
     }
 
@@ -166 +164 @@
 
     [StorableConstructor]
-    protected ProgrammableOperator(bool deserializing)
-      : base(deserializing) {
+    protected ProgrammableOperator(StorableConstructorFlag _) : base(_) {
       ProgrammableOperator.StaticInitialize();
       Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.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.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators.Programmable {
 
   [Item("ProgrammableSingleSuccessorOperator", "An operator that can be programmed for arbitrary needs and handle a single successor.")]
-  [StorableClass]
+  [StorableType("61B9FA72-9C6D-46AC-B514-5240D71170D8")]
   public class ProgrammableSingleSuccessorOperator : ProgrammableOperator {
 
@@ -46 +46 @@
 
     [StorableConstructor]
-    protected ProgrammableSingleSuccessorOperator(bool deserializing) : base(deserializing) { }
+    protected ProgrammableSingleSuccessorOperator(StorableConstructorFlag _) : base(_) { }
     protected ProgrammableSingleSuccessorOperator(ProgrammableSingleSuccessorOperator original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Programmable/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.