Skip to content

Commit

Permalink
Some changes that were not marked as conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvvergara
cvvergara committed Oct 24, 2024
1 parent fb80779 commit 84c2399
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 105 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ jobs:
make install
- name: Install pgTAP
if: false
run: |
git clone https://github.com/theory/pgtap.git pgTapExtension
cd pgTapExtension
Expand All @@ -79,7 +78,6 @@ jobs:
ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin
- name: Test
if: false
run: |
export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
pg_ctl -D $(brew --prefix)/var/postgresql@14 start
Expand Down
196 changes: 98 additions & 98 deletions docqueries/max_flow/edgeDisjointPaths.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ SELECT * FROM pgr_edgeDisjointPaths(
11, 12);
seq | path_id | path_seq | node | edge | cost | agg_cost
-----+---------+----------+------+------+------+----------
1 | 1 | 1 | 11 | 8 | 1 | 1
2 | 1 | 2 | 7 | 10 | 1 | 2
3 | 1 | 3 | 8 | 12 | 1 | 3
4 | 1 | 4 | 12 | -1 | 0 | 4
5 | 2 | 1 | 11 | 11 | 1 | 4
6 | 2 | 2 | 12 | -1 | 0 | 5
1 | 1 | 1 | 11 | 8 | 1 | 0
2 | 1 | 2 | 7 | 10 | 1 | 1
3 | 1 | 3 | 8 | 12 | 1 | 2
4 | 1 | 4 | 12 | -1 | 0 | 3
5 | 2 | 1 | 11 | 11 | 1 | 0
6 | 2 | 2 | 12 | -1 | 0 | 1
(6 rows)

/* -- q2 */
Expand All @@ -24,20 +24,20 @@ SELECT * FROM pgr_edgeDisjointPaths(
11, ARRAY[5, 10, 12]);
seq | path_id | path_seq | end_vid | node | edge | cost | agg_cost
-----+---------+----------+---------+------+------+------+----------
1 | 1 | 1 | 5 | 11 | 8 | 1 | 1
2 | 1 | 2 | 5 | 7 | 4 | 1 | 2
3 | 1 | 3 | 5 | 6 | 1 | 1 | 3
4 | 1 | 4 | 5 | 5 | -1 | 0 | 4
5 | 2 | 1 | 10 | 11 | 9 | 1 | 4
6 | 2 | 2 | 10 | 16 | 16 | 1 | 5
7 | 2 | 3 | 10 | 15 | 3 | 1 | 6
8 | 2 | 4 | 10 | 10 | -1 | 0 | 7
9 | 3 | 1 | 12 | 11 | 8 | 1 | 7
10 | 3 | 2 | 12 | 7 | 10 | 1 | 8
11 | 3 | 3 | 12 | 8 | 12 | 1 | 9
12 | 3 | 4 | 12 | 12 | -1 | 0 | 10
13 | 4 | 1 | 12 | 11 | 11 | 1 | 10
14 | 4 | 2 | 12 | 12 | -1 | 0 | 11
1 | 1 | 1 | 5 | 11 | 8 | 1 | 0
2 | 1 | 2 | 5 | 7 | 4 | 1 | 1
3 | 1 | 3 | 5 | 6 | 1 | 1 | 2
4 | 1 | 4 | 5 | 5 | -1 | 0 | 3
5 | 2 | 1 | 10 | 11 | 9 | 1 | 0
6 | 2 | 2 | 10 | 16 | 16 | 1 | 1
7 | 2 | 3 | 10 | 15 | 3 | 1 | 2
8 | 2 | 4 | 10 | 10 | -1 | 0 | 3
9 | 3 | 1 | 12 | 11 | 8 | 1 | 0
10 | 3 | 2 | 12 | 7 | 10 | 1 | 1
11 | 3 | 3 | 12 | 8 | 12 | 1 | 2
12 | 3 | 4 | 12 | 12 | -1 | 0 | 3
13 | 4 | 1 | 12 | 11 | 11 | 1 | 0
14 | 4 | 2 | 12 | 12 | -1 | 0 | 1
(14 rows)

