Changeset 13565 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaCreator.cs

Timestamp:

01/24/16 21:53:06 (8 years ago)

Author:

bburlacu

Message:

#1772: Slight refactor of schema diversification operators to try to fix potential problems with serialization/cloning

File:

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

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

@@ -189 +189 @@
       }
 
-      Func<double, double> rule;
       var replacementRule = ReplacementRatioUpdateRuleParameter.Value.Value;
-
-      switch (replacementRule) {
-        case "f(x) = x": {
-            rule = x => x;
-            break;
-          }
-        case "f(x) = tanh(x)": {
-            rule = x => Math.Tanh(x);
-            break;
-          }
-        case "f(x) = tanh(2x)": {
-            rule = x => Math.Tanh(2 * x);
-            break;
-          }
-        case "f(x) = tanh(3x)": {
-            rule = x => Math.Tanh(3 * x);
-            break;
-          }
-        case "f(x) = tanh(4x)": {
-            rule = x => Math.Tanh(4 * x);
-            break;
-          }
-        case "f(x) = 1-sqrt(1-x)": {
-            rule = x => 1 - Math.Sqrt(1 - x);
-            break;
-          }
-        default:
-          throw new ArgumentException("Unknown replacement rule");
-      }
 
       var evaluateSchemas = new OperationCollection();
@@ -235 +205 @@
       #region create schemas and add subscopes representing the individuals
       foreach (var schema in schemas) {
-        evaluateSchemas.Add(ExecutionContext.CreateChildOperation(new SchemaEvaluator { Schema = schema, ReplacementRule = rule }, ExecutionContext.Scope));
+        evaluateSchemas.Add(ExecutionContext.CreateChildOperation(new SchemaEvaluator { Schema = schema, ReplacementRule = replacementRule }, ExecutionContext.Scope));
       }
       #endregion