Voomra/trader
Archived
0
Fork 0
Code Activity

change type to RecursiveAction

Browse Source
This commit is contained in:
iMoHax
2015-06-30 11:29:11 +03:00
parent c7f405e67c
commit 82670ceaf2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/ru/trader/analysis/graph/AbstractGraph.java
View File

@@ -30,7 +30,7 @@ public abstract class AbstractGraph<T> implements Graph<T> {
vertexes = new CopyOnWriteArrayList<>(); vertexes = new CopyOnWriteArrayList<>();
} }
protected abstract GraphBuilder createGraphBuilder(Vertex<T> vertex, Collection<T> set, int deep, double limit); protected abstract RecursiveAction createGraphBuilder(Vertex<T> vertex, Collection<T> set, int deep, double limit);
public void build(T start, Collection<T> set, int maxDeep, double limit) { public void build(T start, Collection<T> set, int maxDeep, double limit) {
callback.startBuild(start); callback.startBuild(start);
@@ -109,14 +109,14 @@ public abstract class AbstractGraph<T> implements Graph<T> {
protected abstract double onConnect(T entry); protected abstract double onConnect(T entry);
protected abstract Edge<T> createEdge(Vertex<T> target); protected abstract Edge<T> createEdge(Vertex<T> target);
protected GraphBuilder createSubTask(Vertex<T> vertex, Collection<T> set, int deep, double limit){ protected RecursiveAction createSubTask(Vertex<T> vertex, Collection<T> set, int deep, double limit){
return createGraphBuilder(vertex, set, deep, limit); return createGraphBuilder(vertex, set, deep, limit);
} }
@Override @Override
protected void compute() { protected void compute() {
LOG.trace("Build graph from {}, limit {}, deep {}", vertex, limit, deep); LOG.trace("Build graph from {}, limit {}, deep {}", vertex, limit, deep);
ArrayList<GraphBuilder> subTasks = new ArrayList<>(THRESHOLD); ArrayList<RecursiveAction> subTasks = new ArrayList<>(THRESHOLD);
Iterator<T> iterator = set.iterator(); Iterator<T> iterator = set.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
if (callback.isCancel()) break; if (callback.isCancel()) break;
@@ -132,7 +132,7 @@ public abstract class AbstractGraph<T> implements Graph<T> {
next.setLevel(vertex.getLevel() - 1); next.setLevel(vertex.getLevel() - 1);
if (deep > 0) { if (deep > 0) {
//Recursive build //Recursive build
GraphBuilder task = createSubTask(next, set, deep - 1, nextLimit); RecursiveAction task = createSubTask(next, set, deep - 1, nextLimit);
task.fork(); task.fork();
subTasks.add(task); subTasks.add(task);
} }
@@ -141,7 +141,7 @@ public abstract class AbstractGraph<T> implements Graph<T> {
LOG.trace("Vertex {} is far away", entry); LOG.trace("Vertex {} is far away", entry);
} }
if (subTasks.size() == THRESHOLD || !iterator.hasNext()){ if (subTasks.size() == THRESHOLD || !iterator.hasNext()){
for (GraphBuilder subTask : subTasks) { for (RecursiveAction subTask : subTasks) {
if (callback.isCancel()){ if (callback.isCancel()){
subTask.cancel(true); subTask.cancel(true);
} else { } else {
@@ -152,7 +152,7 @@ public abstract class AbstractGraph<T> implements Graph<T> {
} }
} }
if (!subTasks.isEmpty()){ if (!subTasks.isEmpty()){
for (GraphBuilder subTask : subTasks) { for (RecursiveAction subTask : subTasks) {
if (callback.isCancel()){ if (callback.isCancel()){
subTask.cancel(true); subTask.cancel(true);
} else { } else {