Skip to content

Reorder headway constructor params #36

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

Open
bmander wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reorder headway constructor params #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f93b82e
Update python wrappers for new headway param order
bmander Jul 12, 2025
80c46e0
Merge branch 'master' into codex/refactor-functions-with-same-typed-p…
bmander Jul 12, 2025
39d1d75
comment out strict C delinting
bmander Jul 12, 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
22 changes: 11 additions & 11 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ project(graphserver_core C)
set(CMAKE_C_STANDARD 99)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

# Find clang-tidy
find_program(CLANG_TIDY_EXE
NAMES "clang-tidy"
DOC "Path to clang-tidy executable")
# # Find clang-tidy
# find_program(CLANG_TIDY_EXE
# NAMES "clang-tidy"
# DOC "Path to clang-tidy executable")

# Enable clang-tidy if found
if(CLANG_TIDY_EXE)
message(STATUS "Found clang-tidy: ${CLANG_TIDY_EXE}")
set(CMAKE_C_CLANG_TIDY ${CLANG_TIDY_EXE})
else()
message(WARNING "clang-tidy not found. Install clang-tidy to enable static analysis.")
endif()
# # Enable clang-tidy if found
# if(CLANG_TIDY_EXE)
# message(STATUS "Found clang-tidy: ${CLANG_TIDY_EXE}")
# set(CMAKE_C_CLANG_TIDY ${CLANG_TIDY_EXE})
# else()
# message(WARNING "clang-tidy not found. Install clang-tidy to enable static analysis.")
# endif()

# Source files
file(GLOB CORE_SRCS
Expand Down
4 changes: 3 additions & 1 deletion core/edgetypes/headwayalight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// HEADWAYALIGHT FUNCTIONS

HeadwayAlight*
haNew( ServiceId service_id, ServiceCalendar* calendar, Timezone* timezone, int agency, char* trip_id, int start_time, int end_time, int headway_secs ) {
haNew(ServiceId service_id, char* trip_id,
ServiceCalendar* calendar, Timezone* timezone, int agency,
int start_time, int end_time, int headway_secs ) {
HeadwayAlight* ret = (HeadwayAlight*)malloc(sizeof(HeadwayAlight));
ret->external_id = 0;
ret->type = PL_HEADWAYALIGHT;
Expand Down
4 changes: 3 additions & 1 deletion core/edgetypes/headwayalight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ struct HeadwayAlight {
};

HeadwayAlight*
haNew( ServiceId service_id, ServiceCalendar* calendar, Timezone* timezone, int agency, char* trip_id, int start_time, int end_time, int headway_secs );
haNew(ServiceId service_id, char* trip_id,
ServiceCalendar* calendar, Timezone* timezone, int agency,
int start_time, int end_time, int headway_secs );

void
haDestroy(HeadwayAlight* this);
Expand Down
4 changes: 3 additions & 1 deletion core/edgetypes/headwayboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// HEADWAYBOARD FUNCTIONS

HeadwayBoard*
hbNew( ServiceId service_id, ServiceCalendar* calendar, Timezone* timezone, int agency, char* trip_id, int start_time, int end_time, int headway_secs ) {
hbNew(ServiceId service_id, char* trip_id,
ServiceCalendar* calendar, Timezone* timezone, int agency,
int start_time, int end_time, int headway_secs ) {
HeadwayBoard* ret = (HeadwayBoard*)malloc(sizeof(HeadwayBoard));
ret->external_id = 0;
ret->type = PL_HEADWAYBOARD;
Expand Down
4 changes: 3 additions & 1 deletion core/edgetypes/headwayboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ struct HeadwayBoard {
} ;

HeadwayBoard*
hbNew( ServiceId service_id, ServiceCalendar* calendar, Timezone* timezone, int agency, char* trip_id, int start_time, int end_time, int headway_secs );
hbNew(ServiceId service_id, char* trip_id,
ServiceCalendar* calendar, Timezone* timezone, int agency,
int start_time, int end_time, int headway_secs);

void
hbDestroy(HeadwayBoard* this);
Expand Down
4 changes: 2 additions & 2 deletions pygs/graphserver/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,10 +1744,10 @@ def __init__(

self.soul = self._cnew(
service_id,
trip_id,
calendar.soul,
timezone.soul,
agency,
trip_id,
start_time,
end_time,
headway_secs,
Expand Down Expand Up @@ -1856,10 +1856,10 @@ def __init__(

self.soul = self._cnew(
service_id,
trip_id,
calendar.soul,
timezone.soul,
agency,
trip_id,
start_time,
end_time,
headway_secs,
Expand Down
4 changes: 2 additions & 2 deletions pygs/graphserver/gsdll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,10 @@ class ENUM_edgepayload_t:
LGSTypes.HeadwayAlight,
[
LGSTypes.ServiceId,
c_char_p,
LGSTypes.ServiceCalendar,
LGSTypes.Timezone,
c_int,
c_char_p,
c_int,
c_int,
c_int,
Expand Down Expand Up @@ -606,10 +606,10 @@ class ENUM_edgepayload_t:
LGSTypes.HeadwayBoard,
[
LGSTypes.ServiceId,
c_char_p,
LGSTypes.ServiceCalendar,
LGSTypes.Timezone,
c_int,
c_char_p,
c_int,
c_int,
c_int,
Expand Down