From 89946a575090e1ee1e3b6aab932e20b3b99b5546 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 22 Dec 2016 18:04:59 +0300 Subject: [PATCH] improve pp analyze --- .../main/java/ru/trader/analysis/PowerPlayAnalyzator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java b/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java index 0e64f8e..a80d2d0 100644 --- a/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java +++ b/core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java @@ -142,7 +142,7 @@ public class PowerPlayAnalyzator { public static Stream getMaxProfit(Stream starSystems, Place headquarter, Collection centers, double radius, double maxDistance){ Collection 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); IntersectsMapper candidatesMapper = new IntersectsMapper(candidates, radius, false, true); IntersectsMapper centersMapper = new IntersectsMapper(centers, radius*2, false, true); @@ -162,6 +162,7 @@ public class PowerPlayAnalyzator { }) .map(IntersectData::getStarSystem) .map(centersMapper) + .filter(d -> d.getMinDistance() > radius || Double.isNaN(d.getMinDistance())) ; } @@ -394,7 +395,7 @@ public class PowerPlayAnalyzator { long income = 0; for (ControllingData contolling : contollings) { Place place = contolling.center; - if (place.getPowerState() != POWER_STATE.CONTESTED){ + if (!place.getPowerState().isContested()){ income += place.computeCC(); } }