Voomra/trader
Archived
0
Fork 0
Code Activity

implement max intersect search

Browse Source
This commit is contained in:
Mo
2016-11-10 15:52:44 +03:00
parent c867bb50f0
commit 578ab80834
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/main/java/ru/trader/controllers/PowerPlayController.java
View File

@@ -232,6 +232,14 @@ public class PowerPlayController {
} }
} }
private void getMaxIntersect(){
Collection<Place> controlls = getControlSystems();
result.clear();
if (!controlls.isEmpty()){
Collection<PowerPlayAnalyzator.IntersectData> intersect = analyzator.getMaxIntersect(controlls);
result.addAll(BindingsHelper.observableList(intersect, ResultEntry::new));
}
}
@FXML @FXML
private void currentAsChecked(){ private void currentAsChecked(){
@@ -266,6 +274,9 @@ public class PowerPlayController {
if (rbExpansions.isSelected()){ if (rbExpansions.isSelected()){
getNearExpansions(); getNearExpansions();
} }
if (rbMaxIntersect.isSelected()){
getMaxIntersect();
}
} }

38
core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java
View File

@@ -44,9 +44,14 @@ public class PowerPlayAnalyzator {
return getIntersects(starSystem, candidates, starSystems, Market.CONTROLLING_RADIUS).collect(Collectors.toList()); return getIntersects(starSystem, candidates, starSystems, Market.CONTROLLING_RADIUS).collect(Collectors.toList());
} }
public Collection<IntersectData> getMaxIntersect(Collection<Place> starSystems){
Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE);
return getMaxIntersect(candidates, starSystems, Market.CONTROLLING_RADIUS).collect(Collectors.toList());
}
public Collection<IntersectData> getNear(Collection<Place> starSystems){ public Collection<IntersectData> getNear(Collection<Place> starSystems){
Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE); Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE);
return getNear(candidates, starSystems, Market.CONTROLLING_RADIUS, Market.CONTROLLING_RADIUS*2).collect(Collectors.toList()); return getNear(candidates, starSystems, Market.CONTROLLING_RADIUS, Market.CONTROLLING_RADIUS * 2).collect(Collectors.toList());
} }
public Collection<IntersectData> getNearExpansions(Collection<Place> starSystems){ public Collection<IntersectData> getNearExpansions(Collection<Place> starSystems){
@@ -95,6 +100,37 @@ public class PowerPlayAnalyzator {
.sorted(new DistanceComparator()); .sorted(new DistanceComparator());
} }
public static Stream<IntersectData> getMaxIntersect(Stream<Place> starSystems, Collection<Place> centers, double radius){
IntersectsMapper distanceMapper = new IntersectsMapper(centers, radius*2, false, true);
Predicate<Place> isControlling = intersectsAnyPredicate(centers, radius);
Collection<Place> candidates = new ArrayList<>();
Collection<Place> checked = new ArrayList<>();
starSystems.filter(new FarDropper(centers, radius*2))
.forEach(p -> {
if (isControlling != null && isControlling.test(p)) checked.add(p);
else {
if (p.getPower() == POWER.NONE) {
candidates.add(p);
}
}
});
candidates.removeAll(centers);
IntersectsMapper checkedMapper = new IntersectsMapper(checked, radius, false, true);
return candidates.stream()
.map(checkedMapper)
.filter(IntersectData::isIntersect)
.sorted((d1, d2) -> {
long pop1 = d1.getControllingSystems().stream().mapToLong(d -> d.center.getPopulation()).sum();
long pop2 = d2.getControllingSystems().stream().mapToLong(d -> d.center.getPopulation()).sum();
int cmp = Long.compare(pop2, pop1);
if (cmp == 0) cmp = Integer.compare(d2.getCount(), d1.getCount());
return cmp;
})
.map(IntersectData::getStarSystem)
.map(distanceMapper)
.filter(IntersectData::isIntersect);
}
public static Collection<IntersectData> getNearExpansions(Collection<Place> starSystems, Collection<Place> centers, double maxDistance){ public static Collection<IntersectData> getNearExpansions(Collection<Place> starSystems, Collection<Place> centers, double maxDistance){
return getNearExpansions(starSystems.stream(), centers, maxDistance).collect(Collectors.toList()); return getNearExpansions(starSystems.stream(), centers, maxDistance).collect(Collectors.toList());
} }