Changeset 5881

Timestamp:

03/30/11 13:10:43 (14 years ago)

Author:

epitzer

Message:

Adopt TypeCoherentExpressionGrammar from HeuristicLab.Problems.DataAnalysis.Symbolic for external evaluation (#1459)

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3

Files:

• Grammar/TypeCoherentExpressionGrammar.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj (modified) (1 diff)
• SymbolicExpressionTreeStringConverter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj

@@ -109 +109 @@
     <None Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs.frame" />
     <Compile Include="Grammar\FullFunctionalExpressionGrammar.cs" />
+    <Compile Include="Grammar\TypeCoherentExpressionGrammar.cs" />
     <Compile Include="HeuristicLabProblemsExternalEvaluationGPPlugin.cs" />
     <Compile Include="Interpretation\ITreeInterpreter.cs" />

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/SymbolicExpressionTreeStringConverter.cs

@@ -60 +60 @@
 
     protected override void ConvertSymbolicExpressionTree(SymbolicExpressionTree tree, string name, SolutionMessage.Builder builder) {
-      string stringRep = formatter.Format(tree);
-      stringRep.Replace(Environment.NewLine, "");
+      string stringRep = formatter.Format(tree);      
+      stringRep = stringRep.Replace(Environment.NewLine, "");
       SolutionMessage.Types.StringVariable.Builder stringVariable = SolutionMessage.Types.StringVariable.CreateBuilder();
       stringVariable.SetName(name).SetData(stringRep);