Changeset 13013 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions

Timestamp:

10/15/15 16:39:12 (9 years ago)

Author:

gkronber

Message:

#2069: reviewing and minor changes

Location:

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions

Files:

• Number.cs (modified) (1 diff)
• NumberTreeNode.cs (modified) (2 diffs)
• Numerical Operators/Addition.cs (modified) (2 diffs)
• Numerical Operators/Division.cs (modified) (2 diffs)
• Numerical Operators/INumericalOperator.cs (modified) (1 diff)
• Numerical Operators/Modulus.cs (modified) (2 diffs)
• Numerical Operators/Multiplication.cs (modified) (2 diffs)
• Numerical Operators/Subtraction.cs (modified) (2 diffs)
• NumericalExpression.cs (modified) (2 diffs)
• ShotPower.cs (modified) (1 diff)
• ShotPowerTreeNode.cs (modified) (2 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Number.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Number : CodeNode {

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/NumberTreeNode.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class NumberTreeNode : SymbolicExpressionTreeTerminalNode {
@@ -53 +53 @@
 
     public override void ResetLocalParameters(IRandom random) {
+      // random initialization
       value = random.Next(-360, 360);
+    }
+
+    public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
+      // random mutation (cyclic)
+      value = value + random.Next(-20, 20);
+      if (value < -360) value += 2 * 360;
+      else if (value > 359) value -= 2 * 360;
     }
   }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Addition.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Addition : CodeNode, INumericalOperator {
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       if (children.Count() < 2)
-        throw new ArgumentException("Expected at leaset 2 children.", "children");
+        throw new ArgumentException("Expected at least two children.", "children");
 
       string result = string.Join(" + ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Division.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Division : CodeNode, INumericalOperator {
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       if (children.Count() < 2)
-        throw new ArgumentException("Expected at leaset 2 children.", "children");
+        throw new ArgumentException("Expected at least two children.", "children");
 
       string result = string.Join(" / ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/INumericalOperator.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   public interface INumericalOperator { }
 }

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Modulus.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Modulus : CodeNode, INumericalOperator {
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       if (children.Count() < 2)
-        throw new ArgumentException("Expected at leaset 2 children.", "children");
+        throw new ArgumentException("Expected at least two children.", "children");
 
       string result = string.Join(" % ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Multiplication.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Multiplication : CodeNode, INumericalOperator {
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       if (children.Count() < 2)
-        throw new ArgumentException("Expected at leaset 2 children.", "children");
+        throw new ArgumentException("Expected at least two children.", "children");
 
       string result = string.Join(" * ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/Numerical Operators/Subtraction.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class Subtraction : CodeNode, INumericalOperator {
@@ -55 +55 @@
     public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
       if (children.Count() < 2)
-        throw new ArgumentException("Expected at leaset 2 children.", "children");
+        throw new ArgumentException("Expected at least two children.", "children");
 
       string result = string.Join(" - ", children.Select(c => ((CodeNode)c.Symbol).Interpret(c, c.Subtrees)));

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/NumericalExpression.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class NumericalExpression : CodeNode {
@@ -56 +56 @@
       var symbol = exprTree.Symbol;
       if (!(symbol is Number || symbol is INumericalMethod || symbol is INumericalOperator))
-        throw new System.Exception("NumericalExpression was given a child of type " + symbol.GetType() +
-            ". The expected child must be of type " + typeof(Number)
-                                           + " or " + typeof(INumericalMethod)
-                                           + " or " + typeof(INumericalOperator) + ".");
+        throw new InvalidProgramException("NumericalExpression was given a child of type " + symbol.GetType() +
+            ". The expected child must be of type Number or INumericalMethod or INumericalOperator .");
 
       return Prefix + ((CodeNode)symbol).Interpret(exprTree, exprTree.Subtrees) + Suffix;

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/ShotPower.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class ShotPower : CodeNode {

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Numerical Expressions/ShotPowerTreeNode.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.GeneticProgramming.RoboCode {
+namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
   [StorableClass]
   public class ShotPowerTreeNode : SymbolicExpressionTreeTerminalNode {
@@ -54 +54 @@
 
     public override void ResetLocalParameters(IRandom random) {
+      // random initialization
       value = Math.Max(0.1, random.NextDouble() * 3);
+    }
+
+    public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
+      // mutation
+      var d = random.NextDouble() * 2.0 - 1.0;
+      value = Math.Max(0.1, value + shakingFactor * d);
     }
   }