/* -- q3 */
Expand All @@ -47,20 +47,20 @@ SELECT * FROM pgr_edgeDisjointPaths(
ARRAY[11, 3, 17], 12);
seq | path_id | path_seq | start_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+------+------+------+----------
1 | 1 | 1 | 3 | 3 | 7 | 1 | 1
2 | 1 | 2 | 3 | 7 | 8 | 1 | 2
3 | 1 | 3 | 3 | 11 | 11 | 1 | 3
4 | 1 | 4 | 3 | 12 | -1 | 0 | 4
5 | 2 | 1 | 11 | 11 | 8 | 1 | 4
6 | 2 | 2 | 11 | 7 | 10 | 1 | 5
7 | 2 | 3 | 11 | 8 | 12 | 1 | 6
8 | 2 | 4 | 11 | 12 | -1 | 0 | 7
9 | 3 | 1 | 11 | 11 | 11 | 1 | 7
10 | 3 | 2 | 11 | 12 | -1 | 0 | 8
11 | 4 | 1 | 17 | 17 | 15 | 1 | 8
12 | 4 | 2 | 17 | 16 | 9 | 1 | 9
13 | 4 | 3 | 17 | 11 | 11 | 1 | 10
14 | 4 | 4 | 17 | 12 | -1 | 0 | 11
1 | 1 | 1 | 3 | 3 | 7 | 1 | 0
2 | 1 | 2 | 3 | 7 | 8 | 1 | 1
3 | 1 | 3 | 3 | 11 | 11 | 1 | 2
4 | 1 | 4 | 3 | 12 | -1 | 0 | 3
5 | 2 | 1 | 11 | 11 | 8 | 1 | 0
6 | 2 | 2 | 11 | 7 | 10 | 1 | 1
7 | 2 | 3 | 11 | 8 | 12 | 1 | 2
8 | 2 | 4 | 11 | 12 | -1 | 0 | 3
9 | 3 | 1 | 11 | 11 | 11 | 1 | 0
10 | 3 | 2 | 11 | 12 | -1 | 0 | 1
11 | 4 | 1 | 17 | 17 | 15 | 1 | 0
12 | 4 | 2 | 17 | 16 | 9 | 1 | 1
13 | 4 | 3 | 17 | 11 | 11 | 1 | 2
14 | 4 | 4 | 17 | 12 | -1 | 0 | 3
(14 rows)

