Changeset 15482 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs

Timestamp:

11/21/17 16:00:15 (6 years ago)

Author:

bburlacu

Message:

#1772: Add the option to specify a separate mutation operation for schema diversification (independent of the one used in the algorithm main loop). Refactor duplicated code for schema generation in SchemaCreator.cs.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs

@@ -92 +92 @@
       get { return (ILookupParameter<BoolValue>)Parameters[RandomReplacementParameterName]; }
     }
-    public ILookupParameter<ISymbolicExpressionTreeManipulator> MutatorParameter {
-      get { return (ILookupParameter<ISymbolicExpressionTreeManipulator>)Parameters[MutatorParameterName]; }
-    }
     public ILookupParameter<ISymbolicExpressionTreeCrossover> CrossoverParameter {
       get { return (ILookupParameter<ISymbolicExpressionTreeCrossover>)Parameters[CrossoverParameterName]; }
@@ -148 +145 @@
     [Storable]
     private readonly UpdateQualityOperator updateQualityOperator;
+
+    [Storable]
+    public ISymbolicExpressionTreeManipulator SchemaManipulator { get; set; }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -221 +221 @@
 
       var random = RandomParameter.ActualValue;
-      var mutator = MutatorParameter.ActualValue;
 
       var s = Schema;
@@ -303 +302 @@
       var updateEstimatedValues = new OperationCollection { Parallel = true }; // evaluation should be done in parallel when possible
       foreach (var ind in individualsToReplace) {
-        var mutatorOp = ExecutionContext.CreateChildOperation(mutator, ind);
+        var mutatorOp = ExecutionContext.CreateChildOperation(SchemaManipulator, ind);
         var updateOp = ExecutionContext.CreateChildOperation(updateQualityOperator, ind);
         mutationOc.Add(mutatorOp);