Voomra/trader
Archived
0
Fork 0
Code Activity

fix throw exception if from place don't have stations

Browse Source
This commit is contained in:
iMoHax
2015-08-03 16:32:54 +03:00
parent cf59873bdd
commit e499d98e58
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ public class VendorsGraph extends ConnectibleGraph<Vendor> {
assert vertex.getEntry() instanceof TransitVendor && !(target.getEntry() instanceof TransitVendor); assert vertex.getEntry() instanceof TransitVendor && !(target.getEntry() instanceof TransitVendor);
VendorsGraphBuilder h = this; VendorsGraphBuilder h = this;
Path<Vendor> path = new Path<>(Collections.singleton(lastEdge)); Path<Vendor> path = new Path<>(Collections.singleton(lastEdge));
while (h != null){ while (h != null && h.edge != null){
if (callback.isCancel()) break; if (callback.isCancel()) break;
BuildEdge cEdge = h.edge; BuildEdge cEdge = h.edge;
Vertex<Vendor> source = cEdge.getSource(); Vertex<Vendor> source = cEdge.getSource();
@@ -203,7 +203,7 @@ public class VendorsGraph extends ConnectibleGraph<Vendor> {
while (path != null){ while (path != null){
if (callback.isCancel()) break; if (callback.isCancel()) break;
VendorsGraphBuilder h = this; VendorsGraphBuilder h = this;
while (h != null){ while (h != null && h.edge != null){
if (callback.isCancel()) break; if (callback.isCancel()) break;
if (h.limit >= path.getMinFuel() && h.limit <= path.getMaxFuel()){ if (h.limit >= path.getMinFuel() && h.limit <= path.getMaxFuel()){
BuildEdge cEdge = h.edge; BuildEdge cEdge = h.edge;

6
core/src/main/java/ru/trader/core/MarketAnalyzer.java
View File

@@ -264,7 +264,11 @@ public class MarketAnalyzer {
} }
private List<Vendor> getVendors(Place place){ private List<Vendor> getVendors(Place place){
return market.getVendors(place).collect(Collectors.toList()); List<Vendor> vendors = market.getVendors(place).collect(Collectors.toList());
if (vendors.isEmpty()){
vendors = Collections.singletonList(place.asTransit());
}
return vendors;
} }
public MarketAnalyzer changeCallBack(AnalysisCallBack callback){ public MarketAnalyzer changeCallBack(AnalysisCallBack callback){