Skip to content

Commit 1059058

Browse files
wifi:)wifi:)
authored andcommitted
Resolve some confilct
1 parent b714ba3 commit 1059058

4 files changed

Lines changed: 3 additions & 6 deletions

File tree

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ notUsed
1313
.vscode
1414
taptest.sh
1515
run.sh
16-
get_signatures.sh
17-
ordering_example

doc/ordering/pgr_kingOrdering.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
:start-after: warning-begin
2323
:end-before: end-warning
2424

25-
.. rubric:: Availability
26-
27-
* Version 4.0.0
25+
.. rubric:: Version 4.0.0
2826

2927
* New experimental function.
3028

include/drivers/ordering_driver.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Mail: project@pgrouting.org
99
1010
Copyright (c) 2025 Bipasha Gayary
1111
Mail: bipashagayary at gmail.com
12+
1213
Copyright (c) 2025 Fan Wu
1314
Mail: wifiblack0131 at gmail.com
1415

pgtap/ordering/cuthillMckeeOrdering/no_crash_test.pg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2020
BEGIN;
2121

2222
UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
23-
SELECT CASE WHEN NOT min_version('3.4.0') THEN plan(1) ELSE plan(4) END;
23+
SELECT CASE WHEN NOT min_version('3.4.0') THEN plan(1) ELSE plan(7) END;
2424

2525
PREPARE edges AS
2626
SELECT id, source, target, cost, reverse_cost FROM edges;

0 commit comments

Comments
 (0)