Voomra/trader
Archived
0
Fork 0
Code Activity

fix route filler

Browse Source
This commit is contained in:
iMoHax
2015-06-23 17:56:22 +03:00
parent 88fc864188
commit 48fa67a7fa
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/ru/trader/analysis/RouteFiller.java
View File

@@ -74,12 +74,10 @@ public class RouteFiller {
LOG.trace("Start backward sort"); LOG.trace("Start backward sort");
for (int i = oList.size() - 1; i >= 0; i--) { for (int i = oList.size() - 1; i >= 0; i--) {
OEntry entry = oList.get(i); OEntry entry = oList.get(i);
OrderStack best = entry.getBest();
final int nextIndex = i+1; final int nextIndex = i+1;
entry.setLands(getLands(best, nextIndex) + (best != TRANSIT || entry.refill ? 1 : 0));
BackwardComparator comparator = new BackwardComparator(nextIndex); BackwardComparator comparator = new BackwardComparator(nextIndex);
entry.sort(comparator); entry.sort(comparator);
best = entry.getBest(); OrderStack best = entry.getBest();
entry.setFullScore(comparator.getScore(best)); entry.setFullScore(comparator.getScore(best));
entry.setLands(getLands(best, nextIndex) + (best != TRANSIT || entry.refill ? 1 : 0)); entry.setLands(getLands(best, nextIndex) + (best != TRANSIT || entry.refill ? 1 : 0));
} }
@@ -148,7 +146,7 @@ public class RouteFiller {
if (order == TRANSIT) return oList.get(startIndex).score; if (order == TRANSIT) return oList.get(startIndex).score;
int index = getIndex(order.getBuyer(), startIndex); int index = getIndex(order.getBuyer(), startIndex);
if (index > 0) { if (index > 0) {
return oList.get(index).score + getScore(order, index); return oList.get(index).score + getScore(order, startIndex);
} }
return 0; return 0;
} }