Skip to content

Commit

Permalink
Showing 40 changed files with 54 additions and 53 deletions.
2 changes: 1 addition & 1 deletion libs/logparser/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>libs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.libs</groupId>
<artifactId>logparser</artifactId>
2 changes: 1 addition & 1 deletion libs/mer/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>libs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.libs</groupId>
<artifactId>mer</artifactId>
2 changes: 1 addition & 1 deletion libs/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat</groupId>
<artifactId>jcelechat</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>libs</artifactId>
2 changes: 1 addition & 1 deletion libs/routesolver/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>libs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.libs</groupId>
<artifactId>routesolver</artifactId>
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@ public Params withRegion(Collection<String> regions) {
return this;
}

public static Params hsNoInvasion() {
return new Params().withAllowed(PredicateRouter.HSNOINVASION.predicate);
public static Params hs() {
return new Params().withAllowed(PredicateRouter.HS.predicate);
}

public static Params regions(String... regions) {
@@ -41,7 +41,7 @@ public static Params regions(String... regions) {
/**
* predicate on a system to check if we are allowed to jump in it.
*/
public Predicate<SolarSystem> allowedSystems = PredicateRouter.HSNOINVASION.predicate;
public Predicate<SolarSystem> allowedSystems = PredicateRouter.HS.predicate;

public Params withAllowed(Predicate<SolarSystem> allowed) {
allowedSystems = allowed;
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ public static Params clustersSquare(int clusters) {
public default Collection<SolarSystem> expandHS(SolarSystem source, Set<String> addRegions) {
Set<String> allowedRegions = new HashSet<>(addRegions);
allowedRegions.add(source.region);
Predicate<SolarSystem> accept = PredicateRouter.HSNOINVASION.predicate.and(s -> allowedRegions.contains(s.region));
Predicate<SolarSystem> accept = PredicateRouter.HS.predicate.and(s -> allowedRegions.contains(s.region));
return Reach.from(source, accept);
}

Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ public abstract class AMain {
protected abstract Predicate<SolarSystem> important();

protected Params params() {
return Params.hsNoInvasion().withImportant(important());
return Params.hs().withImportant(important());
}

public void run(String source) {
2 changes: 1 addition & 1 deletion libs/spring/pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>libs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<packaging>pom</packaging>
<modules>
2 changes: 1 addition & 1 deletion libs/spring/sde/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.libs</groupId>
<artifactId>spring</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.libs.spring</groupId>
<artifactId>sde</artifactId>
2 changes: 1 addition & 1 deletion model/esi/compiled/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>esi</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.esi</groupId>
<artifactId>compiled</artifactId>
2 changes: 1 addition & 1 deletion model/esi/compiler/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>esi</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<artifactId>compiler</artifactId>
<name>JCESI compiler</name>
2 changes: 1 addition & 1 deletion model/esi/interfaces/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>esi</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.esi</groupId>
<artifactId>interfaces</artifactId>
2 changes: 1 addition & 1 deletion model/esi/jcesi/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>esi</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.esi</groupId>
<artifactId>jcesi</artifactId>
2 changes: 1 addition & 1 deletion model/esi/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<version>7.2.13</version>
<version>7.2.14</version>
<artifactId>model</artifactId>
</parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
2 changes: 1 addition & 1 deletion model/pom.xml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
<parent>
<groupId>fr.guiguilechat</groupId>
<artifactId>jcelechat</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
</project>
2 changes: 1 addition & 1 deletion model/sde/full/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>sde</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
<artifactId>full</artifactId>
2 changes: 1 addition & 1 deletion model/sde/industry/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>sde</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
<artifactId>industry</artifactId>
2 changes: 1 addition & 1 deletion model/sde/locations/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<version>7.2.13</version>
<version>7.2.14</version>
<artifactId>sde</artifactId>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ public static int distJumps(SolarSystem sys1, SolarSystem sys2) {
*/
public static int[][] of(SysIndex idx, IRouter router) {
if (router == null) {
router = PredicateRouter.HSNOINVASION;
router = PredicateRouter.HS;
}
int[][] jumps = new int[idx.size()][idx.size()];
for (int i = 0; i < idx.size(); i++) {
Original file line number Diff line number Diff line change
@@ -29,18 +29,19 @@ public PredicateRouter(Predicate<SolarSystem> predicate) {
this.predicate = predicate;
}

//
// only HS, no invasion. Good for negative to both
//

private static final Set<SolarSystem> INVADED = Invasions.INSTANCE.getPointSystems(false, false);

/**
* only accept intermediate systems between source and dest that in HS, and
* not invaded
*/
public static final PredicateRouter HSNOINVASION = new PredicateRouter(
s -> s.secStatus() == SECSTATUS.HS && !INVADED.contains(s));
// //
// // only HS, no invasion. Good for negative to both
// //
//
// private static final Set<SolarSystem> INVADED =
// Invasions.INSTANCE.getPointSystems(false, false);
//
// /**
// * only accept intermediate systems between source and dest that in HS, and
// * not invaded
// */
// public static final PredicateRouter HSNOINVASION = new PredicateRouter(
// s -> s.secStatus() == SECSTATUS.HS && !INVADED.contains(s));

//
// only HS, no sec reduced. good for neutral to both.
2 changes: 1 addition & 1 deletion model/sde/npcs/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>sde</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
<artifactId>npcs</artifactId>
2 changes: 1 addition & 1 deletion model/sde/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<version>7.2.13</version>
<version>7.2.14</version>
<artifactId>model</artifactId>
</parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
2 changes: 1 addition & 1 deletion model/sde/raw/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<version>7.2.13</version>
<version>7.2.14</version>
<artifactId>sde</artifactId>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
2 changes: 1 addition & 1 deletion model/sde/types-compiler/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<artifactId>sde</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
<artifactId>types-compiler</artifactId>
2 changes: 1 addition & 1 deletion model/sde/types/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.guiguilechat.jcelechat.model</groupId>
<version>7.2.13</version>
<version>7.2.14</version>
<artifactId>sde</artifactId>
</parent>
<groupId>fr.guiguilechat.jcelechat.model.sde</groupId>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.guiguilechat</groupId>
<artifactId>jcelechat</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
<packaging>pom</packaging>
<name>JCE Lechat</name>
<description>Java Compile Eve by Lechat</description>
2 changes: 1 addition & 1 deletion programs/checkeiv/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>checkeiv</artifactId>
2 changes: 1 addition & 1 deletion programs/checkesisde/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>checkesisde</artifactId>
2 changes: 1 addition & 1 deletion programs/evehistory/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>evehistory</artifactId>
2 changes: 1 addition & 1 deletion programs/gankhistory/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>gankhistory</artifactId>
2 changes: 1 addition & 1 deletion programs/guimutaplasmids/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>guimutaplasmids</artifactId>
2 changes: 1 addition & 1 deletion programs/insurancefraud/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>insurancefraud</artifactId>
2 changes: 1 addition & 1 deletion programs/lootstats/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>lootstats</artifactId>
2 changes: 1 addition & 1 deletion programs/moonworth/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>moonworth</artifactId>
2 changes: 1 addition & 1 deletion programs/notiftoons/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>notiftoons</artifactId>
2 changes: 1 addition & 1 deletion programs/oreworth/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>oreworth</artifactId>
2 changes: 1 addition & 1 deletion programs/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat</groupId>
<artifactId>jcelechat</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
2 changes: 1 addition & 1 deletion programs/praisal/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>praisal</artifactId>
2 changes: 1 addition & 1 deletion programs/showattributes/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>
<artifactId>showattributes</artifactId>
2 changes: 1 addition & 1 deletion programs/statsburnerdest/pom.xml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.guiguilechat.jcelechat</groupId>
<artifactId>programs</artifactId>
<version>7.2.13</version>
<version>7.2.14</version>
</parent>
<artifactId>statsburnerdest</artifactId>
<groupId>fr.guiguilechat.jcelechat.programs</groupId>

0 comments on commit 76f2657

Please sign in to comment.