Tdata4

.travis.yml

@@ -1,21 +1,40 @@
 language: c
 
+sudo: required
+dist: trusty
+
 compiler:
   - gcc
   - clang
 
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+addons:
+  apt:
+    packages:
+    - libprotobuf-c0-dev
+    - protobuf-c-compiler
+    - check
+    - pkg-config
+
 before_install:
-  - sudo apt-get update >/dev/null
-  - sudo apt-get -q install check libprotobuf-c0-dev protobuf-c-compiler
+  - export TZ=Europe/Amsterdam
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libprotobuf-c0-dev protobuf-c-compiler check pkg-config
 
 before_script:
+  - pip install pytz python-dateutil --user `whoami`
+  - export PATH=$HOME/.local/bin:$PATH
   - mkdir build
   - cd build
   - cmake ..
 
 script:
   - make
   - ctest
+  - python -m unittest discover ../rrtimetable/rrtimetable "*_tests.py"
 
 env:
   global:

CMakeLists.txt

@@ -1,16 +1,17 @@
 cmake_minimum_required(VERSION 2.8.4)
-project(ansi)
+project(ansi C)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wall -ansi -pedantic -ggdb3 -DRRRR_VALGRIND -DRRRR_STRICT")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wall -std=c89 -pedantic -g -ggdb3 -DRRRR_VALGRIND -DRRRR_STRICT -march=native")
 if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Weverything")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Weverything -Wno-reserved-id-macro -Wno-documentation-unknown-command -Wno-c99-extensions -Wno-padded -Wno-disabled-macro-expansion -Wno-variadic-macros -Wno-gnu-zero-variadic-macro-arguments")
 endif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
 
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Weverything -Werror")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Weverything")
 endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 
