Changeset 14535 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer

Timestamp:

01/01/17 17:35:13 (8 years ago)

Author:

gkronber

Message:

#2650 worked on simplifier

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs (modified) (3 diffs)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs

@@ -77 +77 @@
         {"MAIN", new StartSymbol()},
         {"FACTOR", new FactorVariable() },
-        {"BINARYFACTOR", new BinaryFactorVariable()}
+        {"BINFACTOR", new BinaryFactorVariable()}
       };
 
@@ -144 +144 @@
         } else if(tokens.Peek().StringValue.StartsWith("FACTOR")) {
           tree = ParseFactor(tokens);
-        } else if(tokens.Peek().StringValue.StartsWith("BINARYFACTOR")) {
+        } else if(tokens.Peek().StringValue.StartsWith("BINFACTOR")) {
           tree = ParseBinaryFactor(tokens);
         } else {
@@ -242 +242 @@
       var varValTok = tokens.Dequeue();
       Debug.Assert(tok.Symbol == TokenSymbol.SYMB);
-      t.VariableValue = varNameTok.StringValue;
+      t.VariableValue = varValTok.StringValue;
 
       var weightTok = tokens.Dequeue();