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

Timestamp:

02/17/15 16:03:49 (10 years ago)

Author:

gkronber

Message:

#2283: changed handling of inverse expressions in transformation of expressions to canonical form

File:

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

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

@@ -126 +126 @@
 
     public double Evaluate(string sentence) {
+      var extender = new ExpressionExtender();
+      sentence = extender.CanonicalRepresentation(sentence);
       if (useConstantOpt)
         return OptimizeConstantsAndEvaluate(sentence);
       else {
-        var extender = new ExpressionExtender();
 
         Debug.Assert(SimpleEvaluate(sentence) == SimpleEvaluate(extender.CanonicalRepresentation(sentence)));
@@ -152 +153 @@
 
     public IEnumerable<Feature> GetFeatures(string phrase) {
+      // throw new NotImplementedException();
       phrase = CanonicalRepresentation(phrase);
-      return new Feature[] { new Feature(phrase, 1.0) };
+      return phrase.Split('+').Distinct().Select(t => new Feature(t, 1.0));
+      // return new Feature[] { new Feature(phrase, 1.0) };
     }