Voomra/trader
Archived
0
Fork 0
Code Activity

check buyer after seller on route search by offer

Browse Source
This commit is contained in:
iMoHax
2015-09-10 15:14:57 +03:00
parent 5a658ce90a
commit 448e5b1763
5 changed files with 178 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,9 +97,9 @@ public class CrawlerSpecificator {
return sell != null && sell.getCount() >= offer.getCount();
}).collect(Collectors.toList());
if (res != null){
res = res.and(RouteSpecificationByTargets.containAny(sellers));
res = res.and(new RouteSpecificationByPair<>(sellers, offer.getVendor()));
} else {
res = RouteSpecificationByTargets.containAny(sellers);
res = new RouteSpecificationByPair<>(sellers, offer.getVendor());
}
}
return res;

71
core/src/main/java/ru/trader/analysis/RouteSpecification.java
View File

@@ -13,8 +13,12 @@ public interface RouteSpecification<T> {
public default boolean updateMutated(){return false;}
public default boolean mutable(){return false;}
public default void update(Traversal<T> entry){}
public default void onAnd(RouteSpecification<T> other){}
public default void onOr(RouteSpecification<T> other){}
default RouteSpecification<T> and(final RouteSpecification<T> other){
this.onAnd(other);
other.onAnd(this);
return new RouteSpecification<T>() {
@Override
public boolean specified(Edge<T> edge, Traversal<T> entry) {
@@ -46,10 +50,23 @@ public interface RouteSpecification<T> {
RouteSpecification.this.update(entry);
other.update(entry);
}
@Override
public void onAnd(RouteSpecification<T> specification) {
RouteSpecification.this.onAnd(specification);
other.onAnd(specification);
}
@Override
public void onOr(RouteSpecification<T> specification) {
RouteSpecification.this.onOr(specification);
other.onOr(specification);
}
};
}
default RouteSpecification<T> or(final RouteSpecification<T> other){
this.onOr(other);
return new RouteSpecification<T>() {
@Override
public boolean specified(Edge<T> edge, Traversal<T> entry) {
@@ -80,10 +97,62 @@ public interface RouteSpecification<T> {
RouteSpecification.this.update(entry);
other.update(entry);
}
@Override
public void onAnd(RouteSpecification<T> specification) {
RouteSpecification.this.onAnd(specification);
other.onAnd(specification);
}
@Override
public void onOr(RouteSpecification<T> specification) {
RouteSpecification.this.onOr(specification);
other.onOr(specification);
}
};
}
default RouteSpecification<T> negate(){
return (edge, entry) -> !specified(edge, entry);
return new RouteSpecification<T>() {
@Override
public boolean specified(Edge<T> edge, Traversal<T> entry) {
return !RouteSpecification.this.specified(edge, entry);
}
@Override
public int lastFound(Edge<T> edge, Traversal<T> entry) {
return RouteSpecification.this.lastFound(edge, entry);
}
@Override
public int matchCount() {
return RouteSpecification.this.matchCount();
}
@Override
public boolean updateMutated() {
return RouteSpecification.this.updateMutated();
}
@Override
public boolean mutable() {
return RouteSpecification.this.mutable();
}
@Override
public void update(Traversal<T> entry) {
RouteSpecification.this.update(entry);
}
@Override
public void onAnd(RouteSpecification<T> specification) {
RouteSpecification.this.onAnd(specification);
}
@Override
public void onOr(RouteSpecification<T> specification) {
RouteSpecification.this.onOr(specification);
}
};
}
}

81
core/src/main/java/ru/trader/analysis/RouteSpecificationByPair.java Normal file
View File

@@ -0,0 +1,81 @@
package ru.trader.analysis;
import ru.trader.analysis.graph.Edge;
import ru.trader.analysis.graph.Traversal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
public class RouteSpecificationByPair<T> implements RouteSpecification<T> {
protected final Collection<T> first;
protected final T second;
private boolean checkSecond;
public RouteSpecificationByPair(T first, T second) {
this.first = new ArrayList<>();
this.first.add(first);
this.second = second;
}
public RouteSpecificationByPair(Collection<T> first, T second) {
this.first = new ArrayList<>(first);
this.second = second;
}
@Override
public boolean specified(Edge<T> edge, Traversal<T> entry) {
return searchPair(edge, entry) == 0;
}
@Override
public int lastFound(Edge<T> edge, Traversal<T> entry) {
return searchPair(edge, entry);
}
@Override
public int matchCount() {
return checkSecond ? 2 : 1;
}
private int searchPair(Edge<T> edge, Traversal<T> entry){
T obj = edge.getTarget().getEntry();
int fIndex = -1;
int sIndex = -1;
if (first.contains(obj)){
fIndex = 0;
}
if (second.equals(obj)){
sIndex = 0;
}
if (sIndex != -1 && fIndex >= sIndex) return 0;
Iterator<Edge<T>> iterator = entry.routeIterator();
int i = 1;
while (iterator.hasNext()){
obj = iterator.next().getTarget().getEntry();
if (sIndex == -1 && second.equals(obj)){
sIndex = i;
}
if (sIndex != -1 && fIndex >= sIndex){
return 0;
}
if (first.contains(obj)){
fIndex = i;
}
i++;
}
if (fIndex == -1) return checkSecond ? 2 : 1;
if (sIndex == -1) return 1;
return fIndex >= sIndex ? 0 : 1;
}
@Override
public void onAnd(RouteSpecification<T> other) {
if (other instanceof RouteSpecificationByTarget){
T otherTarget = ((RouteSpecificationByTarget<T>)other).target;
checkSecond = checkSecond || !second.equals(otherTarget);
}
}
}

19
core/src/main/java/ru/trader/analysis/RouteSpecificationByTargets.java
View File

@@ -34,6 +34,25 @@ public class RouteSpecificationByTargets<T> implements RouteSpecification<T> {
return all ? targets.size() : 1;
}
@Override
public void onAnd(RouteSpecification<T> other) {
if (other instanceof RouteSpecificationByTarget){
T otherTarget = ((RouteSpecificationByTarget<T>)other).target;
targets.remove(otherTarget);
} else
if (other instanceof RouteSpecificationByTargets){
RouteSpecificationByTargets<T> os = ((RouteSpecificationByTargets<T>)other);
if (os.all){
Collection<T> otherTargets = ((RouteSpecificationByTargets<T>)other).targets;
targets.removeAll(otherTargets);
}
} else
if (other instanceof RouteSpecificationByPair){
T otherTarget = ((RouteSpecificationByPair<T>)other).second;
targets.remove(otherTarget);
}
}
private int containsAll(Edge<T> edge, Traversal<T> entry) {
T obj = edge.getTarget().getEntry();
Collection<T> set = new ArrayList<>(targets.size());

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

@@ -167,13 +167,13 @@ public class CrawlerSpecificatorTest extends Assert{
LOG.info("Test offer");
List<Route> paths = new ArrayList<>();
CrawlerSpecificator specificator = new CrawlerSpecificator();
Offer goldOffer = new SimpleOffer(OFFER_TYPE.BUY, gold, 0, 30);
Offer weaponOffer = new SimpleOffer(OFFER_TYPE.BUY, personalweapons, 0, 100);
Offer goldOffer = SimpleOffer.fakeBuy(lhs3262_st, gold, 0, 30);
Offer weaponOffer = SimpleOffer.fakeBuy(lhs3262_st, personalweapons, 0, 100);
specificator.buy(Arrays.asList(goldOffer, weaponOffer));
VendorsCrawlerSpecification spec = specificator.build(vendors, edges -> {paths.add(RouteSearcher.toRoute(edges, vGraph.getScorer()));});
Crawler<Vendor> crawler = vGraph.crawler(spec, new AnalysisCallBack());
crawler.setMaxSize(3);
crawler.setMaxSize(4);
crawler.findMin(lhs3262_st, 10);
assertEquals(10, paths.size());
for (Route path : paths) {
@@ -193,13 +193,13 @@ public class CrawlerSpecificatorTest extends Assert{
specificator.add(lhs3262_st, false);
specificator.add(lhs3006_st, false);
specificator.any(Arrays.asList(ovid_st, aulis_st));
Offer goldOffer = new SimpleOffer(OFFER_TYPE.BUY, gold, 0, 30);
Offer weaponOffer = new SimpleOffer(OFFER_TYPE.BUY, personalweapons, 0, 100);
Offer goldOffer = SimpleOffer.fakeBuy(aulin_st, gold, 0, 30);
Offer weaponOffer = SimpleOffer.fakeBuy(aulin_st, personalweapons, 0, 100);
specificator.buy(Arrays.asList(goldOffer, weaponOffer));
VendorsCrawlerSpecification spec = specificator.build(vendors, edges -> {paths.add(RouteSearcher.toRoute(edges, vGraph.getScorer()));});
Crawler<Vendor> crawler = vGraph.crawler(spec, new AnalysisCallBack());
crawler.setMaxSize(6);
crawler.setMaxSize(7);
crawler.findMin(ithaca_st, 10);
assertEquals(10, paths.size());
for (Route path : paths) {