Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs (modified) (12 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs

@@ -5 +5 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System.Diagnostics;
-
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
-
+  using Constants;
+  using Data.Pool;
+  using Extensions;
   using Interpreter;
-
-  public interface IMutablePushProgram {
-    void SetAtIndex(int index, Expression expression);
-  }
+  using Persistence.Default.CompositeSerializers.Storable;
 
   [Serializable]
   [StorableClass]
-  public sealed class PushProgram : Expression, IPooledObject, IMutablePushProgram {
+  public sealed class PushProgram : Expression, IPooledObject {
 #if DEBUG
-    private const int StringRepresentationCountBeforeAggregate = 50;
+    private const int STRING_REPRESENTATION_COUNT_BEFORE_AGGREGATE = 10;
 #else
-    private const int StringRepresentationCountBeforeAggregate = 10;
+    private const int STRING_REPRESENTATION_COUNT_BEFORE_AGGREGATE = 1;
 #endif
 
@@ -27 +23 @@
     public static readonly PushProgram Empty = new PushProgram();
 
-    private const string Prefix = "(";
-    private const string PrefixReduced = "[";
-    private const string Postfix = ")";
-    private const string PostfixReduced = "]";
+    private const string Prefix = PushEnvironment.ProgramStartSymbolStr + " ";
+    private const string Postfix = " " + PushEnvironment.ProgramEndSymbolStr;
+    private const string PrefixReduced = "|";
+    private const string PostfixReduced = "|";
     private const string Delimiter = " ";
 
@@ -112 +108 @@
     }
 
+    [NonSerialized]
     private string stringRepresentation;
     public override string StringRepresentation
@@ -117 +114 @@
       get
       {
-        if (stringRepresentation == null) stringRepresentation = BuildString();
-        return stringRepresentation;
-      }
-    }
-
-
+        return stringRepresentation ?? (stringRepresentation = BuildStringRepresentation());
+      }
+    }
+
+
+    [NonSerialized]
     private int? depth;
     public int Depth
@@ -133 +130 @@
     }
 
+    [NonSerialized]
     private int[] treeIndex;
     private int[] TreeIndex
@@ -138 +136 @@
       get
       {
-        if (treeIndex == null) treeIndex = BuildTreeIndex();
-        return treeIndex;
-      }
-    }
-
+        return treeIndex ?? (treeIndex = BuildTreeIndex());
+      }
+    }
+
+    [NonSerialized]
     private int? hashCode;
     public override int GetHashCode() {
-      if (hashCode == null) hashCode = HashExpressions();
+      if (hashCode == null) hashCode = expressions.HashCode();
       return hashCode.Value;
     }
 
-    void IMutablePushProgram.SetAtIndex(int index, Expression expression) {
-
-    }
-
     public override bool Equals(object obj) {
+      if (obj == null)
+        return false;
+
       if (ReferenceEquals(this, obj))
         return true;
@@ -183 +180 @@
       return StringRepresentation;
     }
+
+    [NonSerialized]
+    private int? totalCount;
 
     /// <summary>
@@ -192 +192 @@
       get
       {
-        return IsEmpty
+        if (totalCount == null) {
+          totalCount = IsEmpty
             ? 1
             // + 1 because "this" is also counted
             : TreeIndex[0] + 1;
+        }
+
+        return totalCount.Value;
+      }
+    }
+
+    [NonSerialized]
+    private int? totalExpressionCount;
+    /// <summary>
+    /// Returns the amount of none program expressions
+    /// </summary>
+    /// <returns></returns>
+    public int TotalExpressionCount
+    {
+      get
+      {
+        if (totalExpressionCount == null) {
+          totalExpressionCount = 0;
+
+          for (var i = 0; i < Count; i++) {
+            var expression = expressions[i];
+
+            totalExpressionCount += expression.IsProgram
+              ? ((PushProgram)expression).TotalExpressionCount
+              : 1;
+          }
+        }
+
+        return totalExpressionCount.Value;
+      }
+    }
+
+    [NonSerialized]
+    private int? branches;
+    /// <summary>
+    /// Returns the amount of branches in the whole tree. Even an empty program represents at least one branch
+    /// </summary>
+    /// <returns></returns>
+    public int Branches
+    {
+      get
+      {
+        if (branches == null) {
+          branches = 1;
+
+          for (var i = 0; i < Count; i++) {
+            var expression = expressions[i];
+
+            if (!expression.IsProgram)
+              continue;
+
+            var program = (PushProgram)expression;
+            branches += program.Branches;
+          }
+        }
+
+        return branches.Value;
       }
     }
@@ -247 +305 @@
 
     private int CalcDepth() {
-      var maxDepth = 1;
+      var maxDepth = 0;
       for (var i = 0; i < Count; i++) {
         var expression = expressions[i];
         if (!expression.IsProgram) continue;
+
         var expandExpression = (PushProgram)expression;
-
         if (expandExpression.Depth > maxDepth)
           maxDepth = expandExpression.Depth;
@@ -260 +318 @@
     }
 
-    private string BuildString() {
+    private string BuildStringRepresentation() {
       // prevent too big string
-      return TotalCount > StringRepresentationCountBeforeAggregate
+      return Count > STRING_REPRESENTATION_COUNT_BEFORE_AGGREGATE
         ? PrefixReduced + Count + PostfixReduced
-        : Prefix + string.Join(Delimiter, expressions) + Postfix;
+        : Prefix + string.Join(Delimiter, expressions.Reverse()) + Postfix;
     }
 
     private int[] BuildTreeIndex() {
-      var local_treeIndex = new int[Count];
-
+      var localTreeIndex = new int[Count];
       var next = 1;
 
@@ -275 +332 @@
         var subExpression = expressions[i];
 
-        local_treeIndex[i] = next;
+        localTreeIndex[i] = next;
 
         if (subExpression.IsProgram) {
@@ -284 +341 @@
       }
 
-      return local_treeIndex;
-    }
-
-    private int HashExpressions() {
-      var hash = 19 * 31 + typeof(PushProgram).GetHashCode();
-
-      for (var i = 0; i < Count; i++) {
-        hash = hash * 31 + expressions[i].GetHashCode();
-      }
-
-      return hash;
+      return localTreeIndex;
     }