From 7b8df601280db29ea7c7b00b6c103dba155ba5cc Mon Sep 17 00:00:00 2001 From: marecabo <23156476+marecabo@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:13:55 +0100 Subject: [PATCH 1/3] Bump matsim from 15.0 to 16.0-PR2920 --- pom.xml | 2 +- .../mapping/networkRouter/ScheduleRoutersGtfsShapes.java | 5 +++-- .../mapping/networkRouter/ScheduleRoutersOsmAttributes.java | 4 ++-- .../mapping/networkRouter/ScheduleRoutersStandard.java | 4 ++-- .../java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c40d26ce..e3729d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.matsim matsim - 15.0 + 16.0-PR2920 junit diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java index a8cf9565..4a3403c4 100755 --- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java +++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersGtfsShapes.java @@ -7,7 +7,7 @@ import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.network.Node; import org.matsim.api.core.v01.population.Person; -import org.matsim.core.router.FastAStarEuclideanFactory; +import org.matsim.core.router.speedy.SpeedyALTFactory; import org.matsim.core.router.util.LeastCostPathCalculator; import org.matsim.core.router.util.TravelDisutility; import org.matsim.core.router.util.TravelTime; @@ -106,7 +106,8 @@ private void load() { NetworkTools.cutNetwork(cutNetwork, nodesWithinBuffer); ShapeRouter r = new ShapeRouter(shape); - pathCalculator = new PathCalculator(new FastAStarEuclideanFactory().createPathCalculator(cutNetwork, r, r)); + pathCalculator = new PathCalculator( + new SpeedyALTFactory().createPathCalculator(cutNetwork, r, r)); pathCalculatorsByShape.put(shapeId, pathCalculator); networksByShape.put(shapeId, cutNetwork); diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java index 6ed79228..45e5102d 100755 --- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java +++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersOsmAttributes.java @@ -25,7 +25,7 @@ import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.network.Node; import org.matsim.api.core.v01.population.Person; -import org.matsim.core.router.FastAStarLandmarksFactory; +import org.matsim.core.router.speedy.SpeedyALTFactory; import org.matsim.core.router.util.LeastCostPathCalculator; import org.matsim.core.router.util.LeastCostPathCalculatorFactory; import org.matsim.core.router.util.TravelDisutility; @@ -100,7 +100,7 @@ public ScheduleRoutersOsmAttributes(TransitSchedule schedule, Network network, M */ private void load() { log.info("Initiating network and router for transit routes..."); - LeastCostPathCalculatorFactory factory = new FastAStarLandmarksFactory(nThreads); + LeastCostPathCalculatorFactory factory = new SpeedyALTFactory(); for (TransitLine transitLine : schedule.getTransitLines().values()) { for (TransitRoute transitRoute : transitLine.getRoutes().values()) { String scheduleMode = transitRoute.getTransportMode(); diff --git a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java index e34efdf2..0352c45e 100755 --- a/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java +++ b/src/main/java/org/matsim/pt2matsim/mapping/networkRouter/ScheduleRoutersStandard.java @@ -7,7 +7,7 @@ import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.network.Node; import org.matsim.api.core.v01.population.Person; -import org.matsim.core.router.FastAStarLandmarksFactory; +import org.matsim.core.router.speedy.SpeedyALTFactory; import org.matsim.core.router.util.LeastCostPathCalculator; import org.matsim.core.router.util.LeastCostPathCalculatorFactory; import org.matsim.core.router.util.TravelDisutility; @@ -79,7 +79,7 @@ private void load() { log.info("=============================================="); log.info("Creating network routers for transit routes..."); log.info("Initiating network and router for transit routes..."); - LeastCostPathCalculatorFactory factory = new FastAStarLandmarksFactory(nThreads); + LeastCostPathCalculatorFactory factory = new SpeedyALTFactory(); for(TransitLine transitLine : schedule.getTransitLines().values()) { for(TransitRoute transitRoute : transitLine.getRoutes().values()) { String scheduleMode = transitRoute.getTransportMode(); diff --git a/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java b/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java index 58103754..b2d84363 100644 --- a/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java +++ b/src/main/java/org/matsim/pt2matsim/osm/lib/OsmFileReader.java @@ -40,7 +40,7 @@ public class OsmFileReader extends MatsimXmlParser { private ParsedRelation currentRelation = null; public OsmFileReader(OsmData osmData) { - super(); + super(ValidationType.DTD_OR_XSD); this.osmData = osmData; this.setValidating(false); } From de7b44b1a558f80caba4a07e8a7f9afdc5022f95 Mon Sep 17 00:00:00 2001 From: marecabo <23156476+marecabo@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:04:44 +0100 Subject: [PATCH 2/3] Bump matsim from 16.0-PR2920 tp 16.0-PR3096 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3729d1a..0b6c172c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.matsim matsim - 16.0-PR2920 + 16.0-PR3096 junit From 6936768bf7e3db071e616e6d3e7dbae9b9571578 Mon Sep 17 00:00:00 2001 From: marecabo <23156476+marecabo@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:38:57 +0200 Subject: [PATCH 3/3] Bump matsim from 16.0-PR3096 to 2024.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b6c172c..434d34ee 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.matsim matsim - 16.0-PR3096 + 2024.0 junit