Changeset 17097 for stable/HeuristicLab.Algorithms.NSGA2

Timestamp:

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

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.NSGA2 (modified) (1 prop)
• HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.NSGA2/3.3/NSGA2MainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.NSGA2/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.NSGA2/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.NSGA2/3.3/packages.config (copied) (copied from trunk/HeuristicLab.Algorithms.NSGA2/3.3/packages.config) (1 diff)

stable/HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Algorithms.NSGA2</RootNamespace>
     <AssemblyName>HeuristicLab.Algorithms.NSGA2-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -163 +163 @@
       <Private>False</Private>
     </ProjectReference>
+    <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">
@@ -168 +174 @@
     </Reference>
     <Reference Include="System.Data" />
+    <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" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="NSGA2.cs" />

stable/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.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.
@@ -30 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
@@ -40 +40 @@
   [Item("NSGA-II", "The Nondominated Sorting Genetic Algorithm II was introduced in Deb et al. 2002. A Fast and Elitist Multiobjective Genetic Algorithm: NSGA-II. IEEE Transactions on Evolutionary Computation, 6(2), pp. 182-197.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 135)]
-  [StorableClass]
+  [StorableType("9F34A562-68E7-4C4A-B452-F915802BACDA")]
   public class NSGA2 : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -162 +162 @@
 
     [StorableConstructor]
-    protected NSGA2(bool deserializing) : base(deserializing) { }
+    protected NSGA2(StorableConstructorFlag _) : base(_) { }
     protected NSGA2(NSGA2 original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2MainLoop.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.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Selection;
 
@@ -34 +34 @@
   /// </summary>
   [Item("NSGA2MainLoop", "An operator which represents the main loop of the NSGA-II algorithm.")]
-  [StorableClass]
+  [StorableType("F81EA9B1-0A1A-4597-BF2C-C830C32D3394")]
   public class NSGA2MainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -85 +85 @@
 
     [StorableConstructor]
-    protected NSGA2MainLoop(bool deserializing) : base(deserializing) { }
+    protected NSGA2MainLoop(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

stable/HeuristicLab.Algorithms.NSGA2/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.Algorithms.NSGA2/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.Algorithms.NSGA2/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>