Changeset 13311 for trunk/sources

Timestamp:

11/19/15 20:53:11 (9 years ago)

Author:

mkommend

Message:

#2069: Minor code changes in interpreter, restricted ShotPowerTreeNode to [0.1,3], changed evaluation of InterpretComparison.

Location:

trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/robocode

Files:

• Interpreter.cs (modified) (2 diffs)
• Symbols/ShotPowerTreeNode.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Interpreter.cs

@@ -227 +227 @@
 
     private static string InterpretCodeSymbol(ISymbolicExpressionTreeNode node) {
-      var sy = node.Symbol as CodeSymbol;
-      string code = string.Join(Environment.NewLine, node.Subtrees.Select(Interpret));
-      return string.Format(
-@"{0}
-{1}
-{2}", sy.Prefix, code, sy.Suffix);
+      var sy = (CodeSymbol)node.Symbol;
+      string code = string.Join(Environment.NewLine, node.Subtrees.Select(Interpret));
+      return sy.Prefix + Environment.NewLine + code + Environment.NewLine + sy.Suffix;
     }
 
     private static string InterpretBoolValue(ISymbolicExpressionTreeNode node) {
-      var boolNode = node as BooleanTreeNode;
+      var boolNode = (BooleanTreeNode)node;
       return string.Format(NumberFormatInfo.InvariantInfo, "{0}", boolNode.Value).ToLower();
     }
 
     private static string InterpretNumber(ISymbolicExpressionTreeNode node) {
-      var numberNode = node as NumberTreeNode;
+      var numberNode = (NumberTreeNode)node;
       return string.Format(NumberFormatInfo.InvariantInfo, "{0}", numberNode.Value);
     }
 
     private static string InterpetShotPower(ISymbolicExpressionTreeNode node) {
-      var shotPowerNode = node as ShotPowerTreeNode;
+      var shotPowerNode = (ShotPowerTreeNode)node;
       return string.Format(NumberFormatInfo.InvariantInfo, "{0:E}", shotPowerNode.Value);
     }
@@ -311 +308 @@
       rhs = node.GetSubtree(1);
 
-      return Interpret(lhs) + " == " + Interpret(rhs);
+      return Interpret(lhs) + compSy + Interpret(rhs);
     }
 

trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/ShotPowerTreeNode.cs

@@ -61 +61 @@
       // mutation
       var d = random.NextDouble() * 2.0 - 1.0;
-      value = Math.Max(0.1, value + shakingFactor * d);
+      value += shakingFactor * d;
+      if (value < 0.1) value = 0.1;
+      if (value > 3) value = 3;
     }
   }