Changeset 11457

Timestamp:

10/13/14 12:54:44 (10 years ago)

Author:

bburlacu

Message:

#2218: Moved the SymbolicExpressionImporter from HeuristicLab.Tests to HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs (moved) (moved from trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionImporter.cs) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/Token.cs (moved) (moved from trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/Token.cs) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -126 +126 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Importer\SymbolicExpressionImporter.cs" />
+    <Compile Include="Importer\Token.cs" />
     <Compile Include="Interfaces\IModelBacktransformator.cs" />
     <Compile Include="Matching\SymbolicExpressionTreeCanonicalSorter.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
-  internal class SymbolicExpressionImporter {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+  public class SymbolicExpressionImporter {
     private const string VARSTART = "VAR";
     private const string LAGGEDVARSTART = "LAGVARIABLE";
@@ -86 +86 @@
     StartSymbol startSymbol = new StartSymbol();
 
-    internal ISymbolicExpressionTree Import(string str) {
+    public ISymbolicExpressionTree Import(string str) {
       str = str.Replace("(", " ( ").Replace(")", " ) ");
       ISymbolicExpressionTreeNode root = programRootSymbol.CreateTreeNode();

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/Token.cs

@@ -22 +22 @@
 using System.Globalization;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   internal enum TokenSymbol { LPAR, RPAR, SYMB, NUMBER };
   internal class Token {

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -481 +481 @@
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicDataAnalysisExpressionTreeSimplifierTest.cs" />
-    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionImporter.cs" />
-    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\Token.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\Util.cs" />
     <Compile Include="HeuristicLab.Problems.Instances-3.3\CordeauGQAPInstanceProviderTest.cs" />