Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update matsim libs #69

Merged
merged 968 commits into from
Nov 24, 2023
Merged
Changes from 3 commits
Commits
Show all changes
968 commits
Select commit Hold shift + click to select a range
6247699
Merge branch 'master' into 2822-remove-old-transit-router
mrieser Oct 12, 2023
19e11a3
Merge branch 'master' into 2822-remove-old-transit-router
mrieser Oct 12, 2023
d9292ac
get rid of the old inefficient transit router
mrieser Oct 12, 2023
7a80a68
delete tests for stuff that is no more
mrieser Oct 12, 2023
c3309e9
fix tests after switching to SwissRailRaptor
mrieser Oct 12, 2023
30bfb3f
change parameter name and add waiting vehicles
rewertvsp Oct 12, 2023
d25ff3a
add outputs for combine parking with getOff/getIn
rewertvsp Oct 12, 2023
48b3c56
add StartWaitingForParkingEvent
rewertvsp Oct 12, 2023
ba1675c
add functionality to check free capacities for each timestep
rewertvsp Oct 12, 2023
ff6bad9
change parameter name
rewertvsp Oct 12, 2023
f29a21c
make map protected
rewertvsp Oct 12, 2023
28a2e9c
integrate waiting activity handling and check of parking until next a…
rewertvsp Oct 12, 2023
fb9a371
add method to add waiting activity
rewertvsp Oct 12, 2023
d0cfdf5
change nextPickupTime calculation
rewertvsp Oct 12, 2023
0ac5059
clean up
rewertvsp Oct 12, 2023
db73202
add comment
rewertvsp Oct 12, 2023
cec714b
rename method
rewertvsp Oct 12, 2023
60f691b
add check if current is parking or not
rewertvsp Oct 12, 2023
2145cf2
formatting
rewertvsp Oct 12, 2023
f3c2efb
rename/move packages: ....contrib.freight.* -> ....freight.carriers.*
kt86 Oct 12, 2023
dffb693
fix tests after switching to SwissRailRaptor
mrieser Oct 12, 2023
c0eb4ee
Merge remote-tracking branch 'origin/2822-remove-old-transit-router' …
mrieser Oct 12, 2023
f4950b9
Merge pull request #2854 from matsim-org/2822-remove-old-transit-router
mrieser Oct 12, 2023
85ec355
move stuff from FreightUtils to CarrierUtils and rename FreightUtils …
kt86 Oct 12, 2023
727b35d
rename FreightConfigGroup.java to FreightCarriersConfigGroup
kt86 Oct 12, 2023
a0cbda2
move stuff from carriers.carrier package one level up
kt86 Oct 12, 2023
a265eff
move analysis code one package level up (was accidentally "analysis.a…
kt86 Oct 12, 2023
d99db37
comment/javadoc
kt86 Oct 12, 2023
4748783
deps: stop grouping mvn dependencies version updates
michalmac Oct 12, 2023
fca3da6
fix one import
kt86 Oct 12, 2023
cbd3a51
Merge pull request #2856 from matsim-org/dependabot-stop-grouping-mvn…
michalmac Oct 12, 2023
221172f
build(deps): bump org.codehaus.woodstox:stax2-api from 4.2.1 to 4.2.2
dependabot[bot] Oct 12, 2023
a2693aa
Merge pull request #2859 from matsim-org/dependabot/maven/org.codehau…
michalmac Oct 12, 2023
c69f416
build(deps): bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
dependabot[bot] Oct 12, 2023
3be5345
Merge pull request #2861 from matsim-org/dependabot/maven/com.google.…
michalmac Oct 12, 2023
f8fe8fc
move test input to correct location
kt86 Oct 13, 2023
3ad035c
add integration test to ensure main_mode in output_trips.csv is not e…
mrieser Oct 13, 2023
62d1c20
remove support for Subpopulation (was never configurable)
jfbischoff Oct 13, 2023
8e71d4a
rename PlanMutateTimeAllocationSimplified to MutateActivityTimeAlloca…
jfbischoff Oct 13, 2023
07b699e
Merge pull request #2864 from matsim-org/2779-trips-csv-main-mode
mrieser Oct 13, 2023
355d936
Merge branch 'master' into 2821-rename-freight-contrib-2
kt86 Oct 13, 2023
68e9527
Merge pull request #2857 from matsim-org/2821-rename-freight-contrib-2
kt86 Oct 13, 2023
7d802bb
Add ObjectMapper Module for Id de-/serialization
marecabo Oct 12, 2023
248abc9
Generalize IdAnnotations and IdDeSerializationModule
marecabo Oct 12, 2023
837dcb4
Add plugin in pom that helps compiling hybridsim and protobuf contrib
marecabo Oct 13, 2023
fb982e5
try to set leg start time in any case.
jfbischoff Oct 13, 2023
ca212b6
fix minor outputs in tests after modification of timeMutator
jfbischoff Oct 13, 2023
3cd3946
Merge pull request #2849 from marecabo/id-serialization
marecabo Oct 13, 2023
62f50d8
added plan inheritance stats
neuma Sep 21, 2023
5af1b11
added strat distribution stats
neuma Sep 22, 2023
f302b4b
some javadoc
neuma Sep 27, 2023
a4f0943
adjust output files due to different randomness in new time allocatio…
jfbischoff Oct 13, 2023
f288e69
added PlanInheritanceConfigGroup.java to en-/disable planInheritance,…
Oct 10, 2023
805ed46
added new Plan setter and getter UnsupportedOperationException to LCP…
Oct 10, 2023
b733b66
changed Initial planId to NONE
Oct 11, 2023
b6bada1
switched from String to Id<> for planId, Junit Test, Record Reader
Oct 11, 2023
78532cf
implmented Plan as identifiable
Oct 12, 2023
bae280b
refactor Config Renames, default Iteration removed changed to -1
Oct 13, 2023
ec848a7
include freight and drt in mode-filter for output geojson network
tschlenther Oct 13, 2023
0bfff06
fix: look for implementations of DashboardProvider.class
tschlenther Oct 13, 2023
a06649b
Merge pull request #2869 from matsim-org/fixAnalysis
tschlenther Oct 13, 2023
5ca6e00
replace stopwatch.txt with stopwatch.csv
mrieser Oct 13, 2023
4542bcf
replace scorestats.txt with scorestats.csv
mrieser Oct 13, 2023
7a7ff0b
replace modestats.txt with modestats.csv
mrieser Oct 13, 2023
0691ad9
replace ph_/pkm_modestats.txt with ph_/pkm_modestats.csv
mrieser Oct 13, 2023
5899b40
replace traveldistancestats.txt with traveldistancestats.csv
mrieser Oct 13, 2023
0119ae4
remove superfluous delimiter
mrieser Oct 13, 2023
4277709
Merge branch 'master' into 2868-replace-txt-with-csv
mrieser Oct 13, 2023
fc1926b
use lists instead of sets for passenger groups
nkuehnel Oct 13, 2023
c99d017
Merge pull request #2872 from matsim-org/2868-replace-txt-with-csv
mrieser Oct 13, 2023
28b90df
add group passenger engine
nkuehnel Oct 13, 2023
6ab6503
replace MATSim's UncheckedIOException with the one from Java
mrieser Oct 13, 2023
3840dfc
forgot about the test classes...
mrieser Oct 13, 2023
258d56b
fix test
nkuehnel Oct 13, 2023
31fe21b
non-deterministic test, allow for 2 outcomes... :-/
mrieser Oct 13, 2023
15c5689
Merge pull request #2874 from matsim-org/remove-unchecked-io-exception
mrieser Oct 13, 2023
bc1a042
replace passenger sets with list at more places
nkuehnel Oct 13, 2023
68dfd1f
ensure deterministic orde of passenger groups
nkuehnel Oct 13, 2023
1ba97d5
Merge branch 'master' into hybridsim-protobuf-pom
marecabo Oct 14, 2023
60a8d82
build(deps): bump com.fasterxml.jackson:jackson-bom
dependabot[bot] Oct 14, 2023
6977833
Merge pull request #2870 from matsim-org/dependabot/maven/com.fasterx…
michalmac Oct 14, 2023
b074f11
Remove os-maven-plugin extension in favor of plugin
marecabo Oct 14, 2023
7ba2377
Merge branch 'master' into hybridsim-protobuf-pom
marecabo Oct 14, 2023
85cb852
Merge pull request #2863 from marecabo/hybridsim-protobuf-pom
marecabo Oct 14, 2023
d44a0f2
minibus: fix full integration on windows by adding another value to a…
michalmac Oct 14, 2023
1666fd8
Merge pull request #2875 from matsim-org/fix-full-integration-on-windows
michalmac Oct 14, 2023
a267e3e
Merge branch 'master' into drtGroupBookings
nkuehnel Oct 15, 2023
bc35740
set remaining group sets to lists
nkuehnel Oct 15, 2023
76cc0e9
Merge remote-tracking branch 'origin/master' into feature/timeAllocat…
jfbischoff Oct 16, 2023
f1447b4
resolve merging issues
jfbischoff Oct 16, 2023
6bf5470
resolve merging issues
jfbischoff Oct 16, 2023
91080e0
Merge remote-tracking branch 'origin/master' into feature/timeAllocat…
jfbischoff Oct 16, 2023
42c3151
resolve merging issues
jfbischoff Oct 16, 2023
f318b55
merge two TimeAllocationMutatorTests into one
jfbischoff Oct 16, 2023
32142fc
completing Test for CarrierEventsReaders
nixlaos Oct 16, 2023
2f25c7a
add missing interfaces for freight events, minor renames
nixlaos Oct 16, 2023
cb17bf4
Revert "add missing interfaces for freight events, minor renames"
nixlaos Oct 16, 2023
d1bac61
Merge remote-tracking branch 'origin/master' into freight_eventsReade…
nixlaos Oct 16, 2023
2b6b6ed
fixing error
nixlaos Oct 16, 2023
7751657
moved test input
nixlaos Oct 16, 2023
e74a8ad
Merge branch 'master' into addingPlanInheritance
alex94263 Oct 16, 2023
b9b756e
minor adjusts to tests
jfbischoff Oct 16, 2023
e608ecc
Merge pull request #2831 from matsim-org/addingPlanInheritance
alex94263 Oct 16, 2023
121cadc
add test for shift of departure times
jfbischoff Oct 16, 2023
bb76fab
Merge branch 'master' into feature/timeAllocationMutatorChanges
jfbischoff Oct 16, 2023
305ff5e
adjusted assertion results due to different randomness in MutateActiv…
jfbischoff Oct 16, 2023
2a7c39a
Merge remote-tracking branch 'origin/feature/timeAllocationMutatorCha…
jfbischoff Oct 16, 2023
3d665b5
Merge pull request #2878 from matsim-org/feature/timeAllocationMutato…
jfbischoff Oct 16, 2023
3b1b938
Person vehicle types attribute (#2877)
rakow Oct 16, 2023
dcd9a14
build(deps): bump log4j.version from 2.20.0 to 2.21.0
dependabot[bot] Oct 17, 2023
ed19aee
Merge pull request #2881 from matsim-org/dependabot/maven/log4j.versi…
michalmac Oct 17, 2023
a9797cd
build(deps): bump com.graphhopper:graphhopper-core from 7.0 to 8.0
dependabot[bot] Oct 17, 2023
ff26998
Merge pull request #2882 from matsim-org/dependabot/maven/com.graphho…
michalmac Oct 17, 2023
8094b2f
build(deps): bump org.jacoco:jacoco-maven-plugin from 0.8.10 to 0.8.11
dependabot[bot] Oct 17, 2023
24dca6d
Merge pull request #2880 from matsim-org/dependabot/maven/org.jacoco-…
michalmac Oct 17, 2023
e760bca
add a delta to please windows build server
jfbischoff Oct 18, 2023
43cd2e9
Merge remote-tracking branch 'origin/master'
jfbischoff Oct 18, 2023
73caa90
add a delta to please windows build server
jfbischoff Oct 18, 2023
1542546
Merge pull request #2884 from matsim-org/bugfix/TestSiouxFalls
jfbischoff Oct 18, 2023
a9efdbc
DRT Leg Estimators (#2865)
rakow Oct 18, 2023
1348b38
build(deps): bump org.openjfx:javafx-graphics from 21 to 21.0.1
dependabot[bot] Oct 18, 2023
582a59a
Merge pull request #2886 from matsim-org/dependabot/maven/org.openjfx…
michalmac Oct 18, 2023
23d99e6
fix wrong attribute in event convertion
kt86 Oct 19, 2023
1e8be70
add missing events handlers and rename existing one. We have two even…
kt86 Oct 19, 2023
54a353e
Update test (and input). Now it will also (at least) count the number…
kt86 Oct 19, 2023
d888d9a
rename "Freight" eventsHandler to "Carrier" eventsHandler
kt86 Oct 19, 2023
13e5d90
Merge branch 'master' into freight_eventsReaderTest
kt86 Oct 19, 2023
0f5ae89
build(deps): bump com.google.errorprone:error_prone_annotations
dependabot[bot] Oct 19, 2023
72dac0e
Merge pull request #2887 from matsim-org/dependabot/maven/com.google.…
michalmac Oct 19, 2023
2f79b3e
reduce public footprint
kainagel Oct 20, 2023
6ced39d
make some classes final
kainagel Oct 20, 2023
376a7ec
add in-code created test as well. add copyright
kt86 Oct 20, 2023
a12f2ec
Merge branch 'master' into freight_eventsReaderTest
kt86 Oct 20, 2023
05e2387
Merge remote-tracking branch 'origin/freight_eventsReaderTest' into f…
kt86 Oct 20, 2023
4ed2b9e
an example of how to write your own consumption model
kainagel Oct 20, 2023
d73dd40
change eagerSingleton to regular Singleton.class; add a comment
kainagel Oct 20, 2023
1b87a43
change comment
kainagel Oct 20, 2023
8e64186
Merge pull request #2876 from matsim-org/freight_eventsReaderTest
kt86 Oct 20, 2023
cffffc9
Merge branch 'master' into developParkingSearch
rewertvsp Oct 20, 2023
e3075f8
Merge pull request #2891 from matsim-org/developParkingSearch
rewertvsp Oct 20, 2023
d303fb2
build(deps): bump io.grpc:grpc-all from 1.58.0 to 1.59.0
dependabot[bot] Oct 20, 2023
9076059
Merge pull request #2890 from matsim-org/dependabot/maven/io.grpc-grp…
michalmac Oct 20, 2023
378ac20
build(deps): bump org.glassfish.jaxb:jaxb-bom from 4.0.3 to 4.0.4
dependabot[bot] Oct 20, 2023
90e509c
Merge pull request #2889 from matsim-org/dependabot/maven/org.glassfi…
michalmac Oct 20, 2023
3503aa4
mvn: require mvn version 3.8+
michalmac Oct 22, 2023
be45159
Merge pull request #2892 from matsim-org/require-mvn-3.8
michalmac Oct 22, 2023
9c47c82
comment/documentation changes
kainagel Oct 23, 2023
4cbbf73
Merge branch 'master' into evMaintenance
kainagel Oct 23, 2023
5695f63
Merge pull request #2888 from matsim-org/evMaintenance
kainagel Oct 23, 2023
382f6a1
Don't sample datatype during trip analysis (#2895)
rakow Oct 24, 2023
e386cc7
build(deps): bump org.apache.maven.plugins:maven-surefire-plugin
dependabot[bot] Oct 24, 2023
0ef5cdb
Merge pull request #2897 from matsim-org/dependabot/maven/org.apache.…
michalmac Oct 24, 2023
103f9d5
build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin
dependabot[bot] Oct 24, 2023
cfe18e1
Merge pull request #2899 from matsim-org/dependabot/maven/org.apache.…
michalmac Oct 24, 2023
c2086f5
build(deps): bump org.apache.maven.plugins:maven-surefire-report-plugin
dependabot[bot] Oct 24, 2023
f0e845b
Merge pull request #2898 from matsim-org/dependabot/maven/org.apache.…
michalmac Oct 24, 2023
0265a59
build(deps): bump log4j.version from 2.21.0 to 2.21.1
dependabot[bot] Oct 24, 2023
46160f1
Merge pull request #2896 from matsim-org/dependabot/maven/log4j.versi…
michalmac Oct 24, 2023
18a08a3
Merge branch 'master' into loadHouseHoldChange
alex94263 Oct 25, 2023
37cba78
Merge pull request #2704 from matsim-org/loadHouseHoldChange
alex94263 Oct 25, 2023
5b5d6e3
build(deps): bump org.apache.commons:commons-text from 1.10.0 to 1.11.0
dependabot[bot] Oct 30, 2023
fdd8aff
Merge pull request #2902 from matsim-org/dependabot/maven/org.apache.…
michalmac Oct 30, 2023
322467b
build(deps): bump com.github.luben:zstd-jni from 1.5.5-6 to 1.5.5-7
dependabot[bot] Oct 30, 2023
010e4f0
Merge pull request #2904 from matsim-org/dependabot/maven/com.github.…
michalmac Oct 31, 2023
f154d29
build(deps): bump com.github.luben:zstd-jni from 1.5.5-7 to 1.5.5-10
dependabot[bot] Nov 1, 2023
a0433d8
Merge pull request #2906 from matsim-org/dependabot/maven/com.github.…
michalmac Nov 1, 2023
600f488
build(deps): bump org.checkerframework:checker-qual
dependabot[bot] Nov 2, 2023
b6d107a
Merge pull request #2907 from matsim-org/dependabot/maven/org.checker…
michalmac Nov 2, 2023
3e4d93d
build(deps): bump com.google.protobuf:protobuf-java
dependabot[bot] Nov 2, 2023
6b87c9e
Merge pull request #2908 from matsim-org/dependabot/maven/com.google.…
michalmac Nov 2, 2023
4340092
build: support manually triggering of full-integration
michalmac Nov 3, 2023
dd0f9c0
build: run full-integration also on macos-latest
michalmac Nov 3, 2023
9a2ce83
Merge pull request #2910 from matsim-org/full-integration-macos
michalmac Nov 3, 2023
ca78d07
build(deps): bump org.mockito:mockito-core from 5.6.0 to 5.7.0
dependabot[bot] Nov 3, 2023
e9657b4
Merge pull request #2912 from matsim-org/dependabot/maven/org.mockito…
michalmac Nov 4, 2023
2c2dec7
mvn: introduce osmosis.version property
michalmac Nov 4, 2023
9738387
Merge pull request #2917 from matsim-org/add-osmosis-version-property
michalmac Nov 5, 2023
fc66b5f
Allow multi. chargers per link
steffenaxer Nov 5, 2023
8071b20
Smallest queue selection
steffenaxer Nov 5, 2023
da3e1b9
Select free chargers first
steffenaxer Nov 5, 2023
022c89e
Change to comparingInt
steffenaxer Nov 5, 2023
a337eca
Merge pull request #2919 from steffenaxer/EmptyVehicleChargingScheduler
steffenaxer Nov 6, 2023
ef59e51
build(deps): bump osmosis.version from 0.48.3 to 0.49.1
dependabot[bot] Nov 5, 2023
4f28ccb
noise: add osmosis-core as dependency to fix build after osmosis bump…
michalmac Nov 6, 2023
779adcd
Merge pull request #2918 from matsim-org/dependabot/maven/osmosis.ver…
michalmac Nov 6, 2023
3acab9a
minibus: relaxing assertion to work around non-deterministic results
michalmac Nov 6, 2023
42d83d5
Merge pull request #2920 from matsim-org/fix-deploy-weekly-build
michalmac Nov 6, 2023
603e701
build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin
dependabot[bot] Nov 7, 2023
89a3283
Merge pull request #2924 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 7, 2023
24a319d
build(deps): bump org.apache.maven.plugins:maven-surefire-report-plugin
dependabot[bot] Nov 7, 2023
171579a
Merge pull request #2923 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 7, 2023
4af7fc2
build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin
dependabot[bot] Nov 7, 2023
4e2f82f
Merge pull request #2921 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 7, 2023
0b6b8ae
build(deps): bump org.apache.maven.plugins:maven-surefire-plugin
dependabot[bot] Nov 7, 2023
a39662a
Merge pull request #2922 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 7, 2023
0ee1ec7
dvrp: skip computing sparse TT matrix when not needed
michalmac Nov 12, 2023
48949d4
Merge pull request #2927 from matsim-org/skip-computing-sparse-tt-mat…
michalmac Nov 12, 2023
ce0528f
fix case sensitive column names (#2932)
rakow Nov 14, 2023
d4d6b75
ev: move drive discharging from event handlers to mobsim
michalmac Nov 15, 2023
05e5f2f
Merge pull request #2935 from matsim-org/move-drive-discharging-to-mo…
michalmac Nov 15, 2023
48f5e99
build(deps): bump com.google.protobuf:protobuf-java
dependabot[bot] Nov 16, 2023
2b684a2
feat: prebooking for drt (#2826)
sebhoerl Nov 16, 2023
4e8a21e
Merge branch 'master' into dependabot/maven/com.google.protobuf-proto…
michalmac Nov 16, 2023
efa9fc9
Merge pull request #2938 from matsim-org/dependabot/maven/com.google.…
michalmac Nov 16, 2023
47faf1c
build(deps): bump com.fasterxml.jackson:jackson-bom
dependabot[bot] Nov 16, 2023
f6cde50
Merge pull request #2936 from matsim-org/dependabot/maven/com.fasterx…
michalmac Nov 16, 2023
4ed9307
build(deps): bump org.apache.commons:commons-compress
dependabot[bot] Nov 16, 2023
39362b1
Merge pull request #2937 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 16, 2023
ef4b649
dvrp: fix non-deterministic PersonStuckEvent due to rejection
michalmac Nov 16, 2023
a0dc9e6
Merge pull request #2939 from matsim-org/fix-non-deterministic-stuck-…
michalmac Nov 16, 2023
7aaf87a
address latest code review
nkuehnel Nov 16, 2023
90ab6e3
add maven repo for jogl ; move jogl (and gluegen) version up to 2.5.0…
kainagel Nov 15, 2023
85cb76c
Merge branch 'master' into jogl
kainagel Nov 17, 2023
72672b6
remove the replicated jogl dependencies in otfvis/pom.xml; upgrade th…
kainagel Nov 17, 2023
72c388a
Merge branch 'master' into drtGroupBookings
nkuehnel Nov 17, 2023
2a2c4e6
repair enforcer failures. in consequence, clean up jogl versioning i…
kainagel Nov 17, 2023
27650e2
try entering the newly added jogl maven repo in the central matsim-al…
kainagel Nov 17, 2023
b0cf675
add warning message re VM options for jogl under win
kainagel Nov 17, 2023
532f9b3
add missing semicolon
kainagel Nov 17, 2023
cf073d4
feat: introduce conflict-based replanning (#2931)
sebhoerl Nov 17, 2023
e62e4b4
Merge branch 'master' into jogl
kainagel Nov 17, 2023
c262911
Merge pull request #2940 from matsim-org/jogl
kainagel Nov 17, 2023
3db5b9e
Our java gui internally calls java a second time in order to be able …
kainagel Nov 18, 2023
1068c6c
Merge pull request #2945 from matsim-org/gui
kainagel Nov 18, 2023
ea64047
escalate exceptions during parallel population reading
mrieser Nov 18, 2023
381665d
Merge pull request #2946 from matsim-org/2929-escalate-exceptions-in-…
mrieser Nov 18, 2023
6fdb213
build(deps): bump log4j.version from 2.21.1 to 2.22.0
dependabot[bot] Nov 20, 2023
6b469cd
incorporate latest changes induced by prebooking feature
nkuehnel Nov 20, 2023
03bc26b
Merge branch 'master' into drtGroupBookings
nkuehnel Nov 20, 2023
92205d5
Merge pull request #2948 from matsim-org/dependabot/maven/log4j.versi…
michalmac Nov 20, 2023
3021fe9
build(deps-dev): bump net.bytebuddy:byte-buddy from 1.14.9 to 1.14.10
dependabot[bot] Nov 20, 2023
7bfa5f4
Merge pull request #2949 from matsim-org/dependabot/maven/net.bytebud…
michalmac Nov 20, 2023
14f5e02
fix: assume reasonable power compatibility (battery can be cahrged wi…
tschlenther Nov 20, 2023
efbff54
Merge branch 'master' into evRoutingModule
tschlenther Nov 20, 2023
b8e39d2
adopt test with custom consumption model
tschlenther Nov 20, 2023
4b5805d
Merge branch 'evRoutingModule' of https://github.com/matsim-org/matsi…
tschlenther Nov 20, 2023
18d5a95
Merge pull request #2950 from matsim-org/evRoutingModule
tschlenther Nov 20, 2023
6988e84
feat: canceling prebooked drt requests (#2930)
sebhoerl Nov 21, 2023
c6639f3
attempt to reactivate edrt prebooking test (#2951)
sebhoerl Nov 21, 2023
3f7b8b8
Merge branch 'master' into drtGroupBookings
nkuehnel Nov 21, 2023
8ae0000
incorporate latest changes
nkuehnel Nov 21, 2023
47da27e
address lates comments
nkuehnel Nov 21, 2023
db0cf2f
fix compilation issues
nkuehnel Nov 21, 2023
9a83107
Merge pull request #2833 from moia-oss/drtGroupBookings
nkuehnel Nov 21, 2023
ace8aa4
build(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0
dependabot[bot] Nov 22, 2023
b2bae6b
Merge pull request #2953 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 22, 2023
3a93592
build(deps): bump com.opencsv:opencsv from 5.8 to 5.9
dependabot[bot] Nov 22, 2023
3c16e53
Merge pull request #2952 from matsim-org/dependabot/maven/com.opencsv…
michalmac Nov 22, 2023
4cc4985
build(deps): bump org.apache.httpcomponents.client5:httpclient5
dependabot[bot] Nov 23, 2023
6ca890e
Merge pull request #2956 from matsim-org/dependabot/maven/org.apache.…
michalmac Nov 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions contribs/noise/pom.xml
Original file line number Diff line number Diff line change
@@ -40,9 +40,9 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-xml</artifactId>
<version>${osmosis.version}</version>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-core</artifactId>
<version>${osmosis.version}</version>
<exclusions>
<!-- needed to compile in IntelliJ with Eclipse compiler -->
<!-- see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 -->
@@ -51,6 +51,11 @@
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-xml</artifactId>
<version>${osmosis.version}</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@

<log4j.version>2.21.1</log4j.version>
<geotools.version>29.2</geotools.version>
<osmosis.version>0.48.3</osmosis.version>
<osmosis.version>0.49.1</osmosis.version>
<jts.version>1.19.0</jts.version>
<guice.version>7.0.0</guice.version>
<jackson.version>2.15.3</jackson.version>