Voomra/trader
Archived
0
Fork 0
Code Activity

Compute minJumps on add vertex

Browse Source
This commit is contained in:
iMoHax
2015-06-30 16:30:39 +03:00
parent dff12cce49
commit 42bd77288c
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,21 +34,13 @@ public abstract class AbstractGraph<T> implements Graph<T> {
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);
root = getInstance(start, maxDeep); minJumps = 1;
root = getInstance(start, maxDeep, maxDeep);
POOL.invoke(createGraphBuilder(root, set, maxDeep - 1, limit)); POOL.invoke(createGraphBuilder(root, set, maxDeep - 1, limit));
if (set.size() > vertexes.size()){
minJumps = maxDeep;
} else {
minJumps = 1;
for (Vertex<T> vertex : vertexes) {
int jumps = maxDeep - vertex.getLevel();
if (jumps > minJumps) minJumps = jumps;
}
}
callback.endBuild(); callback.endBuild();
} }
private Vertex<T> getInstance(T entry, int deep){ private Vertex<T> getInstance(T entry, int level, int deep){
Vertex<T> vertex = getVertex(entry).orElse(null); Vertex<T> vertex = getVertex(entry).orElse(null);
if (vertex == null) { if (vertex == null) {
synchronized (vertexes){ synchronized (vertexes){
@@ -56,8 +48,11 @@ public abstract class AbstractGraph<T> implements Graph<T> {
if (vertex == null){ if (vertex == null){
LOG.trace("Is new vertex"); LOG.trace("Is new vertex");
vertex = new Vertex<>(entry, vertexes.size()); vertex = new Vertex<>(entry, vertexes.size());
vertex.setLevel(deep); vertex.setLevel(level);
vertexes.add(vertex); vertexes.add(vertex);
int jumps = root != null ? root.getLevel() - deep : 0;
if (jumps > minJumps)
minJumps = jumps;
} }
} }
} }
@@ -125,7 +120,7 @@ public abstract class AbstractGraph<T> implements Graph<T> {
double nextLimit = onConnect(entry); double nextLimit = onConnect(entry);
if (nextLimit >= 0) { if (nextLimit >= 0) {
LOG.trace("Connect {} to {}", vertex, entry); LOG.trace("Connect {} to {}", vertex, entry);
Vertex<T> next = getInstance(entry, 0); Vertex<T> next = getInstance(entry, 0, deep);
vertex.connect(createEdge(next)); vertex.connect(createEdge(next));
// If level > deep when vertex already added on upper deep // If level > deep when vertex already added on upper deep
if (next.getLevel() < deep) { if (next.getLevel() < deep) {