Changeset 17097 for stable/HeuristicLab.Problems.GraphColoring

Timestamp:

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

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

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

stable/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.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.Problems.Instances;
 
@@ -37 +37 @@
   [Item("Graph Coloring Problem (GCP)", "Attempts to find a coloring using a minimal number of colors that doesn't produce a conflict.")]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 135)]
-  [StorableClass]
+  [StorableType("007BD5F0-196C-4045-AC5D-BF287927C3DC")]
   public sealed class GraphColoringProblem : SingleObjectiveBasicProblem<LinearLinkageEncoding>, IProblemInstanceConsumer<GCPData>, IProblemInstanceExporter<GCPData> {
 
@@ -65 +65 @@
 
     [StorableConstructor]
-    private GraphColoringProblem(bool deserializing) : base(deserializing) { }
+    private GraphColoringProblem(StorableConstructorFlag _) : base(_) { }
     private GraphColoringProblem(GraphColoringProblem original, Cloner cloner)
       : base(original, cloner) {

stable/HeuristicLab.Problems.GraphColoring/3.3/HeuristicLab.Problems.GraphColoring-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Problems.GraphColoring</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.GraphColoring-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -74 +74 @@
   </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" />
+    <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" />
@@ -86 +96 @@
     <Compile Include="GraphColoringProblem.cs" />
     <Compile Include="Plugin.cs" />
+    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

stable/HeuristicLab.Problems.GraphColoring/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.Problems.GraphColoring/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.Problems.GraphColoring/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>