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

Timestamp:

03/10/17 21:42:09 (7 years ago)

Author:

pkimmesw

Message:

#2665 Renamings due to typos, ManagedPool tests, Skip Noops in Debugger

File:

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

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

@@ -2 +2 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
-  using System;
   using System.Diagnostics;
   using System.Linq;
@@ -14 +13 @@
     private const string Delimiter = " ";
 
+    public static readonly PushProgram Empty = new PushProgram(new Expression[0]);
+
     public readonly IReadOnlyList<Expression> Expressions;
-    public readonly bool IsEmpty;
-
+    public bool IsEmpty { get; private set; }
+
+    public PushProgram(Expression[] expressions) {
+      this.Expressions = expressions;
+      this.IsEmpty = expressions.Length == 0;
+    }
 
     private string stringRepresentation;
-    private string StringRepresentation {
-      get {
+    private string StringRepresentation
+    {
+      get
+      {
         if (string.IsNullOrEmpty(stringRepresentation))
           stringRepresentation = BuildString();
@@ -28 +35 @@
 
     private int depth = -1;
-    private int Depth {
-      get {
+    private int Depth
+    {
+      get
+      {
         if (depth == -1) depth = CalcDepth();
         return depth;
@@ -36 +45 @@
 
     private int[] treeIndex = null;
-    public int[] TreeIndex {
-      get {
-        if (treeIndex == null) treeIndex = BuildTreeIndex();
-        return treeIndex;
+    public int[] TreeIndex
+    {
+      get
+      {
+        return this.treeIndex ?? (this.treeIndex = this.BuildTreeIndex());
       }
     }
 
     private int hashCode;
-    private int HashCode {
-      get {
+    private int HashCode
+    {
+      get
+      {
         if (hashCode == default(int)) hashCode = HashExpressions();
         return hashCode;
       }
     }
-
-    public PushProgram(Expression[] expressions) {
-      this.Expressions = expressions;
-      this.IsEmpty = expressions.Length == 0;
-    }
-
 
     public override int GetHashCode() {
@@ -69 +75 @@
     /// </summary>
     /// <returns></returns>
-    public int TotalCount {
-      get {
+    public int TotalCount
+    {
+      get
+      {
         return this.IsEmpty
             ? 1
-          // + 1 because "this" is also counted
+            // + 1 because "this" is also counted
             : TreeIndex[0] + 1;
       }
@@ -90 +98 @@
 
     public PushProgram Copy() {
-      var copy = this.CopyExpressions();
-
-      return new PushProgram(copy);
+      return IsEmpty ? this : new PushProgram((Expression[])Expressions) {
+        stringRepresentation = this.stringRepresentation,
+        hashCode = this.hashCode,
+        depth = this.depth,
+        treeIndex = this.treeIndex
+      };
     }
 
     public Expression[] CopyExpressions() {
       var copy = new Expression[this.Expressions.Count];
-      Array.Copy((Expression[])this.Expressions, copy, this.Expressions.Count);
+      ((Expression[])this.Expressions).CopyTo(copy, Expressions.Count);
 
       return copy;