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

Adjusting file names on driving distans #2655

Closed
wants to merge 5 commits into from
Closed

Adjusting file names on driving distans #2655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1854cdc
(driving_distance) Standarizing filenames
cvvergara Oct 7, 2024
a4ee2a2
(build) Adjusting build and files to name changes
cvvergara Oct 7, 2024
150e011
Removing unused header files
cvvergara Oct 7, 2024
4073295
fix clang-tidy error
cvvergara Oct 9, 2024
b9210ab
(clan-tidy) fix script not finding postgres.h
cvvergara Oct 9, 2024
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
4 changes: 2 additions & 2 deletions .github/scripts/tidy-vs-commit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if [ ${#MODIFIED_HEADERS[@]} != 0 ] ; then
for f in ${MODIFIED_HEADERS}
do
echo "${f}"
clang-tidy "${CHECKS}" -header-filter=.* "${f}" \
-- -I./include "${POSTGRES_SERVER}"
echo clang-tidy "${CHECKS}" -header-filter=.* "${f}" -- -I./include "${POSTGRES_SERVER}"
clang-tidy "${CHECKS}" -header-filter=.* "${f}" -- -I./include ${POSTGRES_SERVER}
done
fi
155 changes: 0 additions & 155 deletions include/cpp_common/signalhandler.hpp
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ivers/driving_distance/drivedist_driver.h → ...riving_distance/driving_distance_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_
#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_
#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_
#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -68,4 +68,4 @@ void pgr_do_drivingDistance(
}
#endif

#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_
#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_
6 changes: 3 additions & 3 deletions ...s/driving_distance/withPoints_dd_driver.h → ...ance/driving_distance_withPoints_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_
#define INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_
#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_
#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_
#pragma once


Expand Down Expand Up @@ -76,4 +76,4 @@ void pgr_do_withPointsDD(
}
#endif

#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_
#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_
114 changes: 0 additions & 114 deletions include/vrp/book_keeping.hpp
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions src/driving_distance/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
ADD_LIBRARY(driving_distance OBJECT
many_to_dist_driving_distance.c
many_to_dist_withPointsDD.c
driving_distance.c
driving_distance_withPoints.c

drivedist_driver.cpp
withPoints_dd_driver.cpp
)
driving_distance_driver.cpp
driving_distance_withPoints_driver.cpp

)
4 changes: 2 additions & 2 deletions ..._distance/many_to_dist_driving_distance.c → src/driving_distance/driving_distance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: many_to_dist_driving_distance.c
File: driving_distance.c

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "c_common/e_report.h"
#include "c_common/time_msg.h"

#include "drivers/driving_distance/drivedist_driver.h"
#include "drivers/driving_distance/driving_distance_driver.h"


PGDLLEXPORT Datum _pgr_drivingdistance(PG_FUNCTION_ARGS);
Expand Down
4 changes: 2 additions & 2 deletions src/driving_distance/drivedist_driver.cpp → ...ving_distance/driving_distance_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: drivedist_driver.cpp
File: driving_distance_driver.cpp

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

********************************************************************PGR-GNU*/

#include "drivers/driving_distance/drivedist_driver.h"
#include "drivers/driving_distance/driving_distance_driver.h"

#include <sstream>
#include <deque>
Expand Down
6 changes: 3 additions & 3 deletions ...ving_distance/many_to_dist_withPointsDD.c → ...ng_distance/driving_distance_withPoints.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*PGR-GNU*****************************************************************
File: many_to_dist_withPointsDD.c
File: driving_distance_withPoints.c

Copyright (c) 2015 pgRouting developers
Mail: [email protected]
Expand Down Expand Up @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "c_common/e_report.h"
#include "c_common/time_msg.h"
#include "drivers/withPoints/get_new_queries.h"
#include "drivers/driving_distance/withPoints_dd_driver.h"
#include "drivers/driving_distance/driving_distance_withPoints_driver.h"

PGDLLEXPORT Datum _pgr_withpointsddv4(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(_pgr_withpointsddv4);
Expand Down Expand Up @@ -70,7 +70,7 @@ process(
}
} else {
/* TODO remove on v4 */
char d_side = (char)tolower(driving_side[0]);
d_side = (char)tolower(driving_side[0]);
if (!((d_side == 'r') || (d_side == 'l'))) d_side = 'b';
}

Expand Down
Loading
Loading