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

Timestamp:

03/11/17 20:07:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 PooledPushProgram reduces memory usage and increases performance

File:

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

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

@@ -108 +108 @@
       var second = interpreter.CodeStack.Top;
 
-      var isFirstList = first.CanExpand;
-      var isSecondList = second.CanExpand;
-
-      Expression[] result = null;
+      var isFirstList = first.IsProgram;
+      var isSecondList = second.IsProgram;
+
+      PushProgram result;
 
       if (isFirstList) {
-        var expand1 = first as PushProgram;
+        var program1 = first as PushProgram;
 
         if (isSecondList) {
-          var expand2 = second as PushProgram;
-          var size = expand2.State.Length + expand1.State.Length;
+          var program2 = second as PushProgram;
+          var size = program2.Expressions.Count + program1.Expressions.Count;
 
           // if size > maxPointsInProgram this expressions results in a NOOP
           if (size > interpreter.Configuration.MaxPointsInProgram) return false;
 
-          result = new Expression[size];
-
-          Array.Copy(expand2.State, result, expand2.State.Length);
-          Array.Copy(
-              expand1.State,
-              0,
-              result,
-              expand2.State.Length,
-              expand1.State.Length);
+          result = PushProgram.Merge(interpreter.PushProgramPool, program2, program1);
         } else {
-          var size = expand1.State.Length + 1;
+          var size = program1.Expressions.Count + 1;
 
           // if size > maxPointsInProgram this expressions results in a NOOP
           if (size > interpreter.Configuration.MaxPointsInProgram) return false;
 
-          result = new Expression[size];
-          result[0] = second;
-
-          Array.Copy(expand1.State, 0, result, 1, expand1.State.Length);
+          result = PushProgram.Merge(interpreter.PushProgramPool, second, program1);
         }
       } else if (isSecondList) {
-        var expand2 = second as PushProgram;
-
-        var size = expand2.State.Length + 1;
+        var program2 = second as PushProgram;
+        var size = program2.Expressions.Count + 1;
 
         // if size > maxPointsInProgram this expressions results in a NOOP
         if (size > interpreter.Configuration.MaxPointsInProgram) return false;
 
-        result = new Expression[size];
-        result[0] = first;
-
-        Array.Copy(expand2.State as Expression[], 0, result, 1, expand2.State.Length);
+        result = PushProgram.Merge(interpreter.PushProgramPool, first, program2);
       } else {
-        result = new[] { second, first };
+        result = PushProgram.Create(interpreter.PushProgramPool, second, first);
       }
 
-      var expression = new PushProgram(result);
-
-      interpreter.CodeStack.SetTop(expression);
+      interpreter.CodeStack.SetTop(result);
 
       return true;
@@ -177 +160 @@
 
       var expression = interpreter.CodeStack.Pop();
-      var isExpandExpression = expression.CanExpand;
+      var isExpandExpression = expression.IsProgram;
 
       interpreter.BooleanStack.Push(!isExpandExpression);
@@ -199 +182 @@
 
       if (expand.IsEmpty) return false;
-      var first = expand.State[expand.State.Length - 1];
+      var first = expand.Expressions[expand.Expressions.Count - 1];
 
       interpreter.CodeStack.SetTop(first);
@@ -217 +200 @@
       if (interpreter.CodeStack.Count == 0) return false;
 
-      PushProgram expandExpression;
+      PushProgram result;
       var top = interpreter.CodeStack.Top;
 
-      if (top.CanExpand) {
-        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, 0, newExpressions, 0, length);
-
-        expandExpression = new PushProgram(newExpressions);
+      if (top.IsProgram) {
+        var program = (PushProgram)top;
+
+        if (program.IsEmpty) return false;
+
+        result = program.Copy(interpreter.PushProgramPool, 0, program.Expressions.Count - 1);
       } else {
-        expandExpression = PushProgram.Empty;
+        result = PushProgram.Empty;
       }
 
-      interpreter.CodeStack.SetTop(expandExpression);
+      interpreter.CodeStack.SetTop(result);
       return true;
     }
@@ -252 +231 @@
       PushProgram result;
 
