Changeset 18230 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Mutators/NestedOptimizerSubVectorImprovementManipulator.cs

Timestamp:

03/07/22 15:45:30 (2 years ago)

Author:

pfleck

Message:

#3040 Changed SubVector symbol to include end-index in result.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Mutators/NestedOptimizerSubVectorImprovementManipulator.cs (modified) (9 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Mutators/NestedOptimizerSubVectorImprovementManipulator.cs

@@ -94 +94 @@
 
     #region Parameter Properties
-    public IConstrainedValueParameter<IAlgorithm> NestedOptimizerParameter {
-      get { return (IConstrainedValueParameter<IAlgorithm>)Parameters["NestedOptimizer"]; }
+    public OptionalConstrainedValueParameter<IAlgorithm> NestedOptimizerParameter {
+      get { return (OptionalConstrainedValueParameter<IAlgorithm>)Parameters["NestedOptimizer"]; }
     }
 
@@ -119 +119 @@
       var rs = new RandomSearchAlgorithm() {
         Problem = problem,
-        BatchSize = 10,
-        MaximumEvaluatedSolutions = 100
+        BatchSize = 100,
+        MaximumEvaluatedSolutions = 1000
       };
 
@@ -126 +126 @@
         Problem = problem,
         PlusSelection = new BoolValue(true),
-        PopulationSize = new IntValue(1),
+        PopulationSize = new IntValue(10),
         Children = new IntValue(10),
         MaximumGenerations = new IntValue(100)
@@ -158 +158 @@
       var optimizers = new ItemSet<IAlgorithm>() { rs, es, ga, osga };
 
-      Parameters.Add(new ConstrainedValueParameter<IAlgorithm>("NestedOptimizer", optimizers, rs));
+      Parameters.Add(new OptionalConstrainedValueParameter<IAlgorithm>("NestedOptimizer", optimizers, rs));
       Parameters.Add(new FixedValueParameter<PercentValue>("PercentOptimizedSubVectorNodes", new PercentValue(1.0)));
     }
@@ -170 +170 @@
     [StorableConstructor]
     private NestedOptimizerSubVectorImprovementManipulator(StorableConstructorFlag _) : base(_) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (Parameters.TryGetValue("NestedOptimizer", out var param)) {
+        if (param is ConstrainedValueParameter<IAlgorithm> constrainedParam) {
+          Parameters.Remove("NestedOptimizer");
+          Parameters.Add(new OptionalConstrainedValueParameter<IAlgorithm>("NestedOptimizer", 
+            new ItemSet<IAlgorithm>(constrainedParam.ValidValues), constrainedParam.Value)
+          );
+        }
+      }
+    }
 
     public override void Manipulate(IRandom random, ISymbolicExpressionTree symbolicExpressionTree) {
+      if (NestedOptimizer == null)
+        return;
+      
       int vectorLengths = GetVectorLengths(ProblemDataParameter.ActualValue);
       
@@ -183 +197 @@
       algorithm.Start(CancellationToken);
 
-      if (algorithm.ExecutionState != ExecutionState.Stopped)
-        throw new InvalidOperationException("Nested Algorithm did not finish.");
-
+      //if (algorithm.ExecutionState != ExecutionState.Stopped)
+      //  return;
+
+      if (!algorithm.Results.ContainsKey(BestSolutionParameterName))
+        return; 
+      
+      // use the latest best result
       var solution = (IntegerVector)algorithm.Results[BestSolutionParameterName].Value;
       UpdateFromVector(symbolicExpressionTree, selectedSubVectorNodes, solution, vectorLengths);
@@ -204 +222 @@
     }
 
-    private static int GetVectorLengths(T problemData) {  // ToDo evaluate a tree to get vector length per node
+    private static int GetVectorLengths(T problemData) { // ToDo evaluate a tree to get vector length per node
       var vectorLengths = problemData.Dataset.DoubleVectorVariables
         .Select(v => problemData.Dataset.GetDoubleVectorValue(v, row: 0).Count)
@@ -217 +235 @@
       foreach (var nodeIdx in selectedNodes) {
         var node = nodes[nodeIdx];
-        node.Offset = (double)solution[i++] / (vectorLength - 1);
-        node.Length = (double)solution[i++] / (vectorLength - 1);
+        node.Offset = (double)solution[i++] / (vectorLength - 1); // round in case of float
+        node.Length = (double)solution[i++] / (vectorLength - 1); // round in case of float
       }
     }
@@ -231 +249 @@
       return tree.Root.GetSubtree(0).GetSubtree(0);
     }
-
   }
 }