Voomra/trader
Archived
0
Fork 0
Code Activity

fix path profit if seller and buyer is once vendor

Browse Source
This commit is contained in:
iMoHax
2015-01-09 18:58:56 +03:00
parent e8a755c6f8
commit 72ea67a20b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ public class PathRoute extends Path<Vendor> {
Offer buy = buyer.getBuy(sell.getItem()); Offer buy = buyer.getBuy(sell.getItem());
if (buy != null){ if (buy != null){
Order order = new Order(sell, buy, 1); Order order = new Order(sell, buy, 1);
if (order.getProfit() < 0) { if (order.getProfit() <= 0) {
LOG.trace("{} - is no profit, skip", order); LOG.trace("{} - is no profit, skip", order);
} else { } else {
addOrder(order); addOrder(order);
@@ -270,9 +270,15 @@ public class PathRoute extends Path<Vendor> {
} }
public double getProfit(Order order){ public double getProfit(Order order){
return getProfit(order, true);
}
private double getProfit(Order order, boolean first){
if (order == TRANSIT) return getTransitProfit(); if (order == TRANSIT) return getTransitProfit();
if (isPathFrom(order.getBuyer())) return order.getProfit() + profit; if (isPathFrom(order.getBuyer())) {
return hasNext() ? getNext().getProfit(order) : order.getProfit(); return first ? order.getProfit() : order.getProfit() + profit;
}
return hasNext() ? getNext().getProfit(order, false) : order.getProfit();
} }
private int simpleCompareOrders(Order o1, Order o2){ private int simpleCompareOrders(Order o1, Order o2){