-      if (interpreter.CodeStack.Top.CanExpand) {
+      if (interpreter.CodeStack.Top.IsProgram) {
         var first = (PushProgram)interpreter.CodeStack.Pop();
-        var size = first.State.Length + 1;
+        var size = first.Expressions.Count + 1;
 
         if (size > interpreter.Configuration.MaxPointsInProgram) return false;
@@ -260 +239 @@
         var expressions = new Expression[size];
 
-        expressions[first.State.Length] = interpreter.CodeStack.Top;
-        Array.Copy(first.State as Expression[], expressions, first.State.Length);
-
-        result = new PushProgram(expressions);
+        first.CopyExpressionsTo(expressions);
+        expressions[first.Expressions.Count] = interpreter.CodeStack.Top;
+
+        result = PushProgram.Create(interpreter.PushProgramPool, expressions);
       } else {
-        result = new PushProgram(interpreter.CodeStack.Pop(), interpreter.CodeStack.Top);
+        result = PushProgram.Create(interpreter.PushProgramPool, interpreter.CodeStack.Top);
       }
 
@@ -303 +282 @@
 
       var subContainer =
-          current.State.Where(e => e.CanExpand)
+          current.Expressions.Where(e => e.IsProgram)
               .Select(e => GetContainer(e as PushProgram, target))
               .Where(e => e != null);
@@ -309 +288 @@
       var execExpandExpressions = subContainer as IList<PushProgram> ?? subContainer.ToList();
       return execExpandExpressions.Any()
-          ? execExpandExpressions.OrderBy(c => c.State.Length).LastOrDefault()
-          : current.State.Contains(target)
+          ? execExpandExpressions.OrderBy(c => c.Expressions.Count).LastOrDefault()
+          : current.Expressions.Contains(target)
               ? current
               : null;
@@ -324 +303 @@
     public override bool Eval(IPushInterpreter interpreter) {
       if (interpreter.CodeStack.Count < 2 ||
-         !interpreter.CodeStack[interpreter.CodeStack.Count - 2].CanExpand)
+         !interpreter.CodeStack[interpreter.CodeStack.Count - 2].IsProgram)
         return false;
 
       var values = interpreter.CodeStack.Pop(2);
       var second = (PushProgram)values[0];
-      var contains = second.State.Contains(values[1]);
+      var contains = second.Expressions.Contains(values[1]);
 
       interpreter.BooleanStack.Push(contains);
@@ -413 +392 @@
 
     private void DetermineUniqueItems(Expression source, IDictionary<int, int> items) {
-      if (source.CanExpand) {
-        var expand = source as PushProgram;
-
-        foreach (var e in expand.State) {
-          var id = e.GetHashCode();
+      if (source.IsProgram) {
+        var program = source as PushProgram;
+        var expressions = program.Expressions;
+
+        for (var i = 0; i < expressions.Count; i++) {
+          var id = expressions[i].GetHashCode();
           if (!items.ContainsKey(id)) items.Add(id, 1);
           else items[id]++;
@@ -442 +422 @@
       if (interpreter.IntegerStack.Count == 0 ||
           interpreter.CodeStack.Count == 0 ||
-          !interpreter.CodeStack.Top.CanExpand)
+          !interpreter.CodeStack.Top.IsProgram)
         return false;
 
@@ -532 +512 @@
       if (interpreter.IntegerStack.Count == 0 ||
           interpreter.CodeStack.Count < 2 ||
-          !interpreter.CodeStack.Top.CanExpand)
+          !interpreter.CodeStack.Top.IsProgram)
         return false;
 
@@ -540 +520 @@
 
       Expression[] newExpressions;
-      if (target.State.Length > 0) {
-        index = target.State.Length - 1 - Math.Abs(index % target.State.Length);
+      if (!target.IsEmpty) {
+        index = target.Expressions.Count - 1 - Math.Abs(index % target.Expressions.Count);
 
         newExpressions = target.CopyExpressions();
-        newExpressions[index] = source.CanExpand
-            ? ((PushProgram)source).Copy()
+        newExpressions[index] = source.IsProgram
+            ? ((PushProgram)source).Copy(interpreter.PushProgramPool)
             : source;
       } else {
@@ -551 +531 @@
       }
 
-      var result = new PushProgram(newExpressions);
+      var result = PushProgram.Create(interpreter.PushProgramPool, newExpressions);
       interpreter.CodeStack.SetTop(result);
 
@@ -572 +552 @@
       var count = 1;
 
-      if (expression.CanExpand)
-        count = ((PushProgram)expression).State.Length;
+      if (expression.IsProgram)
+        count = ((PushProgram)expression).Expressions.Count;
 
       interpreter.IntegerStack.Push(count);
@@ -591 +571 @@
       var first = interpreter.CodeStack.Pop();
       var second = interpreter.CodeStack.Top;
-      var expandExpression = new PushProgram(second, first);
+      var expandExpression = PushProgram.Create(interpreter.PushProgramPool, second, first);
 
       interpreter.CodeStack.SetTop(expandExpression);
@@ -610 +590 @@
       var expressions = interpreter.CodeStack.Pop(2);
 
-      var contains = expressions[1].CanExpand
-          ? ((PushProgram)expressions[1]).State.Contains(expressions[0])
+      var contains = expressions[1].IsProgram
+          ? ((PushProgram)expressions[1]).Expressions.Contains(expressions[0])
           : expressions[1].Equals(expressions[0]);
 
@@ -635 +615 @@
       Expression nthExpression;
 
-      if (expression.CanExpand) {
+      if (expression.IsProgram) {
         var subExpression = (PushProgram)expression;
 
@@ -641 +621 @@
           nthExpression = PushProgram.Empty;
         } else {
-          var index = (int)(subExpression.State.Length - 1 -
-                             Math.Abs(n % subExpression.State.Length));
-
-          nthExpression = subExpression.State[index];
+          var index = (int)(subExpression.Expressions.Count - 1 - Math.Abs(n % subExpression.Expressions.Count));
+
+          nthExpression = subExpression.Expressions[index];
         }
       } else {
@@ -674 +653 @@
       Expression nthExpression;
 
-      if (expression.CanExpand) {
-        var subExpressions = ((PushProgram)expression).State;
-
-        if (subExpressions.Length < 2) {
+      if (expression.IsProgram) {
+        var subExpressions = ((PushProgram)expression).Expressions;
+
+        if (subExpressions.Count < 2) {
           nthExpression = PushProgram.Empty;
         } else {
-          var index = (int)(subExpressions.Length - 2 - Math.Abs(n % (subExpressions.Length - 1)));
+          var index = (int)(subExpressions.Count - 2 - Math.Abs(n % (subExpressions.Count - 1)));
 
           nthExpression = subExpressions[index];
@@ -723 +702 @@
 
       var position = -1;
-      if (first.CanExpand) {
-        var expand = (PushProgram)first;
-        position = expand.State.Length - 1
-                   - Array.FindIndex((Expression[])expand.State, e => e.Equals(second));
+      if (first.IsProgram) {
+        var program = (PushProgram)first;
+        position = program.Expressions.Count - 1 - program.IndexOf(second);
       } else if (first.Equals(second)) {
         position = 0;
@@ -747 +725 @@
 
       var expression = interpreter.CodeStack.Pop();
-      var points = expression.CanExpand
-          ? ((PushProgram)expression).State.Length
+      var points = expression.IsProgram
+          ? ((PushProgram)expression).Expressions.Count
           : 1;
 
@@ -773 +751 @@
       var second = expressions[0];
       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)
+      var firstExpressions = first.Expressions;
+      var newExpressions = new Expression[firstExpressions.Count];
+
+      for (var i = 0; i < firstExpressions.Count; i++)
+        newExpressions[i] = firstExpressions[i].Equals(third)
             ? second
             /* no cloning needed here because first is removed and therefore newExpression is the only container of sub expressions */
-            : first.State[i];
-
-      var result = new PushProgram(newExpressions);
+            : firstExpressions[i];
+
+      var result = PushProgram.Create(interpreter.PushProgramPool, newExpressions);
 
       interpreter.CodeStack.SetTop(result);