Voomra/trader
Archived
0
Fork 0
Code Activity

fix search if source don't have markets

Browse Source
This commit is contained in:
iMoHax
2016-03-03 15:32:47 +03:00
parent 0a0ae48403
commit df87b9e95f
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/ru/trader/analysis/MarketUtils.java
View File

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.core.Offer;
import ru.trader.core.Order;
import ru.trader.core.SERVICE_TYPE;
import ru.trader.core.Vendor;
import java.util.ArrayList;
@@ -58,4 +59,8 @@ public class MarketUtils {
}
return orders;
}
public static boolean hasMarket(Vendor vendor) {
return vendor.has(SERVICE_TYPE.MARKET) || vendor.has(SERVICE_TYPE.BLACK_MARKET);
}
}

5
core/src/main/java/ru/trader/analysis/VendorsCrawler.java
View File

@@ -73,7 +73,10 @@ public class VendorsCrawler extends Crawler<Vendor> {
protected boolean check(Edge<Vendor> e){
VendorsGraph.VendorsBuildEdge edge = (VendorsGraph.VendorsBuildEdge) e;
return fuel <= edge.getMaxFuel() && (fuel >= edge.getMinFuel() || edge.getSource().getEntry().canRefill())
&& (edge.getProfit() > 0 || VendorsCrawler.this.isContent(edge, this));
&& (edge.getProfit() > 0 || VendorsCrawler.this.isContent(edge, this)
// adding all edges if this start entry and don't have market
|| (isStart() && !MarketUtils.hasMarket(vertex.getEntry()))
);
}
protected VendorsEdge wrap(Edge<Vendor> e) {

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

@@ -701,6 +701,10 @@ public class Crawler<T> {
return size;
}
public boolean isStart(){
return head == null && edge == null;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("{");