Changeset 14745 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CodeExpressions.cs

Timestamp:

03/11/17 12:42:31 (7 years ago)

Author:

pkimmesw

Message:

#2665 Merged ExecExpandExpression and PushProgram due to performance reasons, Tested managed object pooling

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/CodeExpressions.cs (modified) (24 diffs)

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

@@ -114 +114 @@
 
       if (isFirstList) {
-        var expand1 = first as ExecExpandExpression;
+        var expand1 = first as PushProgram;
 
         if (isSecondList) {
-          var expand2 = second as ExecExpandExpression;
-          var size = expand2.State.Expressions.Count + expand1.State.Expressions.Count;
+          var expand2 = second as PushProgram;
+          var size = expand2.State.Length + expand1.State.Length;
 
           // if size > maxPointsInProgram this expressions results in a NOOP
@@ -125 +125 @@
           result = new Expression[size];
 
-          Array.Copy(expand2.State.Expressions as Expression[], result, expand2.State.Expressions.Count);
+          Array.Copy(expand2.State, result, expand2.State.Length);
           Array.Copy(
-              expand1.State.Expressions as Expression[],
+              expand1.State,
               0,
               result,
-              expand2.State.Expressions.Count,
-              expand1.State.Expressions.Count);
+              expand2.State.Length,
+              expand1.State.Length);
         } else {
-          var size = expand1.State.Expressions.Count + 1;
+          var size = expand1.State.Length + 1;
 
           // if size > maxPointsInProgram this expressions results in a NOOP
@@ -141 +141 @@
           result[0] = second;
 
-          Array.Copy(expand1.State.Expressions as Expression[], 0, result, 1, expand1.State.Expressions.Count);
+          Array.Copy(expand1.State, 0, result, 1, expand1.State.Length);
         }
       } else if (isSecondList) {
-        var expand2 = second as ExecExpandExpression;
-
-        var size = expand2.State.Expressions.Count + 1;
+        var expand2 = second as PushProgram;
+
+        var size = expand2.State.Length + 1;
 
         // if size > maxPointsInProgram this expressions results in a NOOP
@@ -154 +154 @@
         result[0] = first;
 
-        Array.Copy(expand2.State.Expressions as Expression[], 0, result, 1, expand2.State.Expressions.Count);
+        Array.Copy(expand2.State as Expression[], 0, result, 1, expand2.State.Length);
       } else {
         result = new[] { second, first };
       }
 
-      var expression = new ExecExpandExpression(result);
+      var expression = new PushProgram(result);
 
       interpreter.CodeStack.SetTop(expression);
@@ -194 +194 @@
     public override bool Eval(IPushInterpreter interpreter) {
       if ((interpreter.CodeStack.Count == 0) ||
-          (interpreter.CodeStack.Top.GetType() != typeof(ExecExpandExpression))) return false;
-
-      var expand = interpreter.CodeStack.Top as ExecExpandExpression;
-
-      if (expand.State.IsEmpty) return false;
-      var first = expand.State.Expressions[expand.State.Expressions.Count - 1];
+          (interpreter.CodeStack.Top.GetType() != typeof(PushProgram))) return false;
+
+      var expand = interpreter.CodeStack.Top as PushProgram;
+
+      if (expand.IsEmpty) return false;
+      var first = expand.State[expand.State.Length - 1];
 
       interpreter.CodeStack.SetTop(first);
@@ -217 +217 @@
       if (interpreter.CodeStack.Count == 0) return false;
 
-      ExecExpandExpression expandExpression;
+      PushProgram expandExpression;
       var top = interpreter.CodeStack.Top;
 
       if (top.CanExpand) {
-        var expand = (ExecExpandExpression)top;
-
-        if (expand.State.IsEmpty) return false;
-        var length = expand.State.Expressions.Count - 1;
+        var expand = (PushProgram)top;
+
+        if (expand.IsEmpty) return false;
+        var length = expand.State.Length - 1;
         var newExpressions = new Expression[length];
 
-        Array.Copy((Expression[])expand.State.Expressions, 0, newExpressions, 0, length);
-
-        expandExpression = new ExecExpandExpression(newExpressions);
+        Array.Copy((Expression[])expand.State, 0, newExpressions, 0, length);
+
+        expandExpression = new PushProgram(newExpressions);
       } else {
-        expandExpression = ExecExpandExpression.Empty;
+        expandExpression = PushProgram.Empty;
       }
 
@@ -250 +250 @@
         return false;
 
