Commit b714ba3
Merge upstream/develop into minDegree-ordering-cleanup
Resolved merge conflicts in:
- doc/_static/page_history.js: Combined page entries for both branches
- doc/ordering/CMakeLists.txt: Added all ordering files
- doc/ordering/ordering-family.rst: Fixed duplicates and added all functions
- doc/ordering/pgr_kingOrdering.rst: Fixed formatting and rubric
- doc/src/pgRouting-introduction.rst: Combined contributor lists
- docqueries/ordering/CMakeLists.txt: Added all ordering query files
- docqueries/ordering/test.conf: Added all test files, removed duplicates
- include/drivers/ordering_driver.hpp: Combined developer credits
- include/ordering/kingOrdering.hpp: Fixed header guard comment
- sql/ordering/CMakeLists.txt: Added all SQL files
- src/ordering/CMakeLists.txt: Added all source files
For add/add conflicts, used upstream version for complete implementations:
- include/process/ordering_process.h
- pgtap/ordering/kingOrdering/edge_cases.pg
- sql/ordering/_kingOrdering.sql
- sql/ordering/kingOrdering.sql
- src/ordering/kingOrdering.c
- src/ordering/ordering_driver.cpp
- src/ordering/ordering_process.cpp
This merge combines the minDegree ordering work with the latest upstream
changes including bandwidth and sloan ordering implementations.277 files changed
Lines changed: 4260 additions & 2089 deletions
File tree
- .github/workflows
- docqueries
- metrics
- ordering
- src
- doc
- _static
- allpairs
- contraction
- metrics
- ordering
- src
- include
- astar
- bdAstar
- bdDijkstra
- bellman_ford
- breadthFirstSearch
- chinese
- circuits
- cpp_common
- dagShortestPath
- dijkstra
- drivers
- max_flow
- metrics
- mincut
- ordering
- process
- spanningTree
- topologicalSort
- trsp
- visitors
- withPoints
- yen
- locale
- en/LC_MESSAGES
- pot
- pgtap
- metrics/bandwidth
- ordering
- kingOrdering
- sloan
- traversal/binaryBreadthFirstSearch/edge_cases
- sql
- allpairs
- astar
- bdAstar
- bdDijkstra
- bellman_ford
- breadthFirstSearch
- chinese
- coloring
- common
- components
- contraction
- dagShortestPath
- dijkstra
- dominator
- driving_distance
- ksp
- lineGraph
- max_flow
- metrics
- mincut
- ordering
- pickDeliver
- planar
- sigs
- spanningTree
- topologicalSort
- transitiveClosure
- traversal
- trsp
- tsp
- utilities
- version
- vrp_basic
- withPoints
- src
- bellman_ford
- coloring
- common
- cpp_common
- dijkstra
- dominator
- ksp
- max_flow
- metrics
- ordering
- pickDeliver
- transitiveClosure
- trsp
- withPoints
- tools/testers
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | | - | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
0 commit comments