Changeset 16901 for branches/2679_HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs

Timestamp:

05/06/19 15:36:43 (5 years ago)

Author:

bburlacu

Message:

#2679: Update branch: framework version 4.6.1, use heal.attic for persistence, some minor refactoring.

File:

• branches/2679_HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs (modified) (5 diffs)

branches/2679_HeuristicLab.GoalSeekingProblem/HeuristicLab.GoalSeekingProblem/3.4/MultiObjectiveGoalSeekingProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -30 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.GoalSeeking {
   [Item("Goal seeking problem (multi-objective)", "Represents a single objective optimization problem which uses configurable regression models to evaluate targets from a given dataset.")]
   [Creatable("Problems")]
-  [StorableClass]
+  [StorableType("76EA4627-FD52-41D0-A594-20C99F700F46")]
   public sealed class MultiObjectiveGoalSeekingProblem : MultiObjectiveBasicProblem<RealVectorEncoding>, IGoalSeekingProblem {
     #region parameter names
@@ -91 +91 @@
     public IEnumerable<double> GetEstimatedGoalValues(IEnumerable<double> parameterValues, bool round = false) {
       var ds = (ModifiableDataset)dataset.Clone();
-      foreach (var parameter in ActiveInputs.Zip(parameterValues, (p, v) => new { Name = p.Name, Value = v })) {
+      foreach (var parameter in ActiveInputs.Zip(parameterValues, (p, v) => new { p.Name, Value = v })) {
         ds.SetVariableValue(parameter.Value, parameter.Name, 0);
       }
       var rows = new[] { 0 }; // actually just one row
-      var estimatedValues =
-        round ? ActiveGoals.Select(t => RoundToNearestStepMultiple(GetModels(t.Name).Average(m => m.GetEstimatedValues(ds, rows).Single()), t.Step))
-              : ActiveGoals.Select(t => GetModels(t.Name).Average(m => m.GetEstimatedValues(ds, rows).Single()));
-      return estimatedValues;
+      return round ? ActiveGoals.Select(t => RoundToNearestStepMultiple(GetModels(t.Name).Average(m => m.GetEstimatedValues(ds, rows).Single()), t.Step))
+                   : ActiveGoals.Select(t => GetModels(t.Name).Average(m => m.GetEstimatedValues(ds, rows).Single()));
     }
 
@@ -131 +129 @@
     #region constructors
     [StorableConstructor]
-    private MultiObjectiveGoalSeekingProblem(bool deserializing) : base(deserializing) { }
+    private MultiObjectiveGoalSeekingProblem(StorableConstructorFlag _) : base(_) { }
 
     private MultiObjectiveGoalSeekingProblem(MultiObjectiveGoalSeekingProblem original, Cloner cloner) : base(original, cloner) {
@@ -219 +217 @@
         for (int j = 0; j < activeGoals.Count * 2; j += 2) {
           int k = j + offset;
-          var goal = activeGoals[j / 2].Goal;
-          rowValues[k] = goal; // original value 
+          rowValues[k] = activeGoals[j / 2].Goal; // original value 
           rowValues[k + 1] = estimatedValues[j / 2]; // estimated value
         }