Voomra/trader
Archived
0
Fork 0
Code Activity

improve search if max size > SPLIT_SIZE

Browse Source
This commit is contained in:
iMoHax
2015-11-25 17:04:01 +03:00
parent 1b05da691c
commit 4b5931209e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/ru/trader/analysis/graph/Crawler.java
View File

@@ -516,6 +516,14 @@ public class Crawler<T> {
return true;
}
private boolean checkLimit(CostTraversalEntry entry, double nextLimit){
return !Double.isNaN(limit) && nextLimit >= limit && (entry.size() >= SPLIT_SIZE || nextLimit - limit > 1);
}
private double computeLimit(CostTraversalEntry entry){
return entry.getWeight();
}
private void search(){
curr = root;
LOG.trace("Start {}", root);
@@ -537,14 +545,18 @@ public class Crawler<T> {
nextEntry.sort();
}
curr = new CTEntrySupport(curr, nextEntry);
double nextLimit = computeLimit(nextEntry);
boolean stop = checkLimit(nextEntry, nextLimit);
if (isTarget){
LOG.trace("Found, add entry {} to queue", nextEntry);
targets.add(curr);
limit = Double.isNaN(limit) ? nextEntry.getWeight() : Math.min(limit, nextEntry.getWeight());
if (Double.isNaN(limit) || nextLimit < limit){
limit = nextLimit;
}
levelUp();
} else {
if (skip()) continue;
if (!Double.isNaN(limit) && nextEntry.getWeight() >= limit){
if (stop){
LOG.trace("Not found, limit {}, add entry {} to queue", limit, nextEntry);
queue.add(curr);
levelUp();