Changeset 16565 for trunk/HeuristicLab.ParallelEngine

Timestamp:

01/28/19 13:41:42 (6 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.ParallelEngine/3.3/HeuristicLab.ParallelEngine-3.3.csproj (modified) (3 diffs)
• HeuristicLab.ParallelEngine/3.3/ParallelEngine.cs (modified) (4 diffs)
• HeuristicLab.ParallelEngine/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.ParallelEngine/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.ParallelEngine/3.3/packages.config (copied) (copied from branches/2520_PersistenceReintegration/HeuristicLab.ParallelEngine/3.3/packages.config)

trunk/HeuristicLab.ParallelEngine/3.3/HeuristicLab.ParallelEngine-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.ParallelEngine</RootNamespace>
     <AssemblyName>HeuristicLab.ParallelEngine-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
@@ -110 +110 @@
   </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-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <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" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -124 +134 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

trunk/HeuristicLab.ParallelEngine/3.3/ParallelEngine.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.ParallelEngine {
@@ -33 +33 @@
   /// This engine is suitable for parallel processing on shared memory systems which provide multiple cores.
   /// </summary>
-  [StorableClass]
+  [StorableType("3B3366ED-22C5-4E4F-B307-E08FACCF0E20")]
   [Item("Parallel Engine", "Engine for parallel execution of algorithms using multiple threads (suitable for shared memory systems with multiple cores).")]
   public class ParallelEngine : Engine {
@@ -52 +52 @@
 
     [StorableConstructor]
-    protected ParallelEngine(bool deserializing) : base(deserializing) { }
+    protected ParallelEngine(StorableConstructorFlag _) : base(_) { }
     protected ParallelEngine(ParallelEngine original, Cloner cloner)
       : base(original, cloner) {

trunk/HeuristicLab.ParallelEngine/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.

trunk/HeuristicLab.ParallelEngine/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.