Changeset 12014 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.SymbReg/SymbolicRegressionProblem.cs

Timestamp:

02/16/15 09:14:38 (10 years ago)

Author:

gkronber

Message:

#2283: worked on transformation of arithmetic expressions to canonical form

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.SymbReg/SymbolicRegressionProblem.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.SymbReg/SymbolicRegressionProblem.cs

@@ -9 +9 @@
 using System.Text;
 using AutoDiff;
+using HeuristicLab.Algorithms.Bandits;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -128 +129 @@
         return OptimizeConstantsAndEvaluate(sentence);
       else {
+        var extender = new ExpressionExtender();
+
+        Debug.Assert(SimpleEvaluate(sentence) == SimpleEvaluate(extender.CanonicalRepresentation(sentence)));
         return SimpleEvaluate(sentence);
       }
@@ -143 +147 @@
 
     public string CanonicalRepresentation(string phrase) {
-      return phrase;
+      var extender = new ExpressionExtender();
+      return extender.CanonicalRepresentation(phrase);
     }
 
     public IEnumerable<Feature> GetFeatures(string phrase) {
-      // first generate canonical expression (which must not contain ())
-      // recursively split into expressions
-      // for each expression split into terms
-      // for each term order factors to canonical // ../E = * 1/E
+      phrase = CanonicalRepresentation(phrase);
       return new Feature[] { new Feature(phrase, 1.0) };
     }