-      ExecExpandExpression result;
+      PushProgram result;
 
       if (interpreter.CodeStack.Top.CanExpand) {
-        var first = (ExecExpandExpression)interpreter.CodeStack.Pop();
-        var size = first.State.Expressions.Count + 1;
+        var first = (PushProgram)interpreter.CodeStack.Pop();
+        var size = first.State.Length + 1;
 
         if (size > interpreter.Configuration.MaxPointsInProgram) return false;
@@ -260 +260 @@
         var expressions = new Expression[size];
 
-        expressions[first.State.Expressions.Count] = interpreter.CodeStack.Top;
-        Array.Copy(first.State.Expressions as Expression[], expressions, first.State.Expressions.Count);
-
-        result = new ExecExpandExpression(expressions);
+        expressions[first.State.Length] = interpreter.CodeStack.Top;
+        Array.Copy(first.State as Expression[], expressions, first.State.Length);
+
+        result = new PushProgram(expressions);
       } else {
-        result = new ExecExpandExpression(interpreter.CodeStack.Pop(), interpreter.CodeStack.Top);
+        result = new PushProgram(interpreter.CodeStack.Pop(), interpreter.CodeStack.Top);
       }
 
@@ -286 +286 @@
       if ((interpreter.CodeStack.Count < 2) ||
           (interpreter.CodeStack[interpreter.CodeStack.Count - 2].GetType() !=
-           typeof(ExecExpandExpression))) return false;
+           typeof(PushProgram))) return false;
 
       var target = interpreter.CodeStack.Pop();
       var source = interpreter.CodeStack.Top;
 
-      var container = GetContainer(source as ExecExpandExpression, target);
-      var result = container ?? ExecExpandExpression.Empty;
+      var container = GetContainer(source as PushProgram, target);
+      var result = container ?? PushProgram.Empty;
 
       interpreter.CodeStack.SetTop(result);
@@ -298 +298 @@
     }
 
