Changeset 11458 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

Timestamp:

10/13/14 13:03:24 (10 years ago)

Author:

bburlacu

Message:

#1772: HeuristicLab.Problems.DataAnalysis.Symbolic:

• Merged trunk changes (SymbolicExpressionImporter)
• Added Passthrough symbol (does not perform an operation, just transfers the input), adjusted interpreter and opcodes accordingly
• Added diversity preserving crossover
• Replaced IDistanceCalculator interface with ISymbolicDataAnalysisExpressionSimilarityCalculator and adjusted similarity calculators
• Refactored tracing, moved functionality to the TraceCalculator (when this is complete the old code will be removed)

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• . (modified) (1 prop)
• Grammars/TypeCoherentExpressionGrammar.cs (modified) (5 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
+
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
@@ -86 +88 @@
       var psi = new Psi();
       var sineIntegral = new SineIntegral();
+      var passthrough = new Passthrough();
 
       var @if = new IfThenElse();
@@ -113 +116 @@
       var exponentialAndLogarithmicSymbols = new GroupSymbol(ExponentialFunctionsName, new List<ISymbol> { exp, log });
       var specialFunctions = new GroupSymbol(SpecialFunctionsName, new List<ISymbol> { airyA, airyB, bessel, cosineIntegral, dawson, erf, expIntegralEi, 
-        fresnelCosineIntegral,fresnelSineIntegral,gamma,hypCosineIntegral,hypSineIntegral,norm, psi, sineIntegral});
+        fresnelCosineIntegral,fresnelSineIntegral,gamma,hypCosineIntegral,hypSineIntegral,norm, psi, sineIntegral, passthrough});
       var terminalSymbols = new GroupSymbol(TerminalsName, new List<ISymbol> { constant, variableSymbol });
       var realValuedSymbols = new GroupSymbol(RealValuedSymbolsName, new List<ISymbol>() { arithmeticSymbols, trigonometricSymbols, exponentialAndLogarithmicSymbols, specialFunctions, terminalSymbols });
@@ -156 +159 @@
       SetSubtreeCount(laggedVariable, 0, 0);
       SetSubtreeCount(autoregressiveVariable, 0, 0);
+      SetSubtreeCount(passthrough, 1, 1);
       #endregion
 
@@ -224 +228 @@
       AddAllowedChildSymbol(derivative, powerSymbols);
       AddAllowedChildSymbol(derivative, conditionSymbols);
+
+      AddAllowedChildSymbol(passthrough, realValuedSymbols);
+      AddAllowedChildSymbol(passthrough, powerSymbols);
+      AddAllowedChildSymbol(passthrough, conditionSymbols);
+      AddAllowedChildSymbol(passthrough, timeSeriesSymbols);
+      AddAllowedChildSymbol(passthrough, specialFunctions);
       #endregion
     }

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer