From f93b82e403b65e6a46ecc329a629da5938a396ca Mon Sep 17 00:00:00 2001 From: Brandon Martin-Anderson Date: Sat, 12 Jul 2025 13:30:46 -0700 Subject: [PATCH 1/2] Update python wrappers for new headway param order --- core/edgetypes/headwayalight.c | 4 +++- core/edgetypes/headwayalight.h | 4 +++- core/edgetypes/headwayboard.c | 4 +++- core/edgetypes/headwayboard.h | 4 +++- pygs/graphserver/core.py | 4 ++-- pygs/graphserver/gsdll.py | 4 ++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/core/edgetypes/headwayalight.c b/core/edgetypes/headwayalight.c index a8359908..2f6cfdb7 100644 --- a/core/edgetypes/headwayalight.c +++ b/core/edgetypes/headwayalight.c @@ -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; diff --git a/core/edgetypes/headwayalight.h b/core/edgetypes/headwayalight.h index 58048744..8077fcb4 100644 --- a/core/edgetypes/headwayalight.h +++ b/core/edgetypes/headwayalight.h @@ -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); diff --git a/core/edgetypes/headwayboard.c b/core/edgetypes/headwayboard.c index 4df50b78..9186ba9d 100644 --- a/core/edgetypes/headwayboard.c +++ b/core/edgetypes/headwayboard.c @@ -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; diff --git a/core/edgetypes/headwayboard.h b/core/edgetypes/headwayboard.h index f21eeb3e..f4beb140 100644 --- a/core/edgetypes/headwayboard.h +++ b/core/edgetypes/headwayboard.h @@ -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); diff --git a/pygs/graphserver/core.py b/pygs/graphserver/core.py index 4598ba98..057b3f0d 100644 --- a/pygs/graphserver/core.py +++ b/pygs/graphserver/core.py @@ -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, @@ -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, diff --git a/pygs/graphserver/gsdll.py b/pygs/graphserver/gsdll.py index 057a3dce..dfedb203 100644 --- a/pygs/graphserver/gsdll.py +++ b/pygs/graphserver/gsdll.py @@ -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, @@ -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, From 39d1d75b5f05da51d926fb6cbdbfcf012a6bfb8f Mon Sep 17 00:00:00 2001 From: Brandon Martin-Anderson Date: Sat, 12 Jul 2025 21:10:52 +0000 Subject: [PATCH 2/2] comment out strict C delinting --- core/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 26d495ce..5ca5bc77 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -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