Code

Custom cost routing#1

Code

Merged

christophfink merged 24 commits intomainDigitalGeographyLab/r5py_gp2:mainfrom custom-cost-routingDigitalGeographyLab/r5py_gp2:custom-cost-routingCopy head branch name to clipboardJan 16, 2024

+737,938-22

Commits

Commits on Nov 9, 2023

• added tests for custom cost routing logic, added fixtures to conftest, added osmid helsinki double and zero test datas

  roopehub

  committed
  c091a44

• modified DetailedItineraries related components to support returning also list of OsmId's

  roopehub

  committed
  ba0e6d3

• modified matrix computer to support results OsmId's

  roopehub

  committed
  3a3af7e

• created a subclass of TransportNetwork for enabling support for custom costs and custom cost routing, some minor conditionals to the existing 'base' classes, added file for custom cost related conv…

  Show description for 5f684be
  roopehub

  committed
  5f684be

Commits on Nov 15, 2023

• fixed files and tests for when using r5 without custom cost support, mainly adding osmids and checking them differently to prevent crashing when they are absent

  roopehub

  committed
  ce869fa

• added datas for the tests, improved the tests and conftestfile, added e.g. tests for negative values

  roopehub

  committed
  1b20970

• added better checking of osmids to prevent crashing if absent

  roopehub

  committed
  49b1fcc

• improved and fixed the business logic, added support for lists for names, sensitivities and custom_cost_dicts, removed custom cost related code from parent TransportNetwork.py, made conversions wor…

  Show description for 134cd52
  roopehub

  committed
  134cd52

• apparently accidentally removed start_jvm from util init.py, added it back

  roopehub

  committed
  d0377bf

• removed unused commented imports from util init

  roopehub

  committed
  fc31232

Commits on Nov 22, 2023

• refactored logic, fixed not to add osmIds from result to df if they arent present, added support for getting base travel times and addition travel cost seconds

  roopehub

  committed
  90036b9

• refactored tests for better, added tests for base travel time cost and addition travel cost seconds

  roopehub

  committed
  926e48b

Commits on Nov 23, 2023

• just a bogus edit to try to trigger github to re-render the PR diff

  christophfink

  committed
  f522e43

• remove bogus edit again

  christophfink

  committed
  b8d6762

Commits on Dec 18, 2023

• Use our own R5 jar, upgrade R5 to v7.0 (r5py#385)

  Show description for edc2613
  

  christophfink

  authored and

  roopehub

  committed
  edc2613

• apparently accidentally removed start_jvm from util init.py, added it back

  roopehub

  committed
  0cba520

• removed unused commented imports from util init

  roopehub

  committed
  772c767

• Use our own R5 jar, upgrade R5 to v7.0 (r5py#385)

  Show description for d0f8fa5
  

  christophfink

  authored and

  roopehub

  committed
  d0f8fa5

• apparently accidentally removed start_jvm from util init.py, added it back

  roopehub

  committed
  832800b

• pr comment changes, renamed custom_datas and remove obsole type checking of type CustomCostTransportNetwork for it's always TransportNetwork

  roopehub

  committed
  d1882b3

• also did the name change in the tests

  roopehub

  committed
  db8e3b8

Commits on Dec 19, 2023

• added kmh and mph for car detailed itineraries, added test data for it and osmid_ways.csv all to same file

  roopehub

  committed
  40b1d8f

• merged remote to local after merge to main

  roopehub

  committed
  e745c49

Commits on Dec 20, 2023

• Merge branch 'main' into custom-cost-routing

  roopehub

  authored
  7de6602