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

Commits on Aug 29, 2024

  1. update TODOS

    @rewertvsp
    rewertvsp committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a35df06 View commit details
    Browse the repository at this point in the history

  2. change service timeWindow

    @rewertvsp
    rewertvsp committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    97614b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Outsourced VehicleSelection and GetGenerationRates

    @Aleksander1234519
    Aleksander1234519 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    7ce25ff View commit details
    Browse the repository at this point in the history

  2. Implemented Allocator to resolve service duration problem (untested)

    @Aleksander1234519
    Aleksander1234519 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    90085fe View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Resolved null error

    @Aleksander1234519
    Aleksander1234519 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    5bdb4c8 View commit details
    Browse the repository at this point in the history

  2. Fixed jspritIteration value-initialization bug

    @Aleksander1234519
    Aleksander1234519 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    a173fd1 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b2b7b85 View commit details
    Browse the repository at this point in the history

  2. change inputs of class by using globFile

    @rewertvsp
    rewertvsp committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    8627fa3 View commit details
    Browse the repository at this point in the history

  3. add carrier analysis to small scale commercial generation

    @rewertvsp
    rewertvsp committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    14d70ad View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. format log massages

    @rewertvsp
    rewertvsp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    c3fcf76 View commit details
    Browse the repository at this point in the history

  2. add more general carrier analysis

    @rewertvsp
    rewertvsp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3555b3f View commit details
    Browse the repository at this point in the history

  3. clean up

    @rewertvsp
    rewertvsp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b70c482 View commit details
    Browse the repository at this point in the history

  4. update carrier_stats to new version

    @rewertvsp
    rewertvsp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    f2a1875 View commit details
    Browse the repository at this point in the history

  5. update carrier_stats to new version

    @rewertvsp
    rewertvsp committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    95dd98c View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Created a viability assurance for carrier plans with small vehicle fleet

    @Aleksander1234519
    Aleksander1234519 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a938a6f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/developmentOfSmallScaleCommercia… 

    …lTraffic' into developmentOfSmallScaleCommercialTraffic
    @Aleksander1234519
    Aleksander1234519 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    2a36f1f View commit details
    Browse the repository at this point in the history

  3. Put the carrier-creation back into the main class

    @Aleksander1234519
    Aleksander1234519 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    0e0bc7f View commit details
    Browse the repository at this point in the history

  4. Outsourced VehicleSelection

    @Aleksander1234519
    Aleksander1234519 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    696fd64 View commit details
    Browse the repository at this point in the history

  5. Specified event-classes

    @Aleksander1234519
    Aleksander1234519 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    292327e View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Refactored carrier-analysis and created tests

    @Aleksander1234519
    Aleksander1234519 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    83de8be View commit details
    Browse the repository at this point in the history

  2. Resolved FileSystemError

    @Aleksander1234519
    Aleksander1234519 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9ec7243 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. add TODO

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    43f116e View commit details
    Browse the repository at this point in the history

  2. change pom for freight analysis

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    cceee21 View commit details
    Browse the repository at this point in the history

  3. add two additional constructors and add separate carriers only analysis

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    79db689 View commit details
    Browse the repository at this point in the history

  4. removed copied files to move the original files afterward

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    016cf47 View commit details
    Browse the repository at this point in the history

  5. update simple tests

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    979dd02 View commit details
    Browse the repository at this point in the history

  6. make class independent of application contrib

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    7d1d2cc View commit details
    Browse the repository at this point in the history

  7. move freight analysis into freight contrib

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    3627d9d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    69cb4c1 View commit details
    Browse the repository at this point in the history

  9. add buffer try catch

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8eb44a5 View commit details
    Browse the repository at this point in the history

  10. add comments

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8389cab View commit details
    Browse the repository at this point in the history

  11. add number of not handled jobs

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    6b4bb3d View commit details
    Browse the repository at this point in the history

  12. formatting

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9fe1900 View commit details
    Browse the repository at this point in the history

  13. use the current analysis version

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    0bcef4e View commit details
    Browse the repository at this point in the history

  14. use delimiter and add comment

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    37c8d5a View commit details
    Browse the repository at this point in the history

  15. update file for new carrier analysis

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    75b5a9b View commit details
    Browse the repository at this point in the history

  16. update file for new carrier analysis

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a6ec150 View commit details
    Browse the repository at this point in the history

  17. use configurable delimiter for all classes

    @rewertvsp
    rewertvsp committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    5555782 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. formatting

    @rewertvsp
    rewertvsp committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    41dfb99 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. change parameters of method

    @rewertvsp
    rewertvsp committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    2c804c9 View commit details
    Browse the repository at this point in the history

  2. add possible solution for serviceTime selection

    @rewertvsp
    rewertvsp committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    9740e12 View commit details
    Browse the repository at this point in the history

  3. add TODO

    @rewertvsp
    rewertvsp committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5f36d3e View commit details
    Browse the repository at this point in the history

  4. renamed variables

    @Aleksander1234519
    Aleksander1234519 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f3f77e9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f593eeb View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge remote-tracking branch 'origin/developmentOfSmallScaleCommercia… 

    …lTraffic' into developmentOfSmallScaleCommercialTraffic
    @Aleksander1234519
    Aleksander1234519 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    5090ae2 View commit details
    Browse the repository at this point in the history

  2. Implemented the replanning loop (still not fully working)

    @Aleksander1234519
    Aleksander1234519 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6fa87bb View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. restructure commercial specification interface

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    eeee11d View commit details
    Browse the repository at this point in the history

  2. formatting

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    a004cd4 View commit details
    Browse the repository at this point in the history

  3. rename method

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8ff8b7f View commit details
    Browse the repository at this point in the history

  4. formatting

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9ac0810 View commit details
    Browse the repository at this point in the history

  5. rename

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    31d74aa View commit details
    Browse the repository at this point in the history

  6. add current version of solving all carriers

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    605c7f6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    268189c View commit details
    Browse the repository at this point in the history

  8. use new CarrierUtils method

    @rewertvsp
    rewertvsp committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f6d6a9c View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Updated reference events file in test

    @Aleksander1234519
    Aleksander1234519 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    14c7e8c View commit details
    Browse the repository at this point in the history

  2. Removed old code/comments

    @Aleksander1234519
    Aleksander1234519 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e7aa7ce View commit details
    Browse the repository at this point in the history

  3. Moved odMatrix, resultingDataPerZone, linksPerZone into class attribu… 

    …tes, for smaller method-headers
    @Aleksander1234519
    Aleksander1234519 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c6d634d View commit details
    Browse the repository at this point in the history

  4. Javadoc and formatting

    @Aleksander1234519
    Aleksander1234519 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    aab4022 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Outsourced methods for unhandled-services into UnhandledServicesSolution

    @Aleksander1234519
    Aleksander1234519 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    9a08faa View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @Aleksander1234519
    Aleksander1234519 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    1d53511 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9f62ecc View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. updates tests for freight analysis to use more example inputs

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    742543a View commit details
    Browse the repository at this point in the history

  2. formatting

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    73f37a9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/master' into developmentOfSmallScaleCommerci… 

    …alTraffic
    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    ef170bf View commit details
    Browse the repository at this point in the history

  4. reduce iterations for test

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f26a08b View commit details
    Browse the repository at this point in the history

  5. try to fix test

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    abff745 View commit details
    Browse the repository at this point in the history

  6. remove usage of path to fix tests

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    7881ec1 View commit details
    Browse the repository at this point in the history

  7. use new analysis version

    @rewertvsp
    rewertvsp committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6b1bc72 View commit details
    Browse the repository at this point in the history