Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/DoCountExpressions.cs

Timestamp:

04/10/17 00:27:31 (7 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/DoCountExpressions.cs (modified) (4 diffs)

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

@@ -11 +11 @@
     protected DoCountExpression() { }
     protected DoCountExpression(LoopState state) : base(state) { }
-    protected override bool HasInsufficientArguments(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
+    protected override bool HasInsufficientArguments(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack) {
       return interpreter.IntegerStack.Count < 1 ||
              sourceStack.Count == 0 ||
@@ -17 +17 @@
     }
 
-    protected override LoopState InitState(IPushInterpreter interpreter, IStack<Expression> sourceStack) {
+    protected override LoopState InitState(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack) {
       var state = LoopState.Create(interpreter.PoolContainer.LoopStatePool,
         body: sourceStack.Pop(),
@@ -51 +51 @@
     public CodeDoCountExpression(LoopState state) : base(state) { }
 
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter, interpreter.CodeStack);
     }
 
-    protected override LoopExpression Clone(LoopState state, IPushInterpreter interpreter) {
+    protected override LoopExpression Clone(LoopState state, IInternalPushInterpreter interpreter) {
       var expression = interpreter.PoolContainer.GetStatefulExpression<CodeDoCountExpression>();
       expression.State = state;
@@ -83 +83 @@
     public ExecDoCountExpression(LoopState state) : base(state) { }
 
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter, interpreter.ExecStack);
     }
 
-    protected override LoopExpression Clone(LoopState state, IPushInterpreter interpreter) {
+    protected override LoopExpression Clone(LoopState state, IInternalPushInterpreter interpreter) {
       var expression = interpreter.PoolContainer.GetStatefulExpression<ExecDoCountExpression>();
       expression.State = state;