Voomra/trader
Archived
0
Fork 0
Code Activity

save refill value in route entry

Browse Source
This commit is contained in:
iMoHax
2015-08-10 12:57:19 +03:00
parent 63282e68b0
commit 74bf560eb5
7 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,8 @@ public class RouteFillerTest extends Assert {
v2.addOffer(OFFER_TYPE.BUY, ITEM2, 350, -1);
v2.addOffer(OFFER_TYPE.BUY, ITEM3, 400, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
return route;
}
@@ -93,9 +93,9 @@ public class RouteFillerTest extends Assert {
v3.addOffer(OFFER_TYPE.BUY, ITEM2, 350, -1);
v3.addOffer(OFFER_TYPE.BUY, ITEM3, 400, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
route.add(new RouteEntry(v3, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
route.add(new RouteEntry(v3, 0, 0,0));
return route;
}
@@ -142,10 +142,10 @@ public class RouteFillerTest extends Assert {
v3.addOffer(OFFER_TYPE.BUY, ITEM1, 200, -1);
v4.addOffer(OFFER_TYPE.BUY, ITEM3, 450, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
route.add(new RouteEntry(v3, false, 0,0));
route.add(new RouteEntry(v4, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
route.add(new RouteEntry(v3, 0, 0,0));
route.add(new RouteEntry(v4, 0, 0,0));
return route;
}
@@ -224,11 +224,11 @@ public class RouteFillerTest extends Assert {
v4.addOffer(OFFER_TYPE.BUY, ITEM3, 370, -1);
v5.addOffer(OFFER_TYPE.BUY, ITEM1, 400, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
route.add(new RouteEntry(v3, false, 0,0));
route.add(new RouteEntry(v4, false, 0,0));
route.add(new RouteEntry(v5, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
route.add(new RouteEntry(v3, 0, 0,0));
route.add(new RouteEntry(v4, 0, 0,0));
route.add(new RouteEntry(v5, 0, 0,0));
return route;
}
@@ -287,10 +287,10 @@ public class RouteFillerTest extends Assert {
v3.addOffer(OFFER_TYPE.BUY, ITEM1, 200, -1);
v4.addOffer(OFFER_TYPE.BUY, ITEM3, 450, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
route.add(new RouteEntry(v3, false, 0,0));
route.add(new RouteEntry(v4, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
route.add(new RouteEntry(v3, 0, 0,0));
route.add(new RouteEntry(v4, 0, 0,0));
return route;
}
@@ -369,8 +369,8 @@ public class RouteFillerTest extends Assert {
v2.addOffer(OFFER_TYPE.BUY, ITEM2, 225, -1);
Route route = new Route(new RouteEntry(v1, false, 0,0));
route.add(new RouteEntry(v2, false, 0,0));
Route route = new Route(new RouteEntry(v1, 0, 0,0));
route.add(new RouteEntry(v2, 0, 0,0));
return route;
@@ -386,9 +386,9 @@ public class RouteFillerTest extends Assert {
v3.addOffer(OFFER_TYPE.BUY, ITEM1, 200, -1);
v4.addOffer(OFFER_TYPE.BUY, ITEM3, 450, -1);
Route route = new Route(new RouteEntry(v2, false, 0,0));
route.add(new RouteEntry(v3, false, 0,0));
route.add(new RouteEntry(v4, false, 0,0));
Route route = new Route(new RouteEntry(v2, 0, 0,0));
route.add(new RouteEntry(v3, 0, 0,0));
route.add(new RouteEntry(v4, 0, 0,0));
return route;
}

38
core/src/test/java/ru/trader/analysis/RouteSearcherTest.java
View File

@@ -64,13 +64,13 @@ public class RouteSearcherTest extends Assert{
LOG.info("Start test routes, 3 lands");
RouteSearcher searcher = new RouteSearcher(scorer);
Route route = new Route(new RouteEntry(ithaca_st, false, 3.3789702637348586d, 0));
route.add(new RouteEntry(morgor.asTransit(), false, 4.137765020523591d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), false, 4.0674474942172765d, 0));
route.add(new RouteEntry(lhs3262_st, true, 4.149937831634785d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), false, 4.1292528548103d, 0));
route.add(new RouteEntry(morgor.asTransit(), false, 3.3050364899848566, 0));
route.add(new RouteEntry(ithaca_st, false, 0, 0));
Route route = new Route(new RouteEntry(ithaca_st, 0, 3.3789702637348586d, 0));
route.add(new RouteEntry(morgor.asTransit(), 0, 4.137765020523591d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), 0, 4.0674474942172765d, 0));
route.add(new RouteEntry(lhs3262_st, 15, 4.149937831634785d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), 0, 4.1292528548103d, 0));
route.add(new RouteEntry(morgor.asTransit(), 0, 3.3050364899848566, 0));
route.add(new RouteEntry(ithaca_st, 0, 0, 0));
RouteFiller filler = new RouteFiller(scorer);
filler.fill(route);
@@ -88,17 +88,17 @@ public class RouteSearcherTest extends Assert{
LOG.info("Start test routes, 4 lands");
profile.setLands(4);
route = new Route(new RouteEntry(ithaca_st, false, 3.3789702637348586d, 0));
route.add(new RouteEntry(morgor.asTransit(), false, 4.137765020523591d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), false, 4.0674474942172765d, 0));
route.add(new RouteEntry(lhs3262_st, true, 0.644029909978323d, 0));
route.add(new RouteEntry(dnDraconis.asTransit(), false, 4.437544442558194d, 0));
route.add(new RouteEntry(cmDraco_st, false, 4.385307711185104d, 0));
route.add(new RouteEntry(dnDraconis.asTransit(), false, 0.6279317619086441d, 0));
route.add(new RouteEntry(lhs3262_st, true, 4.149937831634785d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), false, 4.1292528548103d, 0));
route.add(new RouteEntry(morgor.asTransit(), false, 3.3050364899848566, 0));
route.add(new RouteEntry(ithaca_st, false, 0, 0));
route = new Route(new RouteEntry(ithaca_st, 0, 3.3789702637348586d, 0));
route.add(new RouteEntry(morgor.asTransit(), 0, 4.137765020523591d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), 0, 4.0674474942172765d, 0));
route.add(new RouteEntry(lhs3262_st, 15, 0.644029909978323d, 0));
route.add(new RouteEntry(dnDraconis.asTransit(), 0, 4.437544442558194d, 0));
route.add(new RouteEntry(cmDraco_st, 0, 4.385307711185104d, 0));
route.add(new RouteEntry(dnDraconis.asTransit(), 0, 0.6279317619086441d, 0));
route.add(new RouteEntry(lhs3262_st, 15, 4.149937831634785d, 0));
route.add(new RouteEntry(lhs3006.asTransit(), 0, 4.1292528548103d, 0));
route.add(new RouteEntry(morgor.asTransit(), 0, 3.3050364899848566, 0));
route.add(new RouteEntry(ithaca_st, 0, 0, 0));
filler = new RouteFiller(scorer);
filler.fill(route);
@@ -108,7 +108,7 @@ public class RouteSearcherTest extends Assert{
apaths = searcher.getRoutes(ithaca_st, ithaca_st, fWorld.getMarkets(true).collect(Collectors.toList()));
actual = apaths.stream().findFirst().get();
assertEquals("Routes is different", route, actual);
assertEquals(route, actual);
}
}

12
core/src/test/java/ru/trader/analysis/RouteTest.java
View File

@@ -28,9 +28,9 @@ public class RouteTest extends Assert {
v3 = new SimpleVendor("v3",0,0,0);
v4 = new SimpleVendor("v4",0,0,0);
Route path = new Route(new RouteEntry(v1, false, 0,0));
path.add(new RouteEntry(v2, false, 0,0));
path.add(new RouteEntry(v3, false, 0,0));
Route path = new Route(new RouteEntry(v1, 0, 0,0));
path.add(new RouteEntry(v2, 0, 0,0));
path.add(new RouteEntry(v3, 0, 0,0));
TestUtil.assertCollectionContainAll(path.getVendors(), v1, v2, v3);
}
@@ -42,9 +42,9 @@ public class RouteTest extends Assert {
v3 = new SimpleVendor("v3",0,0,0);
v4 = new SimpleVendor("v4",0,0,0);
Route path = new Route(new RouteEntry(v1, false, 0,0));
path.add(new RouteEntry(v2, false, 0,0));
path.add(new RouteEntry(v3, false, 0,0));
Route path = new Route(new RouteEntry(v1, 0, 0,0));
path.add(new RouteEntry(v2, 0, 0,0));
path.add(new RouteEntry(v3, 0, 0,0));
Collection<Vendor> vendors = new ArrayList<>();
Collections.addAll(vendors, v1, v2, v3);
assertTrue(path.contains(vendors));

14
core/src/test/java/ru/trader/core/MarketAnalyzerTest2.java
View File

@@ -31,13 +31,13 @@ public class MarketAnalyzerTest2 extends Assert {
Vendor lhs3006 = market.get("LHS 3006").asTransit();
Vendor lhs3262 = market.get("LHS 3262").get().iterator().next();
Collection<Route> paths = analyzer.getRoutes(ithaca, ithaca);
Route expect = new Route(new RouteEntry(ithaca, false, 3.3789702637348586d, 0));
expect.add(new RouteEntry(morgor, false, 4.137765020523591d, 0));
expect.add(new RouteEntry(lhs3006, false, 4.0674474942172765d, 0));
expect.add(new RouteEntry(lhs3262, true, 4.149937831634785d, 0));
expect.add(new RouteEntry(lhs3006, false, 4.1292528548103d, 0));
expect.add(new RouteEntry(morgor, false, 3.3050364899848566, 0));
expect.add(new RouteEntry(ithaca, false, 0, 0));
Route expect = new Route(new RouteEntry(ithaca, 0, 3.3789702637348586d, 0));
expect.add(new RouteEntry(morgor, 0, 4.137765020523591d, 0));
expect.add(new RouteEntry(lhs3006, 0, 4.0674474942172765d, 0));
expect.add(new RouteEntry(lhs3262, 15, 4.149937831634785d, 0));
expect.add(new RouteEntry(lhs3006, 0, 4.1292528548103d, 0));
expect.add(new RouteEntry(morgor, 0, 3.3050364899848566, 0));
expect.add(new RouteEntry(ithaca, 0, 0, 0));
RouteFiller filler = new RouteFiller(new Scorer(fWorld, profile));
filler.fill(expect);