DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2026-01-28 01:25:19 +00:00
Code Issues Releases Wiki Activity

Plugin fixes

Browse Source
This commit is contained in:
Riley Jones
2017-08-03 15:16:26 -07:00
parent dad546c5b5
commit 9d5f9d901c
5 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/nwapw/abacus/tree/BinaryNode.java
View File

@@ -95,12 +95,8 @@ public class BinaryNode extends TreeNode {
if(Thread.currentThread().isInterrupted())
return null;
T leftReduce = left.reduce(reducer);
if(Thread.currentThread().isInterrupted())
return null;
T rightReduce = right.reduce(reducer);
if (leftReduce == null || rightReduce == null) return null;
if(Thread.currentThread().isInterrupted())
return null;
T a = reducer.reduceNode(this, leftReduce, rightReduce);
if(Thread.currentThread().isInterrupted())
return null;

5
src/main/java/org/nwapw/abacus/tree/FunctionNode.java
View File

@@ -67,11 +67,8 @@ public class FunctionNode extends TreeNode {
Object[] reducedChildren = new Object[children.size()];
for (int i = 0; i < reducedChildren.length; i++) {
reducedChildren[i] = children.get(i).reduce(reducer);
if (reducedChildren[i] == null) return null;
if (Thread.currentThread().isInterrupted()||reducedChildren[i] == null) return null;
}
//System.out.println(Thread.currentThread().isInterrupted());
if(Thread.currentThread().isInterrupted())
return null;
T a = reducer.reduceNode(this, reducedChildren);
if(Thread.currentThread().isInterrupted())
return null;

2
src/main/java/org/nwapw/abacus/tree/UnaryNode.java
View File

@@ -37,8 +37,6 @@ public class UnaryNode extends TreeNode {
return null;
Object reducedChild = applyTo.reduce(reducer);
if (reducedChild == null) return null;
if(Thread.currentThread().isInterrupted())
return null;
T a = reducer.reduceNode(this, reducedChild);
if(Thread.currentThread().isInterrupted())
return null;