Voomra/trader
Archived
0
Fork 0
Code Activity

filtered vendors before build graph and specification

Browse Source
This commit is contained in:
Mo
2015-10-22 23:02:47 +03:00
parent a640bfaef9
commit e3cd83ed32
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/ru/trader/analysis/RouteSearcher.java
View File

@@ -11,6 +11,7 @@ import ru.trader.core.Vendor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class RouteSearcher { public class RouteSearcher {
private final static Logger LOG = LoggerFactory.getLogger(RouteSearcher.class); private final static Logger LOG = LoggerFactory.getLogger(RouteSearcher.class);
@@ -48,6 +49,7 @@ public class RouteSearcher {
LOG.trace("Start search path from {} to {} ", source, target); LOG.trace("Start search path from {} to {} ", source, target);
ConnectibleGraph<Place> graph = new ConnectibleGraph<>(profile, callback); ConnectibleGraph<Place> graph = new ConnectibleGraph<>(profile, callback);
LOG.trace("Build connectible graph"); LOG.trace("Build connectible graph");
places = filtered(source, places);
graph.build(source, places); graph.build(source, places);
LOG.trace("Graph is builds"); LOG.trace("Graph is builds");
List<List<Edge<Place>>> paths = new ArrayList<>(); List<List<Edge<Place>>> paths = new ArrayList<>();
@@ -67,6 +69,7 @@ public class RouteSearcher {
LOG.trace("Start search route from {} to {}", source, target); LOG.trace("Start search route from {} to {}", source, target);
VendorsGraph vGraph = new VendorsGraph(scorer, callback); VendorsGraph vGraph = new VendorsGraph(scorer, callback);
LOG.trace("Build vendors graph"); LOG.trace("Build vendors graph");
vendors = filtered(source, vendors);
vGraph.build(source, vendors); vGraph.build(source, vendors);
LOG.trace("Graph is builds"); LOG.trace("Graph is builds");
RouteCollector collector = new RouteCollector(); RouteCollector collector = new RouteCollector();
@@ -82,6 +85,7 @@ public class RouteSearcher {
LOG.trace("Start search loops from {}", source); LOG.trace("Start search loops from {}", source);
VendorsGraph vGraph = new VendorsGraph(scorer, callback); VendorsGraph vGraph = new VendorsGraph(scorer, callback);
LOG.trace("Build vendors graph"); LOG.trace("Build vendors graph");
vendors = filtered(source, vendors);
vGraph.build(source, vendors); vGraph.build(source, vendors);
LOG.trace("Graph is builds"); LOG.trace("Graph is builds");
RouteCollector collector = new RouteCollector(); RouteCollector collector = new RouteCollector();
@@ -106,6 +110,11 @@ public class RouteSearcher {
return routes; return routes;
} }
protected <T extends Connectable<T>> Collection<T> filtered(T from, Collection<T> set){
final double maxDistance = scorer.getProfile().getShip().getMaxJumpRange() * scorer.getProfile().getJumps();
return set.parallelStream().filter(v -> from.getDistance(v) <= maxDistance).collect(Collectors.toList());
}
private class RouteCollector { private class RouteCollector {
private List<Route> routes = new ArrayList<>(); private List<Route> routes = new ArrayList<>();