Voomra/trader
Archived
0
Fork 0
Code Activity

add CC compute and stat to PowerPlay

Browse Source
This commit is contained in:
Mo
2016-11-19 16:31:17 +03:00
parent db657e9723
commit a9aabc26c4
8 changed files with 142 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ public class PowerPlayAnalyzator {
}
public Collection<IntersectData> getControlling(Place starSystem){
Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE);
Stream<Place> candidates = market.get().stream().filter(Place::isPopulated);
return getControlling(starSystem, candidates, Market.CONTROLLING_RADIUS).collect(Collectors.toList());
}
@@ -40,17 +40,17 @@ public class PowerPlayAnalyzator {
}
public Collection<IntersectData> getIntersects(Place starSystem, Collection<Place> starSystems){
Stream<Place> candidates = market.get().stream().filter(p -> p.getFaction() != FACTION.NONE);
Stream<Place> candidates = market.get().stream().filter(Place::isPopulated);
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);
Stream<Place> candidates = market.get().stream().filter(Place::isPopulated);
return getMaxIntersect(candidates, starSystems, Market.CONTROLLING_RADIUS).collect(Collectors.toList());
}
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(Place::isPopulated);
return getNear(candidates, starSystems, Market.CONTROLLING_RADIUS, Market.CONTROLLING_RADIUS * 2).collect(Collectors.toList());
}

16
core/src/main/java/ru/trader/core/Place.java
View File

@@ -97,4 +97,20 @@ public interface Place extends Connectable<Place> {
default Vendor asTransit(){
return new TransitVendor(this);
}
default boolean isPopulated(){
return getPopulation() > 0;
}
default long computeCC(long[] CCgroups){
long population = getPopulation();
if (population == 0) return 0;
for (int i = 0; i < CCgroups.length; i++) {
long minPop = CCgroups[i];
if (population < minPop){
return i+1;
}
}
return CCgroups.length+1;
}
}

30
core/src/main/java/ru/trader/core/Profile.java
View File

@@ -3,7 +3,7 @@ package ru.trader.core;
import java.util.Properties;
public class Profile {
public static enum PATH_PRIORITY {FAST, ECO}
public enum PATH_PRIORITY {FAST, ECO}
private String name;
private double balance;
@@ -25,6 +25,7 @@ public class Profile {
private double rechargeTime;
private double fuelPrice;
private PATH_PRIORITY pathPriority;
private long[] CCgroups;
public Profile(Ship ship) {
this.ship = ship;
@@ -41,6 +42,7 @@ public class Profile {
jumpTime = 32;
rechargeTime = 12;
pathPriority = PATH_PRIORITY.FAST;
CCgroups = new long[]{0,0,0,3_000,30_000,300_000,3_000_000,30_000_000,300_000_000,3_000_000_000L};
}
protected Profile(Profile profile){
@@ -63,6 +65,7 @@ public class Profile {
this.system = profile.system;
this.station = profile.station;
this.ship = Ship.clone(profile.ship);
this.CCgroups = profile.CCgroups;
}
public String getName() {
@@ -217,6 +220,14 @@ public class Profile {
this.pathPriority = pathPriority;
}
public long[] getCCgroups() {
return CCgroups;
}
public void setCCgroups(long[] CCgroups) {
this.CCgroups = CCgroups;
}
public static Profile readFrom(Properties values, Market market){
Ship ship = Ship.readFrom(values);
Profile profile = new Profile(ship);
@@ -236,7 +247,7 @@ public class Profile {
profile.setSystem(null);
profile.setStation(null);
}
profile.setDocked(Boolean.valueOf(values.getProperty("profile.docked","false")));
profile.setDocked(Boolean.valueOf(values.getProperty("profile.docked", "false")));
profile.setJumps(Integer.valueOf(values.getProperty("profile.jumps", "3")));
profile.setLands(Integer.valueOf(values.getProperty("profile.lands", "4")));
profile.setPathPriority(PATH_PRIORITY.valueOf(values.getProperty("profile.search.priority", "FAST")));
@@ -249,6 +260,15 @@ public class Profile {
profile.setTakeoffTime(Double.valueOf(values.getProperty("profile.search.times.takeoff", "40")));
profile.setJumpTime(Double.valueOf(values.getProperty("profile.search.times.jump", "32")));
profile.setRechargeTime(Double.valueOf(values.getProperty("profile.search.times.recharge", "12")));
v = values.getProperty("profile.powerplay.cc", null);
if (v != null){
String[] strings = v.split(",");
long[] cc = new long[strings.length];
for (int i = 0; i < strings.length; i++) {
cc[i] = Long.valueOf(strings[i]);
}
profile.setCCgroups(cc);
}
return profile;
}
@@ -270,6 +290,12 @@ public class Profile {
values.setProperty("profile.search.times.takeoff", String.valueOf(takeoffTime));
values.setProperty("profile.search.times.jump", String.valueOf(jumpTime));
values.setProperty("profile.search.times.recharge", String.valueOf(rechargeTime));
StringBuilder builder = new StringBuilder();
for (long cc : CCgroups) {
if (builder.length() > 0) builder.append(",");
builder.append(cc);
}
values.setProperty("profile.powerplay.cc", builder.toString());
ship.writeTo(values);
}