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.

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

[dijkstra] Removing duplicated code #2512

Merged
merged 4 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 20 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
pgRouting 3.6.0 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
**C/C++ code enhancements**

* `2504 <https://github.com/pgRouting/pgrouting/pull/2504>` To C++ pg data get,
fetch and check.

* Stopping support for compilation with MSVC.

* `2505 <https://github.com/pgRouting/pgrouting/pull/2505>` Using namespace.
* `2512 <https://github.com/pgRouting/pgrouting/pull/2512>` [Dijkstra] Removing
duplicate code on Dijkstra.

**Documentation**

* `2490 <https://github.com/pgRouting/pgrouting/pull/2490>` Automatic page
history links.

pgRouting 3.5.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
**C/C++ code enhancements**

* `2496 <https://github.com/pgRouting/pgrouting/pull/2496>` Grouping headers.
* `2497 <https://github.com/pgRouting/pgrouting/pull/2497>` Arrays input to C++.


pgRouting 3.5.0 Release Notes
-------------------------------------------------------------------------------
Expand Down
24 changes: 20 additions & 4 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,33 @@ To see the full list of changes check the list of `Git commits
.. contents:: Contents
:local:



pgRouting 3.6.0 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
.. rubric:: C/C++ code enhancements

* `2504 <https://github.com/pgRouting/pgrouting/pull/2504>` To C++ pg data get,
fetch and check.

* Stopping support for compilation with MSVC.

* `2505 <https://github.com/pgRouting/pgrouting/pull/2505>` Using namespace.
* `2512 <https://github.com/pgRouting/pgrouting/pull/2512>` [Dijkstra] Removing
duplicate code on Dijkstra.

.. rubric:: Documentation

* `2490 <https://github.com/pgRouting/pgrouting/pull/2490>` Automatic page
history links.

pgRouting 3.5.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet
.. rubric:: C/C++ code enhancements

* `2496 <https://github.com/pgRouting/pgrouting/pull/2496>` Grouping headers.
* `2497 <https://github.com/pgRouting/pgrouting/pull/2497>` Arrays input to C++.


pgRouting 3.5.0 Release Notes
-------------------------------------------------------------------------------
Expand Down
63 changes: 17 additions & 46 deletions include/drivers/dijkstra/dijkstra_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Copyright (c) 2015 pgRouting developers
Mail: [email protected]

Function's developer:
Copyright (c) 2023 Celia Virginia Vergara Castillo
Copyright (c) 2015 Celia Virginia Vergara Castillo
Mail: [email protected]
Mail: vicky at erosion.dev

Copyright (c) 2020 The combinations_sql signature is added by Mahmoud SAKR
and Esteban ZIMANYI
mail: m_attia_sakr@yahoo.com, estebanzimanyi@gmail.com
mail: m_attia_sakr at yahoo.com, estebanzimanyi at gmail.com

------

Expand All @@ -35,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#ifndef INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRA_DRIVER_H_
#define INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRA_DRIVER_H_

/* for size-t */
#ifdef __cplusplus
# include <cstddef>
# include <cstdint>
Expand All @@ -54,50 +54,21 @@ typedef struct II_t_rt II_t_rt;
extern "C" {
#endif

void do_pgr_many_to_many_dijkstra(
Edge_t *data_edges,
size_t total_tuples,
int64_t *start_vidsArr,
size_t size_start_vidsArr,
int64_t *end_vidsArr,
size_t size_end_vidsArr,
bool directed,
bool only_cost,
bool normal,
int64_t n_goals,
bool global,

Path_rt **return_tuples,
size_t *return_count,

char** log_msg,
char** notice_msg,
char** err_msg);


// CREATE OR REPLACE FUNCTION pgr_dijkstra(
// sql text,
// combinations_sql text,
// directed boolean default true,
void do_pgr_combinations_dijkstra(
Edge_t *data_edges,
size_t total_tuples,
II_t_rt *combinations,
size_t total_combinations,
bool directed,
bool only_cost,
bool normal,
int64_t n_goals,
bool global,

Path_rt **return_tuples,
size_t *return_count,

char** log_msg,
char** notice_msg,
char** err_msg);
void pgr_do_dijkstra(
Edge_t*, size_t,
II_t_rt*, size_t,
int64_t*, size_t,
int64_t*, size_t,

bool, bool, bool,
int64_t, bool,

Path_rt**, size_t*,
char**, char**, char**);


#ifdef __cplusplus
}
}
#endif

#endif // INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRA_DRIVER_H_
Loading