Skip to content
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
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ To see all issues & pull requests closed by this release see the
* [#3049](https://github.com/pgRouting/pgrouting/issues/3049): Use enumeration on drivers and process.
* [#3054](https://github.com/pgRouting/pgrouting/issues/3054): Change error message when edges_sql is empty
* [#3055](https://github.com/pgRouting/pgrouting/issues/3055): bdDijkstra: use the shortest_path process and driver
* [#3056](https://github.com/pgRouting/pgrouting/issues/3056): edwardMoore: use the shortest_path process and driver

## pgRouting 4.0

Expand Down
1 change: 1 addition & 0 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ To see all issues & pull requests closed by this release see the
* :issue:`3049`: Use enumeration on drivers and process.
* :issue:`3054`: Change error message when edges_sql is empty
* :issue:`3055`: bdDijkstra: use the shortest_path process and driver
* :issue:`3056`: edwardMoore: use the shortest_path process and driver

pgRouting 4.0
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Expand Down
13 changes: 13 additions & 0 deletions include/bellman_ford/edwardMoore.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,19 @@ class Pgr_edwardMoore {
}
};
} // namespace functions

namespace algorithms {

template <class G>
std::deque<pgrouting::Path>
edwardMoore(
G &graph,
const std::map<int64_t, std::set<int64_t>> &combinations) {
pgrouting::functions::Pgr_edwardMoore<G> fn_edwardMoore;
return fn_edwardMoore.edwardMoore(graph, combinations);
}

} // namespace algorithms
} // namespace pgrouting

#endif // INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_
2 changes: 1 addition & 1 deletion include/c_common/enums.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ enum Which {
/** directed graph + results: vertex id */
TOPOSORT = 11,
/** shortest_paths */
DIJKSTRA = 21, WITHPOINTS, OLD_WITHPOINTS, BDDIJKSTRA,
DIJKSTRA = 21, WITHPOINTS, OLD_WITHPOINTS, BDDIJKSTRA, EDWARDMOORE,
/** allpairs **/
FLOYD = 31, JOHNSON,
/** metrics **/
Expand Down
76 changes: 0 additions & 76 deletions include/drivers/bellman_ford/edwardMoore_driver.h

This file was deleted.

7 changes: 6 additions & 1 deletion locale/en/LC_MESSAGES/pgrouting_doc_strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-02-05 18:16+0000\n"
"POT-Creation-Date: 2026-02-06 17:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -3941,6 +3941,11 @@ msgid ""
"use the shortest_path process and driver"
msgstr ""

msgid ""
"`#3056 <https://github.com/pgRouting/pgrouting/issues/3056>`__: edwardMoore: "
"use the shortest_path process and driver"
msgstr ""

msgid "All releases"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion locale/pot/pgrouting_doc_strings.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-02-05 18:16+0000\n"
"POT-Creation-Date: 2026-02-06 17:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -3538,6 +3538,9 @@ msgstr ""
msgid "`#3055 <https://github.com/pgRouting/pgrouting/issues/3055>`__: bdDijkstra: use the shortest_path process and driver"
msgstr ""

msgid "`#3056 <https://github.com/pgRouting/pgrouting/issues/3056>`__: edwardMoore: use the shortest_path process and driver"
msgstr ""

msgid "All releases"
msgstr ""

Expand Down
3 changes: 2 additions & 1 deletion pgtap/bellman_ford/edwardMoore/no_crash_test.pg
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ BEGIN;


UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
SELECT CASE WHEN min_version('3.2.0') THEN plan (97) ELSE plan(84) END;
SELECT CASE WHEN min_version('3.2.0') THEN plan (98) ELSE plan(85) END;


SELECT general_no_crash('pgr_edwardMoore');
SELECT throw_on_empty_edges_sql('pgr_edwardMoore', ',1,2');
SELECT finish();

ROLLBACK;
Expand Down
5 changes: 0 additions & 5 deletions src/allpairs/floydWarshall.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stdbool.h>
#include "c_common/postgres_connection.h"

#include "c_types/iid_t_rt.h"
#include "c_common/debug_macro.h"
#include "c_common/e_report.h"
#include "c_common/time_msg.h"

#include "process/allpairs_process.h"

PGDLLEXPORT Datum _pgr_floydwarshall(PG_FUNCTION_ARGS);
Expand Down
5 changes: 0 additions & 5 deletions src/allpairs/johnson.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stdbool.h>
#include "c_common/postgres_connection.h"

#include "c_types/iid_t_rt.h"
#include "c_common/debug_macro.h"
#include "c_common/e_report.h"
#include "c_common/time_msg.h"

#include "process/allpairs_process.h"

PGDLLEXPORT Datum _pgr_johnson(PG_FUNCTION_ARGS);
Expand Down
4 changes: 0 additions & 4 deletions src/bdDijkstra/bdDijkstra.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include <stdbool.h>
#include "c_common/postgres_connection.h"

#include "c_types/path_rt.h"
#include "c_common/debug_macro.h"
#include "c_common/e_report.h"
#include "c_common/time_msg.h"
#include "process/shortestPath_process.h"

PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS);
Expand Down
4 changes: 2 additions & 2 deletions src/bellman_ford/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This file is part of the pgRouting project.
# Copyright (c) 2018-2026 pgRouting developers
# License: GPL-2 See https://github.com/pgRouting/pgrouting/blob/main/LICENSE

ADD_LIBRARY(bellman_ford OBJECT
bellman_ford.c
bellman_ford_driver.cpp
#bellman_ford_neg.c
#bellman_ford_neg_driver.cpp
edwardMoore.c
edwardMoore_driver.cpp
)
)
Loading