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

Jump to bottom

Development of small scale commercial traffic & Move CarrierAnalysis to the freight contrib #3514

Merged
merged 68 commits into from
Oct 17, 2024
Merged

Development of small scale commercial traffic & Move CarrierAnalysis to the freight contrib #3514

merged 68 commits into from
Oct 17, 2024

Conversation

rewertvsp
Copy link
Contributor

@rewertvsp rewertvsp commented Oct 15, 2024 •
edited
Loading

This PR contains two main developments:

  1. updates for the small scale commercial traffic:
  • durations and data-distributions, that can be programmed using the Interfaces (IntegrateExistingTrafficToSmallScaleCommercial, CommercialTourSpecifications, VehicleSelection)
  • Carrier plans are automatically replanned if VRP of a carrier can not handle all jobs (Implementation can be changed by using the interface: UnhandledServicesSolution)
  1. move Freight analysis to freight contrib
  • add analysis with results of an overview of handled and not handled jobs
  • gives warnings if not all jobs are solved by the VRP
  • add more constructors for analysis
  • add analysis only for the carriers file

rewertvsp and others added 30 commits August 29, 2024 11:30
@rewertvsp
update TODOS
a35df06
@rewertvsp
change service timeWindow
97614b5
@Aleksander1234519
Outsourced VehicleSelection and GetGenerationRates
7ce25ff
@Aleksander1234519
Implemented Allocator to resolve service duration problem (untested)
90085fe
@Aleksander1234519
Resolved null error
5bdb4c8
@Aleksander1234519
Fixed jspritIteration value-initialization bug
a173fd1
@rewertvsp
Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci…
b2b7b85 
…alTraffic
@rewertvsp
change inputs of class by using globFile
8627fa3
@rewertvsp
add carrier analysis to small scale commercial generation
14d70ad
@rewertvsp
format log massages
c3fcf76
@rewertvsp
add more general carrier analysis
3555b3f
@rewertvsp
clean up
b70c482
@rewertvsp
update carrier_stats to new version
f2a1875
@rewertvsp
update carrier_stats to new version
95dd98c
@Aleksander1234519
Created a viability assurance for carrier plans with small vehicle fleet
a938a6f
@Aleksander1234519
Merge remote-tracking branch 'origin/developmentOfSmallScaleCommercia…
2a36f1f 
…lTraffic' into developmentOfSmallScaleCommercialTraffic
@Aleksander1234519
Put the carrier-creation back into the main class
0e0bc7f
@Aleksander1234519
Outsourced VehicleSelection
696fd64
@Aleksander1234519
Specified event-classes
292327e
@Aleksander1234519
Refactored carrier-analysis and created tests
83de8be
@Aleksander1234519
Resolved FileSystemError
9ec7243
@rewertvsp
add TODO
43f116e
@rewertvsp
change pom for freight analysis
cceee21
@rewertvsp
add two additional constructors and add separate carriers only analysis
79db689
@rewertvsp
removed copied files to move the original files afterward
016cf47
@rewertvsp
update simple tests
979dd02
@rewertvsp
make class independent of application contrib
7d1d2cc
@rewertvsp
move freight analysis into freight contrib
3627d9d
@rewertvsp
Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci…
69cb4c1 
…alTraffic
@rewertvsp
add buffer try catch
8eb44a5
Aleksander1234519 and others added 19 commits September 24, 2024 15:08
@Aleksander1234519
renamed variables
f3f77e9
@rewertvsp
Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci…
f593eeb 
…alTraffic
@Aleksander1234519
Merge remote-tracking branch 'origin/developmentOfSmallScaleCommercia…
5090ae2 
…lTraffic' into developmentOfSmallScaleCommercialTraffic
@Aleksander1234519
Implemented the replanning loop (still not fully working)
6fa87bb
@rewertvsp
restructure commercial specification interface
eeee11d
@rewertvsp
formatting
a004cd4
@rewertvsp
rename method
8ff8b7f
@rewertvsp
formatting
9ac0810
@rewertvsp
rename
31d74aa
@rewertvsp
add current version of solving all carriers
605c7f6
@rewertvsp
Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci…
268189c 
…alTraffic
@rewertvsp
use new CarrierUtils method
f6d6a9c
@Aleksander1234519
Updated reference events file in test
14c7e8c
@Aleksander1234519
Removed old code/comments
e7aa7ce
@Aleksander1234519
Moved odMatrix, resultingDataPerZone, linksPerZone into class attribu…
c6d634d 
…tes, for smaller method-headers
@Aleksander1234519
Javadoc and formatting
aab4022
@Aleksander1234519
Outsourced methods for unhandled-services into UnhandledServicesSolution
9a08faa
@Aleksander1234519
minor fixes
1d53511
@rewertvsp
Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci…
9f62ecc 
…alTraffic
@kt86 kt86 changed the title Development of small scale commercial traffic Development of small scale commercial traffic & Move CarrierAnalysis to the freight contrib Oct 15, 2024
@rewertvsp rewertvsp marked this pull request as ready for review October 17, 2024 10:45
@rewertvsp rewertvsp merged commit 9f7ea04 into master Oct 17, 2024
49 checks passed
@rewertvsp rewertvsp deleted the developmentOfSmallScaleCommercialTraffic branch October 17, 2024 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rewertvsp @Aleksander1234519