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

Timestamp:

08/21/17 11:33:53 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Testet error functions, Small fixes, Created HL files

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.PushGP

@@ -1 +1 @@
 *.user
+packages
+TestResults

@@ -1 +1 @@
 *.user
+packages
+TestResults

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

@@ -5 +5 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
   using System.Diagnostics;
+  using System.Diagnostics.CodeAnalysis;
+
   using Constants;
   using Data.Pool;
@@ -38 +40 @@
 
     [StorableConstructor]
-    public PushProgram(bool deserializing) : this(EmptyExpressions) { }
+    private PushProgram(bool deserializing) : this(EmptyExpressions) { }
 
     public PushProgram(IReadOnlyList<Expression> expressions) {
@@ -67 +69 @@
     }
 
-    void IPooledObject.Init() { }
-
     void IPooledObject.Reset() {
       expressions = null;
@@ -159 +159 @@
     [NonSerialized]
     private int? hashCode;
+    [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
     public override int GetHashCode() {
       if (hashCode == null) hashCode = expressions.HashCode();
@@ -256 +257 @@
       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;
-          }
-        }
-
+        if (branches == null) CountBranches();
         return branches.Value;
+      }
+    }
+
+    private void CountBranches() {
+      branches = 1;
+
+      for (var i = 0; i < Count; i++) {
+        var expression = expressions[i];
+
+        if (!expression.IsProgram)
+          continue;
+
+        var program = (PushProgram)expression;
+        branches += program.Branches;
       }
     }

@@ -1 +1 @@
 *.user
+packages
+TestResults