/* -- q4 */
Expand All @@ -70,48 +70,48 @@ SELECT * FROM pgr_edgeDisjointPaths(
ARRAY[11, 3, 17], ARRAY[5, 10, 12]);
seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+---------+------+------+------+----------
1 | 1 | 1 | 3 | 5 | 3 | 7 | 1 | 1
2 | 1 | 2 | 3 | 5 | 7 | 4 | 1 | 2
3 | 1 | 3 | 3 | 5 | 6 | 1 | 1 | 3
4 | 1 | 4 | 3 | 5 | 5 | -1 | 0 | 4
5 | 2 | 1 | 3 | 10 | 3 | 7 | 1 | 4
6 | 2 | 2 | 3 | 10 | 7 | 8 | 1 | 5
7 | 2 | 3 | 3 | 10 | 11 | 9 | 1 | 6
8 | 2 | 4 | 3 | 10 | 16 | 16 | 1 | 7
9 | 2 | 5 | 3 | 10 | 15 | 3 | 1 | 8
10 | 2 | 6 | 3 | 10 | 10 | -1 | 0 | 9
11 | 3 | 1 | 3 | 12 | 3 | 7 | 1 | 9
12 | 3 | 2 | 3 | 12 | 7 | 8 | 1 | 10
13 | 3 | 3 | 3 | 12 | 11 | 11 | 1 | 11
14 | 3 | 4 | 3 | 12 | 12 | -1 | 0 | 12
15 | 4 | 1 | 11 | 5 | 11 | 8 | 1 | 12
16 | 4 | 2 | 11 | 5 | 7 | 4 | 1 | 13
17 | 4 | 3 | 11 | 5 | 6 | 1 | 1 | 14
18 | 4 | 4 | 11 | 5 | 5 | -1 | 0 | 15
19 | 5 | 1 | 11 | 10 | 11 | 9 | 1 | 15
20 | 5 | 2 | 11 | 10 | 16 | 16 | 1 | 16
21 | 5 | 3 | 11 | 10 | 15 | 3 | 1 | 17
22 | 5 | 4 | 11 | 10 | 10 | -1 | 0 | 18
23 | 6 | 1 | 11 | 12 | 11 | 8 | 1 | 18
24 | 6 | 2 | 11 | 12 | 7 | 10 | 1 | 19
25 | 6 | 3 | 11 | 12 | 8 | 12 | 1 | 20
26 | 6 | 4 | 11 | 12 | 12 | -1 | 0 | 21
27 | 7 | 1 | 11 | 12 | 11 | 11 | 1 | 21
28 | 7 | 2 | 11 | 12 | 12 | -1 | 0 | 22
29 | 8 | 1 | 17 | 5 | 17 | 15 | 1 | 22
30 | 8 | 2 | 17 | 5 | 16 | 16 | 1 | 23
31 | 8 | 3 | 17 | 5 | 15 | 3 | 1 | 24
32 | 8 | 4 | 17 | 5 | 10 | 2 | 1 | 25
33 | 8 | 5 | 17 | 5 | 6 | 1 | 1 | 26
34 | 8 | 6 | 17 | 5 | 5 | -1 | 0 | 27
35 | 9 | 1 | 17 | 10 | 17 | 15 | 1 | 27
36 | 9 | 2 | 17 | 10 | 16 | 16 | 1 | 28
37 | 9 | 3 | 17 | 10 | 15 | 3 | 1 | 29
38 | 9 | 4 | 17 | 10 | 10 | -1 | 0 | 30
39 | 10 | 1 | 17 | 12 | 17 | 15 | 1 | 30
40 | 10 | 2 | 17 | 12 | 16 | 9 | 1 | 31
41 | 10 | 3 | 17 | 12 | 11 | 11 | 1 | 32
42 | 10 | 4 | 17 | 12 | 12 | -1 | 0 | 33
1 | 1 | 1 | 3 | 5 | 3 | 7 | 1 | 0
2 | 1 | 2 | 3 | 5 | 7 | 4 | 1 | 1
3 | 1 | 3 | 3 | 5 | 6 | 1 | 1 | 2
4 | 1 | 4 | 3 | 5 | 5 | -1 | 0 | 3
5 | 2 | 1 | 3 | 10 | 3 | 7 | 1 | 0
6 | 2 | 2 | 3 | 10 | 7 | 8 | 1 | 1
7 | 2 | 3 | 3 | 10 | 11 | 9 | 1 | 2
8 | 2 | 4 | 3 | 10 | 16 | 16 | 1 | 3
9 | 2 | 5 | 3 | 10 | 15 | 3 | 1 | 4
10 | 2 | 6 | 3 | 10 | 10 | -1 | 0 | 5
11 | 3 | 1 | 3 | 12 | 3 | 7 | 1 | 0
12 | 3 | 2 | 3 | 12 | 7 | 8 | 1 | 1
13 | 3 | 3 | 3 | 12 | 11 | 11 | 1 | 2
14 | 3 | 4 | 3 | 12 | 12 | -1 | 0 | 3
15 | 4 | 1 | 11 | 5 | 11 | 8 | 1 | 0
16 | 4 | 2 | 11 | 5 | 7 | 4 | 1 | 1
17 | 4 | 3 | 11 | 5 | 6 | 1 | 1 | 2
18 | 4 | 4 | 11 | 5 | 5 | -1 | 0 | 3
19 | 5 | 1 | 11 | 10 | 11 | 9 | 1 | 0
20 | 5 | 2 | 11 | 10 | 16 | 16 | 1 | 1
21 | 5 | 3 | 11 | 10 | 15 | 3 | 1 | 2
22 | 5 | 4 | 11 | 10 | 10 | -1 | 0 | 3
23 | 6 | 1 | 11 | 12 | 11 | 8 | 1 | 0
24 | 6 | 2 | 11 | 12 | 7 | 10 | 1 | 1
25 | 6 | 3 | 11 | 12 | 8 | 12 | 1 | 2
26 | 6 | 4 | 11 | 12 | 12 | -1 | 0 | 3
27 | 7 | 1 | 11 | 12 | 11 | 11 | 1 | 0
28 | 7 | 2 | 11 | 12 | 12 | -1 | 0 | 1
29 | 8 | 1 | 17 | 5 | 17 | 15 | 1 | 0
30 | 8 | 2 | 17 | 5 | 16 | 16 | 1 | 1
31 | 8 | 3 | 17 | 5 | 15 | 3 | 1 | 2
32 | 8 | 4 | 17 | 5 | 10 | 2 | 1 | 3
33 | 8 | 5 | 17 | 5 | 6 | 1 | 1 | 4
34 | 8 | 6 | 17 | 5 | 5 | -1 | 0 | 5
35 | 9 | 1 | 17 | 10 | 17 | 15 | 1 | 0
36 | 9 | 2 | 17 | 10 | 16 | 16 | 1 | 1
37 | 9 | 3 | 17 | 10 | 15 | 3 | 1 | 2
38 | 9 | 4 | 17 | 10 | 10 | -1 | 0 | 3
39 | 10 | 1 | 17 | 12 | 17 | 15 | 1 | 0
40 | 10 | 2 | 17 | 12 | 16 | 9 | 1 | 1
41 | 10 | 3 | 17 | 12 | 11 | 11 | 1 | 2
42 | 10 | 4 | 17 | 12 | 12 | -1 | 0 | 3
(42 rows)

