Voomra/trader
Archived
0
Fork 0
Code Activity

fix sort routers

Browse Source
This commit is contained in:
iMoHax
2014-08-25 17:42:11 +04:00
parent aa5f581df5
commit b3bd22b99d
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/ru/trader/graph/RouteGraph.java
View File

@@ -35,8 +35,8 @@ public class RouteGraph extends Graph<Vendor> {
route.sort(balance, limit); route.sort(balance, limit);
if (paths.size() == max){ if (paths.size() == max){
int index = Collections.binarySearch(paths, route, comparator); int index = Collections.binarySearch(paths, route, comparator);
if (index == -1) return false; if (index < 0) index = -1 - index;
if (index < -1) index = -1 - index; if (index == max) return false;
paths.add(index, path); paths.add(index, path);
paths.remove(max); paths.remove(max);

73
core/src/test/java/ru/trader/graph/RouteGraphTest.java Normal file
View File

@@ -0,0 +1,73 @@
package ru.trader.graph;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.core.*;
import java.util.ArrayList;
public class RouteGraphTest extends Assert {
private final static Logger LOG = LoggerFactory.getLogger(RouteGraphTest.class);
private final static Market market = new SimpleMarket();
private final static Item ITEM1 = new Item("ITEM1");
private final static Item ITEM2 = new Item("ITEM2");
private final static Item ITEM3 = new Item("ITEM3");
private static Vendor v1;
private static Vendor v2;
private static Vendor v3;
private static Vendor v4;
static {
v1 = new SimpleVendor("v1");
v2 = new SimpleVendor("v2");
v3 = new SimpleVendor("v3");
v4 = new SimpleVendor("v4");
v1.add(new Offer(OFFER_TYPE.SELL, ITEM1, 100));
v1.add(new Offer(OFFER_TYPE.SELL, ITEM2, 200));
v1.add(new Offer(OFFER_TYPE.SELL, ITEM3, 300));
v2.add(new Offer(OFFER_TYPE.SELL, ITEM1, 150));
v2.add(new Offer(OFFER_TYPE.SELL, ITEM3, 320));
v3.add(new Offer(OFFER_TYPE.SELL, ITEM3, 390));
v2.add(new Offer(OFFER_TYPE.BUY, ITEM2, 225));
v3.add(new Offer(OFFER_TYPE.BUY, ITEM1, 200));
v4.add(new Offer(OFFER_TYPE.BUY, ITEM3, 450));
market.add(v1);market.add(v2);market.add(v3);market.add(v4);
}
@Test
public void testRoutes() throws Exception {
RouteGraph graph = new RouteGraph(v1, market.get(), 1, 1, true, 4);
graph.setBalance(500);
graph.setLimit(5);
//Profit: 150 180 200 230 670 620 950 890 620 950 1015 1180 890 950 930
//Landings: 1 2 3 4 4 2 3 3 2 3 4 4 3 3 4
//Prof: 150 90 66.66 57.5 167.5 310 316.66 296.66 310 316.66 253.75 295 296.66 316.66 232.5
ArrayList<Path<Vendor>> routes = (ArrayList<Path<Vendor>>) graph.getPathsTo(v4, 5);
assertEquals(5, routes.size());
PathRoute path = (PathRoute) routes.get(0).getRoot();
assertEquals(950, path.getProfit(), 0.001);
assertEquals(3, path.getLandsCount());
path = (PathRoute) routes.get(1).getRoot();
assertEquals(950, path.getProfit(), 0.001);
assertEquals(3, path.getLandsCount());
path = (PathRoute) routes.get(2).getRoot();
assertEquals(950, path.getProfit(), 0.001);
assertEquals(3, path.getLandsCount());
path = (PathRoute) routes.get(3).getRoot();
assertEquals(620, path.getProfit(), 0.001);
assertEquals(2, path.getLandsCount());
path = (PathRoute) routes.get(4).getRoot();
assertEquals(620, path.getProfit(), 0.001);
assertEquals(2, path.getLandsCount());
}
}