diff --git a/ees/pom.xml b/ees/pom.xml index 7c4a569d..1ecadb39 100644 --- a/ees/pom.xml +++ b/ees/pom.xml @@ -74,13 +74,29 @@ + - osgeo Geotools repository https://repo.osgeo.org/repository/release + + matsim + https://repo.matsim.org/repository/matsim + + + jogl + https://jogamp.org/deployment/maven/ + + + topobyte + https://mvn.topobyte.de + + + slimjars + https://mvn.slimjars.com + @@ -98,6 +114,12 @@ io.github.agentsoz bdi-matsim 3.0.1-SNAPSHOT + + + slf4j-api + org.slf4j + + io.github.agentsoz @@ -133,17 +155,6 @@ 4.13.1 - - com.google.inject - guice - 5.1.0 - - - - org.apache.commons - commons-csv - 1.6 - org.geotools diff --git a/ees/scenarios/grid/ar-1a-mat.xml b/ees/scenarios/grid/ar-1a-mat.xml index 8ae3a13e..00699791 100644 --- a/ees/scenarios/grid/ar-1a-mat.xml +++ b/ees/scenarios/grid/ar-1a-mat.xml @@ -39,7 +39,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -63,9 +63,9 @@ - + - + @@ -100,7 +100,7 @@ - + diff --git a/ees/scenarios/grid/ar-2a-mat.xml b/ees/scenarios/grid/ar-2a-mat.xml index 9c13803d..6e0d4084 100644 --- a/ees/scenarios/grid/ar-2a-mat.xml +++ b/ees/scenarios/grid/ar-2a-mat.xml @@ -39,7 +39,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -63,9 +63,9 @@ - + - + @@ -100,7 +100,7 @@ - + diff --git a/ees/scenarios/grid/ar-2a-pop.xml b/ees/scenarios/grid/ar-2a-pop.xml index eae0f8bd..9ba4995b 100644 --- a/ees/scenarios/grid/ar-2a-pop.xml +++ b/ees/scenarios/grid/ar-2a-pop.xml @@ -3,11 +3,6 @@ - - Atlantis - - - diff --git a/ees/scenarios/grid/ar-congestion-mat.xml b/ees/scenarios/grid/ar-congestion-mat.xml index a8fca444..edea83b2 100644 --- a/ees/scenarios/grid/ar-congestion-mat.xml +++ b/ees/scenarios/grid/ar-congestion-mat.xml @@ -40,7 +40,7 @@ - + @@ -48,8 +48,8 @@ - - + + @@ -65,7 +65,7 @@ - + @@ -73,9 +73,9 @@ - + - + @@ -110,7 +110,7 @@ - + diff --git a/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml b/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml index bc90984b..01e14a07 100644 --- a/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml +++ b/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml @@ -41,7 +41,7 @@ - + @@ -49,8 +49,8 @@ - - + + @@ -68,9 +68,9 @@ - + - + @@ -105,7 +105,7 @@ - + diff --git a/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml b/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml index fb723d9b..dffa44b8 100644 --- a/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml +++ b/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml @@ -39,7 +39,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -63,9 +63,9 @@ - + - + @@ -100,7 +100,7 @@ - + diff --git a/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml b/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml index 6646cc45..58254608 100644 --- a/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml +++ b/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml @@ -39,7 +39,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -63,9 +63,9 @@ - + - + @@ -100,7 +100,7 @@ - + diff --git a/ees/scenarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml b/ees/scenarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml index a5b9c61d..357de246 100644 --- a/ees/scenarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml +++ b/ees/scenarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml @@ -39,7 +39,7 @@ - + @@ -47,8 +47,8 @@ - - + + @@ -63,9 +63,9 @@ - + - + @@ -101,7 +101,7 @@ - + diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java index 299fbb3c..538488e0 100644 --- a/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java +++ b/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java @@ -50,7 +50,7 @@ class DisruptionWriter { } void write(double time, Id linkId, Coord coord, double speed ) { if (writer == null) { - final String filename = config.controler().getOutputDirectory() + "/output_disruptionCoords.txt.gz"; + final String filename = config.controller().getOutputDirectory() + "/output_disruptionCoords.txt.gz"; log.warn("writing disruption data to " + filename); try { writer = IOUtils.getPrintStream(new File(filename).toURI().toURL()); diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java index 7cc919c6..3f10109b 100644 --- a/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java +++ b/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java @@ -70,8 +70,7 @@ import org.matsim.withinday.utils.EditTrips; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import javax.inject.Inject; +import com.google.inject.Inject; class EvacAgent implements MobsimDriverAgent, HasPerson, PlanAgent, HasModifiablePlan { diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/MATSimEvacModel.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/MATSimEvacModel.java index 83235939..ec1a45b0 100644 --- a/ees/src/main/java/io/github/agentsoz/ees/matsim/MATSimEvacModel.java +++ b/ees/src/main/java/io/github/agentsoz/ees/matsim/MATSimEvacModel.java @@ -24,6 +24,7 @@ import com.google.common.collect.ObjectArrays; import com.google.gson.Gson; +import com.google.inject.Singleton; import io.github.agentsoz.bdiabm.ABMServerInterface; import io.github.agentsoz.bdiabm.v3.QueryPerceptInterface; import io.github.agentsoz.bdiabm.data.ActionContent; @@ -71,7 +72,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Singleton; import java.util.*; import java.util.stream.Stream; diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/Replanner.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/Replanner.java index 2c6f553c..8f752934 100644 --- a/ees/src/main/java/io/github/agentsoz/ees/matsim/Replanner.java +++ b/ees/src/main/java/io/github/agentsoz/ees/matsim/Replanner.java @@ -10,7 +10,7 @@ import org.matsim.core.mobsim.qsim.QSim; import org.matsim.core.mobsim.qsim.agents.WithinDayAgentUtils; import org.matsim.core.network.NetworkChangeEvent; -import org.matsim.core.router.FastAStarLandmarksFactory; +import org.matsim.core.router.AStarLandmarksFactory; import org.matsim.core.router.TripRouter; import org.matsim.core.router.util.*; import org.matsim.core.utils.timing.TimeInterpretation; @@ -62,8 +62,8 @@ public final class Replanner { this.travelTimes = travelTimes ; { TravelTime travelTime = TravelTimeUtils.createFreeSpeedTravelTime(); - TravelDisutility travelDisutility = TravelDisutilityUtils.createFreespeedTravelTimeAndDisutility(scenario.getConfig().planCalcScore()); - LeastCostPathCalculator pathCalculator = new FastAStarLandmarksFactory(1).createPathCalculator(scenario.getNetwork(), travelDisutility, travelTime); + TravelDisutility travelDisutility = TravelDisutilityUtils.createFreespeedTravelTimeAndDisutility(scenario.getConfig().scoring()); + LeastCostPathCalculator pathCalculator = new AStarLandmarksFactory(1).createPathCalculator(scenario.getNetwork(), travelDisutility, travelTime); this.editRoutes = new EditRoutes(scenario.getNetwork(), pathCalculator, scenario.getPopulation().getFactory()); } this.editTrips = new EditTrips(tripRouter, qSim2.getScenario(), null, TimeInterpretation.create(scenario.getConfig())) ; diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/Shape2XyWriter.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/Shape2XyWriter.java index 956a3779..aefe9397 100644 --- a/ees/src/main/java/io/github/agentsoz/ees/matsim/Shape2XyWriter.java +++ b/ees/src/main/java/io/github/agentsoz/ees/matsim/Shape2XyWriter.java @@ -47,7 +47,7 @@ class Shape2XyWriter { } void write(double now, Geometry fire) { if ( writer == null) { - final String filename = config.controler().getOutputDirectory() + "/output_" + name + "Coords.txt.gz"; + final String filename = config.controller().getOutputDirectory() + "/output_" + name + "Coords.txt.gz"; log.info("writing " + name + " data to " + filename); try { writer = IOUtils.getPrintStream(new File(filename).toURI().toURL()); diff --git a/ees/src/test/java/org/matsim/testcases/MatsimTestUtils.java b/ees/src/test/java/org/matsim/testcases/MatsimTestUtils.java index 5fdff589..3dbfa9db 100644 --- a/ees/src/test/java/org/matsim/testcases/MatsimTestUtils.java +++ b/ees/src/test/java/org/matsim/testcases/MatsimTestUtils.java @@ -109,7 +109,7 @@ public Config loadConfig(final String configfile) { config.addCoreModules(); } this.outputDirectory = getOutputDirectory(); - config.controler().setOutputDirectory(this.outputDirectory); + config.controller().setOutputDirectory(this.outputDirectory); return config; } diff --git a/ees/test/input/io/github/agentsoz/ees/BlockageCampbellsCreek01Test/test/trips.deckgl.json b/ees/test/input/io/github/agentsoz/ees/BlockageCampbellsCreek01Test/test/trips.deckgl.json index a9b3a678..9d5c5a21 100644 --- a/ees/test/input/io/github/agentsoz/ees/BlockageCampbellsCreek01Test/test/trips.deckgl.json +++ b/ees/test/input/io/github/agentsoz/ees/BlockageCampbellsCreek01Test/test/trips.deckgl.json @@ -62,7 +62,7 @@ ], [ 144.20872809996695, - -37.08664997446741 + -37.086649974467406 ], [ 144.21074199996707, @@ -106,7 +106,7 @@ ], [ 144.210251099967, - -37.07135207443349 + -37.071352074433484 ], [ 144.21190169996717, @@ -401,7 +401,7 @@ ], [ 144.25697599996994, - -37.08989837447728 + -37.089898374477286 ], [ 144.25724909996995, @@ -413,7 +413,7 @@ ], [ 144.2564329999699, - -37.08714847447115 + -37.08714847447114 ], [ 144.2566616999699, @@ -521,7 +521,7 @@ ], [ 144.22268899996783, - -37.06758207442582 + -37.06758207442581 ], [ 144.2223544999678, diff --git a/libs/bdi-abm-integration b/libs/bdi-abm-integration index 2035598c..e9d41b66 160000 --- a/libs/bdi-abm-integration +++ b/libs/bdi-abm-integration @@ -1 +1 @@ -Subproject commit 2035598c2f1a5c9b7a7079e189886782fe67a2d4 +Subproject commit e9d41b661630699d8da1766eda0d7b7d7794b5bd