Changeset 10011 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Logical Expressions/LogicalExpression.cs

Timestamp:

10/01/13 12:08:25 (11 years ago)

Author:

jkarder

Message:

#2069:

• refactored grammar and symbols
• fixed cloning and storable ctors
• fixed plugin dependencies

File:

• branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Logical Expressions/LogicalExpression.cs (modified) (3 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Logical Expressions/LogicalExpression.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -37 +38 @@
 
     [StorableConstructor]
-    private LogicalExpression(bool deserializing) : base(deserializing) { }
-    private LogicalExpression(LogicalExpression original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected LogicalExpression(bool deserializing) : base(deserializing) { }
+    protected LogicalExpression(LogicalExpression original, Cloner cloner) : base(original, cloner) { }
 
-    public LogicalExpression()
-      : base("LogicalExpression", "A LogicalExpression.") {
-      this.Prefix = "";
-      this.Suffix = "";
-    }
+    public LogicalExpression() : base("LogicalExpression", "A logical expression.") { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -52 +47 @@
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       var enumerator = children.GetEnumerator();
+      if (!enumerator.MoveNext()) throw new System.Exception("LogicalExpression was not given a child.");
 
-      if (!enumerator.MoveNext()) throw new System.Exception("LogicalExpression was not given a child.");
       var symbol = enumerator.Current.Symbol;
-
-      if (!(symbol is LogicalValue || symbol is LogicalComparison ||
-          symbol is NumericalComparison || symbol is Negation))
-        throw new System.Exception("LogicalExpression was given a child of type " + symbol.GetType().ToString() +
-            ". The expected child must be of type " + typeof(LogicalValue).ToString() + " or " +
-            typeof(LogicalComparison).ToString() + " or " + typeof(NumericalComparison).ToString() + " or " +
-            typeof(Negation).ToString() + ".");
+      if (!(symbol is LogicalValue || symbol is Conjunction || symbol is Disjunction || symbol is Negation))
+        throw new System.Exception("LogicalExpression was given a child of type " + symbol.GetType() +
+            ". The expected child must be of type " + typeof(LogicalValue)
+                                           + " or " + typeof(Conjunction)
+                                           + " or " + typeof(Disjunction)
+                                           + " or " + typeof(Negation) + ".");
 
       string result = ((CodeNode)symbol).Interpret(enumerator.Current, enumerator.Current.Subtrees);
       if (enumerator.MoveNext()) throw new System.Exception("LogicalExpression was given more than one child.");
 
-      return this.Prefix + result + this.Suffix;
+      return result;
     }
   }