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

Timestamp:

01/11/16 21:29:25 (8 years ago)

Author:

bburlacu

Message:

#1772: Update diversification operators (add extra evaluations to the evaluation counter, add the option for strict schema matching, add additional replacement ratio update rules.

File:

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

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

@@ -58 +58 @@
     private const string ExclusiveMatchingParameterName = "ExclusiveMatching";
     private const string UseAdaptiveReplacementRatioParameterName = "UseAdaptiveReplacementRatio";
+    private const string StrictSchemaMatchingParameterName = "StrictSchemaMatching";
     #endregion
 
@@ -117 +118 @@
     public LookupParameter<IntValue> NumberOfChangedTreesParameter {
       get { return (LookupParameter<IntValue>)Parameters[NumberOfChangedTreesParameterName]; }
+    }
+    public LookupParameter<BoolValue> StrictSchemaMatchingParameter {
+      get { return (LookupParameter<BoolValue>)Parameters[StrictSchemaMatchingParameterName]; }
     }
     #endregion
@@ -143 +147 @@
     [Storable]
     private readonly UpdateEstimatedValuesOperator updateEstimatedValuesOperator;
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey(StrictSchemaMatchingParameterName))
+        Parameters.Add(new LookupParameter<BoolValue>(StrictSchemaMatchingParameterName));
+    }
 
     public SchemaEvaluator() {
@@ -159 +169 @@
       Parameters.Add(new LookupParameter<DoubleLimit>(EstimationLimitsParameterName));
       Parameters.Add(new LookupParameter<BoolValue>(ApplyLinearScalingParameterName));
+      Parameters.Add(new LookupParameter<BoolValue>(StrictSchemaMatchingParameterName));
       Parameters.Add(new LookupParameter<ISymbolicExpressionTreeManipulator>(MutatorParameterName));
       Parameters.Add(new LookupParameter<ISymbolicExpressionTreeCrossover>(CrossoverParameterName));
@@ -188 +199 @@
 
     public override IOperation Apply() {
+      var strictSchemaMatching = StrictSchemaMatchingParameter.ActualValue.Value;
+      if (strictSchemaMatching) {
+        comp.MatchVariableWeights = true;
+        comp.MatchConstantValues = true;
+      } else {
+        comp.MatchVariableWeights = false;
+        comp.MatchConstantValues = false;
+      }
+
       var individuals = ExecutionContext.Scope.SubScopes; // the scopes represent the individuals
       var trees = individuals.Select(x => (ISymbolicExpressionTree)x.Variables["SymbolicExpressionTree"].Value).ToList();
-      var qualities = individuals.Select(x => (DoubleValue)x.Variables["Quality"].Value).ToList();
 
       var random = RandomParameter.ActualValue;