Voomra/trader
Archived
0
Fork 0
Code Activity

fix near systems analyze

Browse Source
This commit is contained in:
Mo
2016-11-04 16:55:22 +03:00
parent c7c228c271
commit f0d3e4dc8a
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package ru.trader.analysis;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.core.*;
@@ -45,7 +46,7 @@ public class PowerPlayAnalyzator {
}
public Collection<IntersectData> getNear(Collection<Place> starSystems){
Stream<Place> candidates = market.get().stream().filter(p -> p.getPower() == POWER.NONE && p.getFaction() != FACTION.NONE);
Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE);
return getNear(candidates, starSystems, CONTROLLING_RADIUS, CONTROLLING_RADIUS*2).collect(Collectors.toList());
}
@@ -70,12 +71,27 @@ public class PowerPlayAnalyzator {
}
public static Stream<IntersectData> getNear(Stream<Place> starSystems, Collection<Place> centers, double radius, double maxDistance){
IntersectsMapper controllingMapper = new IntersectsMapper(centers, radius, true, true);
IntersectsMapper distanceMapper = new IntersectsMapper(centers, maxDistance, false, true);
return starSystems.filter(new FarDropper(centers, maxDistance))
.map(controllingMapper)
.filter(d -> d.getCount() == 0)
.map(d -> distanceMapper.apply(d.getStarSystem()))
Predicate<Place> isControlling = intersectsAnyPredicate(centers, radius);
Collection<Place> candidates = new ArrayList<>();
Collection<Place> checked = new ArrayList<>();
starSystems.filter(new FarDropper(centers, maxDistance))
.forEach(p -> {
if (isControlling != null && isControlling.test(p)) checked.add(p);
else{
if (p.getPower() == POWER.NONE) {
candidates.add(p);
}
}
});
candidates.removeAll(centers);
Predicate<Place> isCheckedControlling = intersectsAnyPredicate(checked, radius);
if (isCheckedControlling == null) isCheckedControlling = p -> false;
return candidates.stream()
.filter(isCheckedControlling.negate())
.map(distanceMapper)
.filter(IntersectData::isIntersect)
.sorted(new DistanceComparator());
}
@@ -118,7 +134,8 @@ public class PowerPlayAnalyzator {
.map(mapper)
.filter(d -> d.getCount() == needCount);
}
/*
@Nullable
private static Predicate<Place> intersectsAnyPredicate(Collection<Place> places, double radius){
Predicate<Place> intersects = null;
for (Place place : places) {
@@ -128,20 +145,6 @@ public class PowerPlayAnalyzator {
return intersects;
}
private static Predicate<Place> intersectsPredicate(Collection<Place> places, double radius){
Predicate<Place> intersects = null;
for (Place place : places) {
if (intersects == null) intersects = new Controlling(place, radius);
else intersects = intersects.and(new Controlling(place, radius));
}
return intersects;
}
private static Predicate<Place> intersectsPredicate(Place checkedPlace, Collection<Place> places, double radius){
return new Controlling(checkedPlace, radius).and(intersectsAnyPredicate(places, radius));
}
*/
private static class Controlling implements Predicate<Place> {
private final Place center;
private final double radius;

33
core/src/test/java/ru/trader/analysis/PowerPlayAnalyzatorTest.java
View File

@@ -6,6 +6,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.core.Market;
import ru.trader.core.POWER;
import ru.trader.core.POWER_STATE;
import ru.trader.core.Place;
import ru.trader.store.simple.Store;
@@ -31,15 +33,16 @@ public class PowerPlayAnalyzatorTest extends Assert {
aulin = world.get("Aulin");
morgor = world.get("Morgor");
lhs417 = world.get("LHS 417");
world.get().forEach(p -> p.setPower(POWER.NONE, POWER_STATE.NONE));
}
@Test
public void intersectTest() throws Exception {
Collection<Place> starSystems = world.get();
Collection<Place> controllingLhs3262 = starSystems.stream().filter(p -> p.getDistance(lhs3262) <= 15).collect(Collectors.toList());
Collection<Place> controllingAulin = starSystems.stream().filter(p -> p.getDistance(aulin) <= 15).collect(Collectors.toList());
Collection<Place> controllingMorgor = starSystems.stream().filter(p -> p.getDistance(morgor) <= 15).collect(Collectors.toList());
Collection<Place> controllingLhs3262 = starSystems.stream().filter(p -> p != lhs3262 && p.getDistance(lhs3262) <= 15).collect(Collectors.toList());
Collection<Place> controllingAulin = starSystems.stream().filter(p -> p != aulin && p.getDistance(aulin) <= 15).collect(Collectors.toList());
Collection<Place> controllingMorgor = starSystems.stream().filter(p -> p != morgor && p.getDistance(morgor) <= 15).collect(Collectors.toList());
Collection<Place> expectedIntersect = controllingLhs3262.stream().filter(controllingAulin::contains).collect(Collectors.toList());
Collection<Place> expected3Intersect = controllingLhs3262.stream().filter(controllingAulin::contains).filter(controllingMorgor::contains).collect(Collectors.toList());
@@ -52,7 +55,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
for (PowerPlayAnalyzator.IntersectData intersect : intersects) {
assertTrue(lhs3262.getDistance(intersect.getStarSystem()) <= 15);
}
assertTrue(intersects.containsAll(controllingLhs3262));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(controllingLhs3262));
assertEquals(controllingLhs3262.size(), intersects.size());
centers.add(aulin);
@@ -62,7 +65,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
assertTrue(lhs3262.getDistance(intersect.getStarSystem()) <= 15);
assertTrue(aulin.getDistance(intersect.getStarSystem()) <= 15);
}
assertTrue(intersects.containsAll(expectedIntersect));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(expectedIntersect));
assertEquals(expectedIntersect.size(), intersects.size());
centers.add(morgor);
@@ -73,7 +76,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
assertTrue(aulin.getDistance(intersect.getStarSystem()) <= 15);
assertTrue(morgor.getDistance(intersect.getStarSystem()) <= 15);
}
assertTrue(intersects.containsAll(expected3Intersect));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(expected3Intersect));
assertEquals(expected3Intersect.size(), intersects.size());
intersects = PowerPlayAnalyzator.getIntersects(starSystems, centers, 12);
@@ -90,10 +93,10 @@ public class PowerPlayAnalyzatorTest extends Assert {
@Test
public void intersectTest2() throws Exception {
Collection<Place> starSystems = world.get();
Collection<Place> controllingLhs3262 = starSystems.stream().filter(p -> p.getDistance(lhs3262) <= 12).collect(Collectors.toList());
Collection<Place> controllingAulin = starSystems.stream().filter(p -> p.getDistance(aulin) <= 12).collect(Collectors.toList());
Collection<Place> controllingMorgor = starSystems.stream().filter(p -> p.getDistance(morgor) <= 12).collect(Collectors.toList());
Collection<Place> controllingLhs417 = starSystems.stream().filter(p -> p.getDistance(lhs417) <= 12).collect(Collectors.toList());
Collection<Place> controllingLhs3262 = starSystems.stream().filter(p -> p != lhs3262 && p.getDistance(lhs3262) <= 12).collect(Collectors.toList());
Collection<Place> controllingAulin = starSystems.stream().filter(p -> p != aulin && p.getDistance(aulin) <= 12).collect(Collectors.toList());
Collection<Place> controllingMorgor = starSystems.stream().filter(p -> p != morgor && p.getDistance(morgor) <= 12).collect(Collectors.toList());
Collection<Place> controllingLhs417 = starSystems.stream().filter(p -> p != lhs417 && p.getDistance(lhs417) <= 12).collect(Collectors.toList());
Collection<Place> expectedIntersect = controllingLhs417.stream().filter(p -> controllingLhs3262.contains(p) || controllingAulin.contains(p)).collect(Collectors.toList());
Collection<Place> expected3Intersect = controllingLhs417.stream().filter(p -> controllingLhs3262.contains(p) || controllingAulin.contains(p) || controllingMorgor.contains(p)).collect(Collectors.toList());
Collection<Place> expected2Intersect = controllingLhs417.stream().filter(p -> controllingAulin.contains(p) || controllingMorgor.contains(p)).collect(Collectors.toList());
@@ -108,7 +111,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
assertTrue(lhs3262.getDistance(intersect.getStarSystem()) <= 12 || aulin.getDistance(intersect.getStarSystem()) <= 12);
assertTrue(lhs417.getDistance(intersect.getStarSystem()) <= 12);
}
assertTrue(intersects.containsAll(expectedIntersect));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(expectedIntersect));
assertEquals(expectedIntersect.size(), intersects.size());
centers.add(morgor);
@@ -118,7 +121,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
assertTrue(lhs3262.getDistance(intersect.getStarSystem()) <= 12 || aulin.getDistance(intersect.getStarSystem()) <= 12 || morgor.getDistance(intersect.getStarSystem()) <= 12);
assertTrue(lhs417.getDistance(intersect.getStarSystem()) <= 12);
}
assertTrue(intersects.containsAll(expected3Intersect));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(expected3Intersect));
assertEquals(expected3Intersect.size(), intersects.size());
centers.clear();
@@ -138,7 +141,7 @@ public class PowerPlayAnalyzatorTest extends Assert {
assertTrue(aulin.getDistance(intersect.getStarSystem()) <= 12 || morgor.getDistance(intersect.getStarSystem()) <= 12);
assertTrue(lhs417.getDistance(intersect.getStarSystem()) <= 12);
}
assertTrue(intersects.containsAll(expected2Intersect));
assertTrue(intersects.stream().map(d -> d.getStarSystem()).collect(Collectors.toList()).containsAll(expected2Intersect));
assertEquals(expected2Intersect.size(), intersects.size());
@@ -155,11 +158,11 @@ public class PowerPlayAnalyzatorTest extends Assert {
Collection<Place> centers = new ArrayList<>();
centers.add(lhs3262);
centers.add(aulin);
Collection<PowerPlayAnalyzator.IntersectData> near = PowerPlayAnalyzator.getNear(starSystems, centers, 15, 30);
Collection<PowerPlayAnalyzator.IntersectData> near = PowerPlayAnalyzator.getNear(starSystems, centers, 14, 30);
LOG.info("Test near by LHS 3262 and Aulin, found {}", near.size());
assertTrue(near.size() > 0);
for (PowerPlayAnalyzator.IntersectData place : near) {
Collection<PowerPlayAnalyzator.IntersectData> intersect = PowerPlayAnalyzator.getIntersects(place.getStarSystem(), starSystems, centers, 15);
Collection<PowerPlayAnalyzator.IntersectData> intersect = PowerPlayAnalyzator.getIntersects(place.getStarSystem(), starSystems, centers, 14);
assertEquals(0, intersect.size());
}