Changeset 14730 for branches/PushGP

Timestamp:

03/08/17 10:23:51 (8 years ago)

Author:

mkommend

Message:

#2665: Removed memory pressure from expressions.

Location:

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

Files:

• PushProgram.cs (modified) (5 diffs)
• StatefullExpression.cs (modified) (2 diffs)

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

@@ -17 +17 @@
     public readonly bool IsEmpty;
 
-    private readonly Lazy<int> depth;
-    private readonly Lazy<int[]> treeIndex;
-    private readonly Lazy<int> hashCode;
-    private readonly Lazy<string> stringRepresentation;
+
+    private string stringRepresentation;
+    private string StringRepresentation {
+      get {
+        if (string.IsNullOrEmpty(stringRepresentation))
+          stringRepresentation = BuildString();
+        return stringRepresentation;
+      }
+    }
+
+    private int depth = -1;
+    private int Depth {
+      get {
+        if (depth == -1) depth = CalcDepth();
+        return depth;
+      }
+    }
+
+    private int[] treeIndex = null;
+    public int[] TreeIndex {
+      get {
+        if (treeIndex == null) treeIndex = BuildTreeIndex();
+        return treeIndex;
+      }
+    }
+
+    private int hashCode;
+    private int HashCode {
+      get {
+        if (hashCode == default(int)) hashCode = HashExpressions();
+        return hashCode;
+      }
+    }
 
     public PushProgram(Expression[] expressions) {
       this.Expressions = expressions;
       this.IsEmpty = expressions.Length == 0;
-
-      this.depth = new Lazy<int>(this.CalcDepth, true);
-      this.treeIndex = new Lazy<int[]>(this.BuildTreeIndex, true);
-      this.hashCode = new Lazy<int>(this.HashExpressions, true);
-      this.stringRepresentation = new Lazy<string>(this.BuildString, true);
     }
 
-    public int Depth { get { return depth.Value; } }
-    public int[] TreeIndex { get { return treeIndex.Value; } }
 
     public override int GetHashCode() {
-      return this.hashCode.Value;
+      return HashCode;
     }
 
     public override string ToString() {
-      return this.stringRepresentation.Value;
+      return this.StringRepresentation;
     }
 
@@ -47 +69 @@
     /// </summary>
     /// <returns></returns>
-    public int TotalCount
-    {
-      get
-      {
+    public int TotalCount {
+      get {
         return this.IsEmpty
             ? 1
-            // + 1 because "this" is also counted
-            : this.treeIndex.Value[0] + 1;
+          // + 1 because "this" is also counted
+            : TreeIndex[0] + 1;
       }
     }
@@ -111 +131 @@
 
     private int[] BuildTreeIndex() {
-      var TreeIndex = new int[this.Expressions.Count];
+      var local_treeIndex = new int[this.Expressions.Count];
 
       var next = 1;
@@ -118 +138 @@
         var subExpression = this.Expressions[i];
 
-        TreeIndex[i] = next;
+        local_treeIndex[i] = next;
 
         if (subExpression.CanExpand) {
@@ -127 +147 @@
       }
 
-      return TreeIndex;
+      return local_treeIndex;
     }
 

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
-  using System;
 
   public abstract class StatefullExpression<T> : Expression {
 
     public readonly T State;
-    private readonly Lazy<int> hashCode;
+
+    private int hashCode;
+    private int HashCode {
+      get {
+        if (hashCode == default(int)) hashCode = CalcHashCode();
+        return hashCode;
+      }
+    }
 
     protected StatefullExpression(T state) {
       this.State = state;
-      this.hashCode = new Lazy<int>(this.CalcHashCode, true);
     }
 
@@ -30 +35 @@
 
     public override int GetHashCode() {
-      return this.hashCode.Value;
+      return HashCode;
     }
   }