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.

Sign up for GitHub

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

Integrate "demand generation of parcel delivery" (based on master thesis) in matsim-libs #3665

Merged
merged 53 commits into from
Jan 20, 2025
Merged

Integrate "demand generation of parcel delivery" (based on master thesis) in matsim-libs #3665

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
059e82b
Matsim Advanced
May 14, 2024
3044f4e
Matsim Advanced - Small fixes
May 14, 2024
2e49324
Matsim Advanced - Small fixes 2
May 14, 2024
83a2671
Merge branch 'matsim-org:master' into master
AnaUeb May 24, 2024
dde8994
Masterarbeit 1
May 24, 2024
f566eda
Merge branch 'master' of https://github.com/AnaUeb/matsim-libs
May 24, 2024
5d4c0c2
Merge branch 'matsim-org:master' into master
AnaUeb May 24, 2024
7a8fd39
DemandPerAge - MA
Jun 5, 2024
2100fda
DemandPerAge - MA 2
Jun 7, 2024
ba55915
DemandPerAge - MA 3
Jun 11, 2024
8368088
MA - Erros
Jun 21, 2024
bf3029c
Modify freight demand generation tool
Jun 22, 2024
6921cf3
Changes 2
Jun 25, 2024
5c4307d
Packages per Person
Jun 25, 2024
09f38a6
Stop time
Jul 16, 2024
6e19035
Presentation day
Aug 6, 2024
6a3974e
Code merge-conflicts day
Aug 9, 2024
d99b43e
merge in upstream master from matsim-libs
kt86 Aug 9, 2024
be0c562
auto indent lines. no changes in behaviour
kt86 Aug 9, 2024
65ab468
First run after merge
Aug 13, 2024
f794d0e
PLZ-runs
Oct 2, 2024
67cf249
poisson
Oct 9, 2024
c83fb61
commit MA
Dec 8, 2024
1b21f54
commit MA 2
Dec 9, 2024
754049b
marge in matsim-libs/master and resolve conflicts
kt86 Dec 10, 2024
8744950
fix compile error
kt86 Dec 10, 2024
faf938c
test was already removed, after class itself was removed.
kt86 Dec 11, 2024
7052e39
add data for new column in CarrierLoadAnalysis
kt86 Dec 11, 2024
97aaafd
add check for null
kt86 Dec 11, 2024
e1db475
Revert "add check for null" -- because it leads to an infinty running...
kt86 Dec 11, 2024
0e25410
update FreightDemandGeneration by adding functionality for specific u…
rewertvsp Jan 7, 2025
aeb2b1f
add implementation for parcel delivery
rewertvsp Jan 7, 2025
c6d3953
rename method and extend java doc
rewertvsp Jan 7, 2025
0f8e4ee
add demand information to ageGroup file 1
rewertvsp Jan 7, 2025
65a6a84
move stuff into brackets
rewertvsp Jan 9, 2025
8a82a1e
revert renaming
rewertvsp Jan 9, 2025
ff95066
add tests
rewertvsp Jan 9, 2025
0f2b841
rename test input files
rewertvsp Jan 10, 2025
8591463
add java doc
rewertvsp Jan 10, 2025
dc9e722
Merge remote-tracking branch 'refs/remotes/upstream/master' into upda…
rewertvsp Jan 13, 2025
2533395
rename to related object
rewertvsp Jan 13, 2025
6797c6a
fix controller
rewertvsp Jan 13, 2025
e0eb2f2
Merge pull request #4 from AnaUeb/updateAna2-by-Ricardo
rewertvsp Jan 13, 2025
6be7865
Merge branch 'matsim-org:master' into ana2
kt86 Jan 13, 2025
01ecf5b
move link finding for persons to more effective place
rewertvsp Jan 14, 2025
2a45de0
Merge remote-tracking branch 'upstream/master' into ana2
rewertvsp Jan 15, 2025
eae01d8
use recent Builder for services
rewertvsp Jan 15, 2025
e7486a3
Merge branch 'master' into ana2
rewertvsp Jan 15, 2025
0fc834f
Merge remote-tracking branch 'upstream/master' into ana2
rewertvsp Jan 20, 2025
4b1a0e6
Merge remote-tracking branch 'upstream/master' into ana2
rewertvsp Jan 20, 2025
7f1785e
mark Freight analysis in vsp contrib as deprecated, but make it runab…
rewertvsp Jan 20, 2025
6e56d39
delete unneeded test files
rewertvsp Jan 20, 2025
2db78f7
Some cleanup (#5)
kt86 Jan 20, 2025
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
Prev Previous commit
Next Next commit
use recent Builder for services
  • Loading branch information
@rewertvsp
rewertvsp committed Jan 15, 2025
commit eae01d887e24cae9d638265a13d95212b524660b
13 changes: 6 additions & 7 deletions ...ibs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,9 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
Id<CarrierService> idNewService = Id.create(
createJobId(scenario, newDemandInformationElement, linkPersonPair.getLink().getId(), null),
CarrierService.class);
CarrierService .Builder builder = CarrierService.Builder.newInstance(idNewService, linkPersonPair.getLink().getId())
.setCapacityDemand(demandForThisLink).setServiceDuration(serviceTime);
CarrierService thisService = builder.setServiceStartingTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
CarrierService.Builder builder = CarrierService.Builder.newInstance(idNewService, linkPersonPair.getLink().getId(),
demandForThisLink).setServiceDuration(serviceTime);
CarrierService thisService = builder.setServiceStartingTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create(newDemandInformationElement.getCarrierName(), Carrier.class)).getServices()
Expand Down Expand Up @@ -730,8 +730,7 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
createJobId(scenario, newDemandInformationElement, link.getId(), null),
CarrierService.class);
if (demandToDistribute > 0 && singleDemandForThisLink > 0) {
CarrierService.Builder builder = CarrierService.Builder.newInstance(idNewService, link.getId())
.setCapacityDemand(singleDemandForThisLink).setServiceDuration(serviceTime);
CarrierService.Builder builder = CarrierService.Builder.newInstance(idNewService, link.getId(), singleDemandForThisLink).setServiceDuration(serviceTime);
CarrierService thisService = builder.setServiceStartingTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
thisCarrier.getServices().put(thisService.getId(), thisService);
Expand Down Expand Up @@ -781,8 +780,8 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
Id<CarrierService> idNewService = Id.create(
createJobId(scenario, newDemandInformationElement, linkPersonPair.getLink().getId(), null), CarrierService.class);
if ((demandToDistribute > 0 && singleDemandForThisLink > 0) || demandToDistribute == 0) {
CarrierService.Builder builder = CarrierService.Builder.newInstance(idNewService, linkPersonPair.getLink().getId())
.setCapacityDemand(singleDemandForThisLink).setServiceDuration(serviceTime);
CarrierService.Builder builder = CarrierService.Builder.newInstance(idNewService, linkPersonPair.getLink().getId(),
singleDemandForThisLink).setServiceDuration(serviceTime);
CarrierService thisService = builder.setServiceStartingTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
CarriersUtils.getCarriers(scenario).getCarriers()
Expand Down
Loading