/* -- q5 */
Expand All @@ -132,17 +132,17 @@ SELECT * FROM pgr_edgeDisjointPaths(
directed => false);
seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+---------+------+------+------+----------
1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 1
2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 2
3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 1
4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 1
5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 2
6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 3
7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 4
8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 5
9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 5
10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | 4
11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | 3
1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 0
2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 1
3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 0
4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 0
5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 1
6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 2
7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 3
8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 4
9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 0
10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | -1
11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | -2
(11 rows)

/* -- q6 */
Expand All @@ -153,17 +153,17 @@ SELECT * FROM pgr_edgeDisjointPaths(
directed => false);
seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+---------+------+------+------+----------
1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 1
2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 2
3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 1
4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 1
5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 2
6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 3
7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 4
8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 5
9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 5
10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | 4
11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | 3
1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 0
2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 1
3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 0
4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 0
5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 1
6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 2
7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 3
8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 4
9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 0
10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | -1
11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | -2
(11 rows)

/* -- q7 */
Expand Down
2 changes: 1 addition & 1 deletion docqueries/mincut/stoerWagner.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SELECT * FROM pgr_stoerWagner(
FROM edges WHERE id < 17');
seq | edge | cost | mincut
-----+------+------+--------
1 | 14 | 1 | 1
1 | 6 | 1 | 1
(1 row)

/* -- q2 */
Expand Down
8 changes: 4 additions & 4 deletions include/cpp_common/basic_vertex.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ namespace pgrouting {
class Basic_vertex {
public:
Basic_vertex() :
id(0), vertex_index(0) {}
id(0) {}
Basic_vertex(const Basic_vertex &v) :
id(v.id), vertex_index(0) {}
id(v.id) {}

explicit Basic_vertex(const int64_t _id) :
id(_id), vertex_index(0) {}
id(_id) {}

Basic_vertex& operator=(const Basic_vertex&) = default;

Basic_vertex(const Edge_t &other, bool is_source) :
id(is_source? other.source : other.target), vertex_index(0) {}
id(is_source? other.source : other.target) {}

void cp_members(const Basic_vertex &other) {
this->id = other.id;
Expand Down

0 comments on commit 84c2399

Please sign in to comment.