Changeset 6784 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Timestamp:

09/16/11 12:00:36 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs (modified) (2 diffs)
• Compiler/Instruction.cs (modified) (1 diff)
• SymbolicExpressionTreeNode.cs (modified) (1 diff)
• SymbolicExpressionTreeTerminalNode.cs (modified) (1 diff)
• Tests/AllArchitectureAlteringOperatorsTest.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -108 +109 @@
           symbolFrequencies.Rows.Add(row);
         }
-        symbolFrequencies.Rows[pair.Key].Values.Add(pair.Value);
+        symbolFrequencies.Rows[pair.Key].Values.Add(Math.Round(pair.Value, 3));
       }
 

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Compiler/Instruction.cs

@@ -30 +30 @@
     // number of arguments of the current instruction
     public byte nArguments;
-    // an optional short value (addresses for calls, argument index for arguments)
-    public ushort iArg0;
+    // an optional object value (addresses for calls, argument index for arguments)
+    public object iArg0;
   }
 }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -55 +55 @@
       : base() {
       symbol = original.symbol; // symbols are reused
-      subtrees = new List<ISymbolicExpressionTreeNode>(original.subtrees.Count);
-      foreach (var subtree in original.subtrees) {
-        var clonedSubtree = cloner.Clone(subtree);
-        subtrees.Add(clonedSubtree);
-        clonedSubtree.Parent = this;
+      if (original.subtrees != null) {
+        subtrees = new List<ISymbolicExpressionTreeNode>(original.subtrees.Count);
+        foreach (var subtree in original.subtrees) {
+          var clonedSubtree = cloner.Clone(subtree);
+          subtrees.Add(clonedSubtree);
+          clonedSubtree.Parent = this;
+        }
       }
     }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs

@@ -37 +37 @@
     [StorableConstructor]
     protected SymbolicExpressionTreeTerminalNode(bool deserializing) : base(deserializing) { }
-    // don't call cloning constructor of base to prevent allocation of sub-trees list in base!
-    protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner)
-      : base() {
-      // symbols are reused
-      this.Symbol = original.Symbol;
-    }
+    protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner) : base(original, cloner) { }
     protected SymbolicExpressionTreeTerminalNode() : base() { }
 

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/AllArchitectureAlteringOperatorsTest.cs

@@ -118 +118 @@
 
       Assert.IsTrue(failedEvents * 100.0 / (POPULATION_SIZE * N_ITERATIONS / 2.0) < 75.0); // 25% of architecture operations must succeed
-      Assert.IsTrue(Math.Round(1000.0 / (msPerOperation)) > 1000); // must achieve more than 1000 ops per second
+      Assert.IsTrue(Math.Round(1000.0 / (msPerOperation)) > 800); // must achieve more than 1000 ops per second
     }
   }