implement offers crawler builder

core/src/main/java/ru/trader/analysis/CrawlerSpecificator.java

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class CrawlerSpecificator {
     private final List<Vendor> any;
@@ -69,17 +70,33 @@ public class CrawlerSpecificator {
         this.groupCount = groupCount;
     }
 
-    public VendorsCrawlerSpecification build(Consumer<List<Edge<Vendor>>> onFoundFunc, RouteSpecification<Vendor> andSpec, boolean loop){
+    private RouteSpecification<Vendor> buildOffersSpec(Collection<Vendor> vendors){
+        RouteSpecification<Vendor> res = null;
+        for (Offer offer : offers) {
+            List<Vendor> sellers = vendors.stream().filter(v -> {
+                Offer sell = v.getSell(offer.getItem());
+                return sell != null && sell.getCount() >= offer.getCount();
+            }).collect(Collectors.toList());
+            if (res != null){
+                res = res.and(RouteSpecificationByTargets.containAny(sellers));
+            } else {
+                res = RouteSpecificationByTargets.containAny(sellers);
+            }
+        }
+        return res;
+    }
+
+    public VendorsCrawlerSpecification build(Collection<Vendor> vendors, Consumer<List<Edge<Vendor>>> onFoundFunc, RouteSpecification<Vendor> andSpec, boolean loop){
         RouteSpecification<Vendor> spec;
         RouteSpecification<Vendor> res = null;
         if (!all.isEmpty()){
-            spec = all.size() > 1 ? RouteSpecificationByTargets.all(all) : new RouteSpecificationByTarget<>(all.get(0));
+            spec = RouteSpecificationByTargets.all(all);
             res = spec;
         }
         if (!any.isEmpty()){
             spec = any.size() > 1 ? RouteSpecificationByTargets.any(any) : new RouteSpecificationByTarget<>(any.get(0));
             if (res != null){
-                res.and(spec);
+                res = res.and(spec);
             } else {
                 res = spec;
             }
@@ -87,14 +104,22 @@ public class CrawlerSpecificator {
         if (!containsAny.isEmpty()){
             spec = RouteSpecificationByTargets.containAny(containsAny);
             if (res != null){
-                res.and(spec);
+                res = res.and(spec);
+            } else {
+                res = spec;
+            }
+        }
+        if (!offers.isEmpty()){
+            spec = buildOffersSpec(vendors);
+            if (res != null){
+                res = res.and(spec);
             } else {
                 res = spec;
             }
         }
         if (andSpec != null){
             if (res != null){
-                res.and(andSpec);
+                res = res.and(andSpec);
             } else {
                 res = andSpec;
             }
@@ -109,8 +134,8 @@ public class CrawlerSpecificator {
         return (VendorsCrawlerSpecification) crawlerSpecification;
     }
 
-    public VendorsCrawlerSpecification build(Consumer<List<Edge<Vendor>>> onFoundFunc){
-        return build(onFoundFunc, null, false);
+    public VendorsCrawlerSpecification build(Collection<Vendor> vendors, Consumer<List<Edge<Vendor>>> onFoundFunc){
+        return build(vendors, onFoundFunc, null, false);
     }
 
 }

core/src/main/java/ru/trader/analysis/Route.java

@@ -76,6 +76,10 @@ public class Route implements Comparable<Route> {
         return profit / time;
     }
 
+    public int getJumps(){
+        return entries.size();
+    }
+
     public void add(RouteEntry entry){
         LOG.trace("Add entry {} to route {}", entry, this);
         entries.add(entry);

core/src/main/java/ru/trader/analysis/RouteSearcher.java

@@ -103,7 +103,7 @@ public class RouteSearcher {
         vGraph.build(source, vendors);
         LOG.trace("Graph is builds");
         RouteCollector collector = new RouteCollector();
-        Crawler<Vendor> crawler = vGraph.crawler(specificator.build(collector::add), callback);
+        Crawler<Vendor> crawler = vGraph.crawler(specificator.build(vendors, collector::add), callback);
         crawler.setMaxSize(scorer.getProfile().getLands());
         crawler.findMin(target, count);
         return collector.get();
@@ -117,10 +117,10 @@ public class RouteSearcher {
         LOG.trace("Graph is builds");
         RouteCollector collector = new RouteCollector();
         specificator.setGroupCount(vendors.size());
-        Crawler<Vendor> crawler = vGraph.crawler(specificator.build(collector::add, new LoopRouteSpecification<>(true), true), callback);
+        Crawler<Vendor> crawler = vGraph.crawler(specificator.build(vendors, collector::add, new LoopRouteSpecification<>(true), true), callback);
         crawler.setMaxSize(scorer.getProfile().getLands());
         crawler.findMin(source, vendors.size());
-        crawler = vGraph.crawler(specificator.build(collector::add, new RouteSpecificationByTarget<>(source), false), callback);
+        crawler = vGraph.crawler(specificator.build(vendors, collector::add, new RouteSpecificationByTarget<>(source), false), callback);
         crawler.setMaxSize(scorer.getProfile().getLands());
         crawler.findMin(source, 1);
         List<Route> routes = collector.get();

core/src/main/java/ru/trader/analysis/RouteSpecificationByTargets.java

@@ -28,7 +28,7 @@ public class RouteSpecificationByTargets<T> implements RouteSpecification<T> {
         Collection<T> set = new ArrayList<>(targets.size());
         set.add(obj);
         entry.routeIterator().forEachRemaining(e -> set.add(e.getTarget().getEntry()));
-        return targets.containsAll(set);
+        return set.containsAll(targets);
     }
 
     private boolean containsAny(Edge<T> edge, Traversal<T> entry) {