Voomra/trader
Archived
0
Fork 0
Code Activity

copy orders and dont add no profit order in MarketUtils

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

15
core/src/main/java/ru/trader/analysis/MarketUtils.java
View File

@@ -14,15 +14,16 @@ public class MarketUtils {
private final static Logger LOG = LoggerFactory.getLogger(MarketUtils.class); private final static Logger LOG = LoggerFactory.getLogger(MarketUtils.class);
public static List<Order> getStack(List<Order> orders, double balance, long cargo){ public static List<Order> getStack(List<Order> orders, double balance, long cargo){
LOG.trace("Fill stack orders {}, balance {}", orders, balance); List<Order> o = new ArrayList<>(orders);
orders.forEach(o -> o.setMax(balance, cargo)); LOG.trace("Fill stack orders {}, balance {}", o, balance);
o.forEach(or -> or.setMax(balance, cargo));
LOG.trace("Simple sort"); LOG.trace("Simple sort");
orders.sort(Comparator.<Order>reverseOrder()); o.sort(Comparator.<Order>reverseOrder());
LOG.trace("New order of orders {}", orders); LOG.trace("New order of orders {}", o);
List<Order> stack = new ArrayList<>(); List<Order> stack = new ArrayList<>();
long count = cargo; long count = cargo;
double remain = balance; double remain = balance;
for (Order order : orders) { for (Order order : o) {
order = new Order(order.getSell(), order.getBuy(), remain, count); order = new Order(order.getSell(), order.getBuy(), remain, count);
LOG.trace("Next best order {}", order); LOG.trace("Next best order {}", order);
if (order.getProfit() > 0) { if (order.getProfit() > 0) {
@@ -49,7 +50,9 @@ public class MarketUtils {
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);
orders.add(order); if (order.getProfit() > 0){
orders.add(order);
}
} }
} }
return orders; return orders;