-    private static ExecExpandExpression GetContainer(ExecExpandExpression current, Expression target) {
+    private static PushProgram GetContainer(PushProgram current, Expression target) {
       if (current == target)
         return null;
 
       var subContainer =
-          current.State.Expressions.Where(e => e.CanExpand)
-              .Select(e => GetContainer(e as ExecExpandExpression, target))
+          current.State.Where(e => e.CanExpand)
+              .Select(e => GetContainer(e as PushProgram, target))
               .Where(e => e != null);
 
-      var execExpandExpressions = subContainer as IList<ExecExpandExpression> ?? subContainer.ToList();
+      var execExpandExpressions = subContainer as IList<PushProgram> ?? subContainer.ToList();
       return execExpandExpressions.Any()
-          ? execExpandExpressions.OrderBy(c => c.State.Expressions.Count).LastOrDefault()
-          : current.State.Expressions.Contains(target)
+          ? execExpandExpressions.OrderBy(c => c.State.Length).LastOrDefault()
+          : current.State.Contains(target)
               ? current
               : null;
@@ -328 +328 @@
 
       var values = interpreter.CodeStack.Pop(2);
-      var second = (ExecExpandExpression)values[0];
-      var contains = second.State.Expressions.Contains(values[1]);
+      var second = (PushProgram)values[0];
+      var contains = second.State.Contains(values[1]);
 
       interpreter.BooleanStack.Push(contains);
@@ -414 +414 @@
     private void DetermineUniqueItems(Expression source, IDictionary<int, int> items) {
       if (source.CanExpand) {
-        var expand = source as ExecExpandExpression;
-
-        foreach (var e in expand.State.Expressions) {
+        var expand = source as PushProgram;
+
+        foreach (var e in expand.State) {
           var id = e.GetHashCode();
           if (!items.ContainsKey(id)) items.Add(id, 1);
@@ -445 +445 @@
         return false;
 
-      var expression = (ExecExpandExpression)interpreter.CodeStack.Top;
-      var index = (int)Math.Abs(interpreter.IntegerStack.Pop() % expression.State.TotalCount);
+      var expression = (PushProgram)interpreter.CodeStack.Top;
+      var index = (int)Math.Abs(interpreter.IntegerStack.Pop() % expression.TotalCount);
       var result = expression.GetFromTree(index);
 
@@ -536 +536 @@
 
       var source = interpreter.CodeStack[interpreter.CodeStack.Count - 2];
-      var target = (ExecExpandExpression)interpreter.CodeStack.Pop();
+      var target = (PushProgram)interpreter.CodeStack.Pop();
       var index = (int)interpreter.IntegerStack.Pop();
 
       Expression[] newExpressions;
-      if (target.State.Expressions.Count > 0) {
-        index = target.State.Expressions.Count - 1 - Math.Abs(index % target.State.Expressions.Count);
-
-        newExpressions = target.State.CopyExpressions();
+      if (target.State.Length > 0) {
+        index = target.State.Length - 1 - Math.Abs(index % target.State.Length);
+
+        newExpressions = target.CopyExpressions();
         newExpressions[index] = source.CanExpand
-            ? ((ExecExpandExpression)source).Copy()
+            ? ((PushProgram)source).Copy()
             : source;
       } else {
@@ -551 +551 @@
       }
 
-      var result = new ExecExpandExpression(newExpressions);
+      var result = new PushProgram(newExpressions);
       interpreter.CodeStack.SetTop(result);
 
@@ -573 +573 @@
 
       if (expression.CanExpand)
-        count = ((ExecExpandExpression)expression).State.Expressions.Count;
+        count = ((PushProgram)expression).State.Length;
 
       interpreter.IntegerStack.Push(count);
@@ -591 +591 @@
       var first = interpreter.CodeStack.Pop();
       var second = interpreter.CodeStack.Top;
-      var expandExpression = new ExecExpandExpression(second, first);
+      var expandExpression = new PushProgram(second, first);
 
       interpreter.CodeStack.SetTop(expandExpression);
@@ -611 +611 @@
 
       var contains = expressions[1].CanExpand
-          ? ((ExecExpandExpression)expressions[1]).State.Expressions.Contains(expressions[0])
+          ? ((PushProgram)expressions[1]).State.Contains(expressions[0])
           : expressions[1].Equals(expressions[0]);
 
@@ -636 +636 @@
 
       if (expression.CanExpand) {
-        var subExpression = (ExecExpandExpression)expression;
-
-        if (subExpression.State.IsEmpty) {
-          nthExpression = ExecExpandExpression.Empty;
+        var subExpression = (PushProgram)expression;
+
+        if (subExpression.IsEmpty) {
+          nthExpression = PushProgram.Empty;
         } else {
-          var index = (int)(subExpression.State.Expressions.Count - 1 -
-                             Math.Abs(n % subExpression.State.Expressions.Count));
-
-          nthExpression = subExpression.State.Expressions[index];
+          var index = (int)(subExpression.State.Length - 1 -
+                             Math.Abs(n % subExpression.State.Length));
+
+          nthExpression = subExpression.State[index];
         }
       } else {
@@ -672 +672 @@
       var expression = interpreter.CodeStack.Top;
 
-      Expression nthExpression = null;
+      Expression nthExpression;
 
       if (expression.CanExpand) {
-        var subExpressions = ((ExecExpandExpression)expression).State.Expressions;
-
-        if (subExpressions.Count < 2) {
-          nthExpression = ExecExpandExpression.Empty;
+        var subExpressions = ((PushProgram)expression).State;
+
+        if (subExpressions.Length < 2) {
+          nthExpression = PushProgram.Empty;
         } else {
-          var index = (int)(subExpressions.Count - 2 - Math.Abs(n % (subExpressions.Count - 1)));
+          var index = (int)(subExpressions.Length - 2 - Math.Abs(n % (subExpressions.Length - 1)));
 
           nthExpression = subExpressions[index];
@@ -702 +702 @@
       if (interpreter.CodeStack.Count == 0) return false;
 
-      var result = interpreter.CodeStack.Pop().Equals(ExecExpandExpression.Empty);
+      var result = interpreter.CodeStack.Pop().Equals(PushProgram.Empty);
       interpreter.BooleanStack.Push(result);
 
@@ -724 +724 @@
       var position = -1;
       if (first.CanExpand) {
-        var expand = (ExecExpandExpression)first;
-        position = expand.State.Expressions.Count - 1
-                   - Array.FindIndex((Expression[])expand.State.Expressions, e => e.Equals(second));
+        var expand = (PushProgram)first;
+        position = expand.State.Length - 1
+                   - Array.FindIndex((Expression[])expand.State, e => e.Equals(second));
       } else if (first.Equals(second)) {
         position = 0;
@@ -748 +748 @@
       var expression = interpreter.CodeStack.Pop();
       var points = expression.CanExpand
-          ? ((ExecExpandExpression)expression).State.Expressions.Count
+          ? ((PushProgram)expression).State.Length
           : 1;
 
@@ -767 +767 @@
     public override bool Eval(IPushInterpreter interpreter) {
       if ((interpreter.CodeStack.Count < 3) || (interpreter.CodeStack.Top.GetType() !=
-                                                typeof(ExecExpandExpression))) return false;
+                                                typeof(PushProgram))) return false;
 
       var expressions = interpreter.CodeStack.Pop(2);
       var third = interpreter.CodeStack.Top;
       var second = expressions[0];
-      var first = expressions[1] as ExecExpandExpression;
-      var newExpressions = new Expression[first.State.Expressions.Count];
-
-      for (var i = 0; i < first.State.Expressions.Count; i++)
-        newExpressions[i] = first.State.Expressions[i].Equals(third)
+      var first = expressions[1] as PushProgram;
+      var newExpressions = new Expression[first.State.Length];
+
+      for (var i = 0; i < first.State.Length; i++)
+        newExpressions[i] = first.State[i].Equals(third)
             ? second
             /* no cloning needed here because first is removed and therefore newExpression is the only container of sub expressions */
-            : first.State.Expressions[i];
-
-      var result = new ExecExpandExpression(newExpressions);
+            : first.State[i];
+
+      var result = new PushProgram(newExpressions);
 
       interpreter.CodeStack.SetTop(result);