Changeset 16630 for branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4/MOEADAlgorithm.cs

Timestamp:

02/28/19 14:23:36 (2 years ago)

Author:

bburlacu

Message:

#2987: Migrate to new persistence. Add support for objective scaling.

File:

• branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4/MOEADAlgorithm.cs (modified) (4 diffs)

branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4/MOEADAlgorithm.cs

@@ -1 @@
-using HeuristicLab.Common;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HEAL.Attic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
 using System.Linq;
@@ -9 +30 @@
 namespace HeuristicLab.Algorithms.MOEAD {
   [Item("Multi-objective Evolutionary Algorithm based on Decomposition (MOEA/D)", "MOEA/D implementation adapted from jMetal.")]
-  [StorableClass]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 125)]
+  [StorableType("FE39AD23-B3BF-4368-BB79-FE5BF4C36272")]
   public class MOEADAlgorithm : MOEADAlgorithmBase {
     public MOEADAlgorithm() { }
@@ -21 +42 @@
 
     [StorableConstructor]
-    protected MOEADAlgorithm(bool deserializing) : base(deserializing) { }
+    protected MOEADAlgorithm(StorableConstructorFlag deserializing) : base(deserializing) { }
 
     protected override void Run(CancellationToken cancellationToken) {
@@ -98 +119 @@
 
         UpdateParetoFronts();
+
+        Results.AddOrUpdateResult("IdealPoint", new DoubleArray(IdealPoint));
+        Results.AddOrUpdateResult("NadirPoint", new DoubleArray(NadirPoint));
         Results.AddOrUpdateResult("Evaluated Solutions", new IntValue(evaluatedSolutions));