Voomra/trader
Archived
0
Fork 0
Code Activity

improve pp analyze

Browse Source
This commit is contained in:
Mo
2016-12-22 18:04:59 +03:00
parent a47ca980ce
commit 89946a5750
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ public class PowerPlayAnalyzator {
public static Stream<IntersectData> getMaxProfit(Stream<Place> starSystems, Place headquarter, Collection<Place> centers, double radius, double maxDistance){ public static Stream<IntersectData> getMaxProfit(Stream<Place> starSystems, Place headquarter, Collection<Place> centers, double radius, double maxDistance){
Collection<Place> candidates = new ArrayList<>(); Collection<Place> candidates = new ArrayList<>();
starSystems.filter(p ->p.getPower() == POWER.NONE && p.getDistance(headquarter) <= maxDistance) starSystems.filter(p ->p.getPowerState() == POWER_STATE.NONE && p.getDistance(headquarter) <= maxDistance)
.forEach(candidates::add); .forEach(candidates::add);
IntersectsMapper candidatesMapper = new IntersectsMapper(candidates, radius, false, true); IntersectsMapper candidatesMapper = new IntersectsMapper(candidates, radius, false, true);
IntersectsMapper centersMapper = new IntersectsMapper(centers, radius*2, false, true); IntersectsMapper centersMapper = new IntersectsMapper(centers, radius*2, false, true);
@@ -162,6 +162,7 @@ public class PowerPlayAnalyzator {
}) })
.map(IntersectData::getStarSystem) .map(IntersectData::getStarSystem)
.map(centersMapper) .map(centersMapper)
.filter(d -> d.getMinDistance() > radius || Double.isNaN(d.getMinDistance()))
; ;
} }
@@ -394,7 +395,7 @@ public class PowerPlayAnalyzator {
long income = 0; long income = 0;
for (ControllingData contolling : contollings) { for (ControllingData contolling : contollings) {
Place place = contolling.center; Place place = contolling.center;
if (place.getPowerState() != POWER_STATE.CONTESTED){ if (!place.getPowerState().isContested()){
income += place.computeCC(); income += place.computeCC();
} }
} }