Voomra/trader
Archived
0
Fork 0
Code Activity

add missions to route entry

Browse Source
This commit is contained in:
iMoHax
2015-09-25 16:21:57 +03:00
parent e0ab8d4629
commit 829e3ac5f5
9 changed files with 93 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,22 @@ public class Route implements Comparable<Route> {
return vendors;
}
public int find(Vendor vendor, int offset){
int size = entries.size();
for (int i = 0; i < size; i++) {
int index = i + offset;
if (index >= size){
if (isLoop()) index -= size;
else break;
}
RouteEntry entry = entries.get(index);
if (entry.is(vendor)){
return i;
}
}
return -1;
}
public boolean contains(Collection<Vendor> vendors){
return vendors.isEmpty()
|| vendors.size() <= entries.size()

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

@@ -395,7 +395,9 @@ public class RouteFiller {
return res;
}
public static void reservedCargo(final Route route, final int offset, Vendor target, long count, long cargo){
public static int reservedCargo(final Route route, final int offset, Vendor target, long count, long cargo){
//TODO: compute current cargo if already reserved
int lastIndex = -1;
List<RouteEntry> entries = route.getEntries();
int size = entries.size() - (route.isLoop() ? 1 : 0);
for (int i = 0; i < size; i++) {
@@ -403,7 +405,9 @@ public class RouteFiller {
if (index >= size) index -= size;
RouteEntry entry = entries.get(index);
if (entry.isTransit()) continue;
if (entry.is(target)) {
if (i > 0 && entry.is(target)) {
lastIndex = index;
if (index == 0 && route.isLoop()) lastIndex = size;
break;
}
long empty = cargo - entry.getCargo();
@@ -412,6 +416,7 @@ public class RouteFiller {
entry.reserve(need);
}
}
return lastIndex;
}
public static void fillCargo(final Route route, final int offset, Vendor target, long count){
@@ -443,7 +448,7 @@ public class RouteFiller {
}
}
public static void addOrders(final Route route, final int startEntry, final Offer buyOffer, final long cargo){
public static int addOrders(final Route route, final int startEntry, final Offer buyOffer, final long cargo){
final double[] profits = getLostProfits(route, startEntry, buyOffer.getVendor(), buyOffer.getCount(), cargo);
class SortHelper {
@@ -474,18 +479,23 @@ public class RouteFiller {
}
sortedEntries.sort((e1, e2) -> Double.compare(e1.getProfit(), e2.getProfit()));
int completeIndex = -1;
long need = buyOffer.getCount();
double balance = route.getBalance();
for (SortHelper helper : sortedEntries) {
RouteEntry entry = helper.entry;
if (helper.sell != null){
Order order = new Order(helper.sell.getSell(), buyOffer, balance, need);
reservedCargo(route, helper.index, buyOffer.getVendor(), order.getCount(), cargo);
int lastIndex = reservedCargo(route, helper.index, buyOffer.getVendor(), order.getCount(), cargo);
if (completeIndex == -1 || completeIndex+startEntry < completeIndex + startEntry){
completeIndex = lastIndex;
}
entry.addOrder(order);
need -= order.getCount();
if (need <= 0) break;
}
balance += entry.getProfit();
}
return completeIndex;
}
}

3
core/src/test/java/ru/trader/analysis/RouteFillerTest.java
View File

@@ -660,7 +660,8 @@ public class RouteFillerTest extends Assert {
/* v1 3x100 + 2x20 -> v2 5x50 -> v3 3x60 -> v4 5x20 -> v3 3x10 -> v1 */
Offer offer = SimpleOffer.fakeBuy(v2, ITEM3, 210, 3);
RouteFiller.addOrders(route, 1, offer, cargo);
int completeIndex = RouteFiller.addOrders(route, 1, offer, cargo);
assertEquals(1, completeIndex);
Order order1 = new Order(v1.getSell(ITEM2), v2.getBuy(ITEM2), 3);
Order order2 = new Order(v1.getSell(ITEM4), v2.getBuy(ITEM4), 1);