+set_source_files_properties(gtfs-realtime.pb-c.c PROPERTIES COMPILE_FLAGS -Wno-missing-variable-declarations)
 
 SET(PROTO_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gtfs-realtime.proto
@@ -33,18 +34,35 @@ add_custom_command(OUTPUT ${PROTO_HDRS} ${PROTO_SRCS}
 ENABLE_TESTING()
 
 set(SOURCE_FILES
+    api.c
+    api.h
     bitset.c
     bitset.h
-    cli.c
     config.h
     geometry.c
     geometry.h
     gtfs-realtime.pb-c.c
     gtfs-realtime.pb-c.h
     hashgrid.c
     hashgrid.h
+    index_journey_pattern_points.c
+    index_journey_pattern_points.h
+    index_journey_patterns.c
+    index_journey_patterns.h
+    index_vehicle_journeys.c
+    index_vehicle_journeys.h
+    json.c
+    json.h
     linkedlist.c
     linkedlist.h
+    plan.c
+    plan.h
+    plan_render_otp.c
+    plan_render_otp.h
+    plan_render_text.c
+    plan_render_text.h
+    polyline.c
+    polyline.h
     radixtree.c
     radixtree.h
     router.c
@@ -56,23 +74,36 @@ set(SOURCE_FILES
     router_result.c
     router_result.h
     rrrr_types.h
+    set.c
+    set.h
+    string_pool.c
+    string_pool.h
     tdata.c
     tdata.h
-    tdata_io_v3.h
-    tdata_io_v3_dynamic.c
-    tdata_io_v3_mmap.c
+    tdata_jit.h
+    tdata_jit.c
+    tdata_io_v4.h
+    tdata_io_v4_dynamic.c
+    tdata_io_v4_mmap.c
     tdata_realtime_alerts.c
     tdata_realtime_alerts.h
     tdata_realtime_expanded.c
     tdata_realtime_expanded.h
     tdata_validation.c
     tdata_validation.h
+    street_network.h
+    street_network.c
+    hashgrid_street_network.c
     util.c
     util.h)
 
+include_directories(/usr/local/include)
+
+link_directories(/usr/local/lib)
 link_libraries(m)
 link_libraries(protobuf-c)
 
-add_executable(cli ${SOURCE_FILES})
+add_executable(cli ${SOURCE_FILES} cli.c)
+add_library(rrrr ${SOURCE_FILES})
 
 add_subdirectory(tests)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Bliksem Labs.
+Copyright (c) 2014–2015, Bliksem Labs.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Makefile

@@ -1,25 +1,28 @@
 CC=clang
 
 debug:
-	$(CC) -DRRRR_STRICT -DRRRR_TDATA_IO_DYNAMIC -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_64 -Wextra -Wall -ansi -pedantic -DRRRR_DEBUG -DRRRR_INFO -DRRRR_TDATA -ggdb -O0 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v3_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c router_dump.c hashgrid.c
-	$(CC) -DRRRR_STRICT -DRRRR_TDATA_IO_MMAP -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_64 -Wextra -Wall -ansi -pedantic -DRRRR_DEBUG -DRRRR_INFO -DRRRR_TDATA -ggdb -O0 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v3_mmap.c radixtree.c gtfs-realtime.pb-c.c geometry.c router_dump.c hashgrid.c
+	$(CC) -DRRRR_STRICT -DRRRR_TDATA_IO_DYNAMIC -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_64 -Wextra -Wall -ansi -pedantic -DRRRR_DEBUG -DRRRR_INFO -DRRRR_TDATA -ggdb -O0 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v4_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c router_dump.c hashgrid.c plan_render_text.c polyline.c json.c plan_render_otp.c api.c set.c string_pool.c hashgrid_street_network.c street_network.c
+	$(CC) -DRRRR_STRICT -DRRRR_TDATA_IO_MMAP -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_64 -Wextra -Wall -ansi -pedantic -DRRRR_DEBUG -DRRRR_INFO -DRRRR_TDATA -ggdb -O0 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v4_mmap.c radixtree.c gtfs-realtime.pb-c.c geometry.c router_dump.c hashgrid.c plan_render_text.c polyline.c json.c plan_render_otp.c api.c set.c string_pool.c hashgrid_street_network.c street_network.c
 
 valgrind:
-	$(CC) -DRRRR_STRICT -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_128 -DNDEBUG -O0 -ggdb3 -Wextra -Wall -std=c99 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v3_dynamic.c tdata_io_v3_mmap.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c
+	$(CC) -I/usr/local/include -L/usr/local/lib -DRRRR_STRICT -DRRRR_FAKE_REALTIME -DRRRR_VALGRIND -DRRRR_BITSET_128 -DNDEBUG -O0 -ggdb3 -Wextra -Wall -std=c99 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v4_dynamic.c tdata_io_v4_mmap.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c plan_render_text.c polyline.c json.c plan_render_otp.c api.c set.c string_pool.c hashgrid_street_network.c street_network.c
 
 prod:
-	$(CC) -DRRRR_BITSET_128 -DNDEBUG -O3 -Wextra -Wall -std=c99 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v3_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c
+	$(CC) -DRRRR_BITSET_128 -DNDEBUG -O3 -Wextra -Wall -std=c99 -lm -lprotobuf-c -o cli cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_expanded.c tdata_realtime_alerts.c tdata_io_v4_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c plan_render_text.c polyline.c json.c plan_render_otp.c api.c set.c string_pool.c hashgrid_street_network.c street_network.c api.c plan.c
 
 ioscli:
-	$(CC) -isysroot /var/sdks/Latest.sdk -DRRRR_TDATA_IO_MMAP -DRRRR_BITSET_64 -DNDEBUG -O2 -Wextra -Wall -std=c99 -lm -o cli router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_io_v3_mmap.c radixtree.c geometry.c hashgrid.c cli.c
+	$(CC) -isysroot /var/sdks/Latest.sdk -DRRRR_TDATA_IO_MMAP -DRRRR_BITSET_64 -DNDEBUG -O2 -Wextra -Wall -std=c99 -lm -o cli router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_io_v4_mmap.c radixtree.c geometry.c hashgrid.c cli.c plan_render_text.c api.c set.c string_pool.c hashgrid_street_network.c street_network.c
 
 ios:
-	$(CC) -isysroot /var/sdks/Latest.sdk -DRRRR_TDATA_IO_MMAP -DRRRR_BITSET_64 -DNDEBUG -O2 -Wextra -Wall -std=c99 -c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_io_v3_mmap.c radixtree.c geometry.c hashgrid.c
-	libtool -static -o ../librrrr.a router.o tdata.o tdata_validation.o bitset.o router_request.o router_result.o util.o tdata_io_v3_mmap.o radixtree.o geometry.o hashgrid.o
-
+	$(CC) -isysroot /var/sdks/Latest.sdk -DRRRR_TDATA_IO_MMAP -DRRRR_BITSET_64 -DNDEBUG -O2 -Wextra -Wall -std=c99 -c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_io_v4_mmap.c radixtree.c geometry.c hashgrid.c api.c set.c string_pool.c hashgrid_street_network.c
+	libtool -static -o ../librrrr.a router.o tdata.o tdata_validation.o bitset.o router_request.o router_result.o util.o tdata_io_v4_mmap.o radixtree.o geometry.o hashgrid.o api.o set.o string_pool.o hashgrid_street_network.o street_network.o
 
 all:
 	protoc-c --c_out=. gtfs-realtime.proto
+	$(CC) -c -Wextra -Wall -ansi -pedantic set.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic json.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic string_pool.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic polyline.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic util.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic linkedlist.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic bitset.c
@@ -28,14 +31,19 @@ all:
 	$(CC) -c -Wextra -Wall -ansi -pedantic geometry.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic radixtree.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic tdata_validation.c
-	$(CC) -DRRRR_TDATA_IO_DYNAMIC -c -Wextra -Wall -ansi -pedantic tdata_io_v3_dynamic.c
-	$(CC) -DRRRR_TDATA_IO_MMAP -c -Wextra -Wall -ansi -pedantic tdata_io_v3_mmap.c
+	$(CC) -DRRRR_TDATA_IO_DYNAMIC -c -Wextra -Wall -ansi -pedantic tdata_io_v4_dynamic.c
+	$(CC) -DRRRR_TDATA_IO_MMAP -c -Wextra -Wall -ansi -pedantic tdata_io_v4_mmap.c
 	$(CC) -DRRRR_STRICT -c -Wextra -Wall -ansi -pedantic tdata.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic street_network.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic hashgrid_street_network.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic tdata_realtime_alerts.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic tdata_realtime_expanded.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic router_request.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic router_dump.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic router.c
 	$(CC) -c -Wextra -Wall -ansi -pedantic router_result.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic plan_render_text.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic plan_render_otp.c
+	$(CC) -c -Wextra -Wall -ansi -pedantic api.c
 	# $(CC) -o cli -Wextra -Wall -ansi -pedantic cli.c stubs.c
-	$(CC) -lm -lprotobuf-c -o cli -Wextra -Wall -ansi -pedantic cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c router_result.c util.c tdata_realtime_alerts.c tdata_realtime_expanded.c tdata_io_v3_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c
+	$(CC) -lm -lprotobuf-c -o cli -Wextra -Wall -ansi -pedantic cli.c router.c tdata.c tdata_validation.c bitset.c router_request.c street_network.c hashgrid_street_network.c router_result.c util.c tdata_realtime_alerts.c tdata_realtime_expanded.c tdata_io_v4_dynamic.c radixtree.c gtfs-realtime.pb-c.c geometry.c hashgrid.c plan_render_text.c polyline.c api.c set.c string_pool.c

README.md

@@ -23,15 +23,20 @@ clang provides very good error messages and warnings. At present time gcc provid
 1. **check**:
 a unit testing framework for c. http://check.sourceforge.net/.
 
+Dependencies for OSX
+--------------------
+
+1. **brew**
+Install homebrew. http://brew.sh/
+
+1. brew install protobuf-c check pkg-config cmake
+Install the requirements to Cmake would work.
 
 Building transit data
 ---------------------
 
-The ansi branch currently does not include any build scripts. Your best bet for generating timetable v3 outside the realm of Bliksem Integration will be timetable.py from the realtime_expanded2 branch.
-First, run `python gtfsdb.py input.gtfs.zip output.gtfsdb` to load your GTFS feed into an SQLite database.
-Next, run `python transfers.py output.gtfsdb` to add distance-based transfers to the transfers table in the database.
-Finally, run `python timetable.py output.gtfsdb` to create the timetable file `timetable.dat` based on that GTFS database.
-If you just want to experiment with the code download: http://1313.nl/timetable.dat
+Browse into rrtimetable/rrtimetable. Run `python gtfs2rrrr.py gtfs.zip` to create the timetable file `timetable4.dat` based on that GTFS database.
+If you just want to experiment with the code download: http://1313.nl/timetable4.dat
 
 Coding conventions
 ------------------
@@ -67,3 +72,9 @@ Been there done that
  * We have attempted to split the journey_pattern_t in a core routing and a meta data struct. The resulting code was 4% slower.
  * The original code for the router state was packed in one struct. It gave 10% improvement to split it in separate lists.
  * In an attempt to prevent overflow checking (migrating rtime to 32bit) resulted in a serious performance degradation.
+
+Conciderations
+--------------
+
+ * In some places of the code the function argument has been made uint32_t to prevent overflowing on a multiplication later. Such example is initialize_transfers_full (router_t *router, uint32_t round) where the original uint8_t round is later multiplied with spidx_t.
+