-
Notifications
You must be signed in to change notification settings - Fork 0
/
contributions.diff
5165 lines (5120 loc) · 164 KB
/
contributions.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/.gitignore b/.gitignore
index 8a9206dcc..ce3e26546 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,11 @@ build
fix_typos
code_linter
+tools/template/mycreate.sh
+*.sh
.DS_Store
.vagrant
tools/vagrant/packaging.sh
+tools/testers/pg_prove_dijkstraTRSP_tests.sh
.directory
notUsed
diff --git a/.travis.yml b/.travis.yml
index 1767ad4f2..f2e03ce74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
-# Travis CI scripts
+# Travis CI scripts
# Copyright(c) pgRouting Contributors
#
# Main configuration
@@ -8,7 +8,7 @@
#choose trusty
group: edge
-dist: trusty
+dist: trusty
sudo: required
@@ -70,13 +70,13 @@ before_script:
- ./tools/travis/check-extensions.sh $POSTGRESQL_VERSION ___pgr___test___
-script:
+script:
- ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
# tests as part of script so if a test fails the build fails
- ./tools/testers/pg_prove_tests.sh $PG_USER DEBUG
- - ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER
-#after_script:
+#after_script:
+ - ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice
#after_success:
# blank
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f1254af6..2e2863d16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ foreach(line ${PgRouting_CONFIGURATION_FILE})
list(APPEND PgRouting_DOC_DIRECTORIES "${directory}")
endif()
endforeach()
+
if (PGROUTING_DEBUG)
message(STATUS "${PgRouting_SOURCE_NAMES}")
message(STATUS "${PgRouting_SQL_DIRECTORIES}")
@@ -149,7 +150,7 @@ CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION)
- message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}!
+ message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}!
Found version ${CMAKE_CXX_COMPILER_VERSION}")
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -290,7 +291,7 @@ endif(NOT PERL_EXECUTABLE)
#---------------------------------------------
find_package(PostgreSQL)
if(NOT POSTGRESQL_FOUND)
- message(FATAL_ERROR " Please check your PostgreSQL installation.")
+ message(FATAL_ERROR " Please check your PostgreSQL installation.")
endif(NOT POSTGRESQL_FOUND)
if(NOT POSTGRESQL_VERSION_STRING)
@@ -302,7 +303,7 @@ string(SUBSTRING "${POSTGRESQL_VERSION_STRING}" 11 -1 POSTGRESQL_VERSION)
# for XbetaY XalphaY XrcY -> X.Y
string(REGEX REPLACE "^([0-9]+)[beta|alpha|rc].*" "\\1.0" POSTGRESQL_VERSION ${POSTGRESQL_VERSION})
-#for X.Y.Z -> XY Y<10
+#for X.Y.Z -> XY Y<10
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*" "\\1\\2" PGSQL_VERSION ${POSTGRESQL_VERSION})
if("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}")
@@ -332,7 +333,7 @@ find_package(Boost ${BOOST_MINIMUM_VERSION})
if(Boost_INCLUDE_DIRS)
message(STATUS "Boost headers were found here: ${Boost_INCLUDE_DIRS}")
else(Boost_INCLUDE_DIRS)
- message(FATAL_ERROR " Please check your Boost installation ")
+ message(FATAL_ERROR " Please check your Boost installation ")
endif(Boost_INCLUDE_DIRS)
include_directories(${Boost_INCLUDE_DIRS})
@@ -515,7 +516,7 @@ if(WITH_INTERNAL_TESTS)
endif()
#-------------------
-# add the subdirectories that have the C/C++ code
+# add the subdirectories that have the C/C++ code
#-------------------
foreach (subdir ${PgRouting_SOURCE_NAMES})
@@ -613,4 +614,3 @@ if (PGROUTING_DEBUG)
message(STATUS ${f})
endforeach()
endif()
-
diff --git a/configuration.conf b/configuration.conf
index 29ef3badb..b0c0da602 100644
--- a/configuration.conf
+++ b/configuration.conf
@@ -1,6 +1,6 @@
#----------------------
# Configuration file for compilation
-#
+#
# Once in the file, do not change the order
#
# Directory | has C/C++ | has SQL | has DOC
@@ -10,7 +10,7 @@
#----------------------
common | Y | Y | Y
#----------------------
-# dijkstra can not be removed
+# dijkstra can not be removed
# Has the command needed to link with prostgresl
#----------------------
dijkstra | Y | Y | Y
@@ -29,7 +29,8 @@ pickDeliver | Y | Y | N
vrp_basic | N | Y | Y
vrppdtw | N | Y | Y
withPoints | Y | Y | Y
-#doc-dijkstraTRSP | Y | Y | Y
+#dijkstraTRSP | Y | N | N
+lineGraph | Y | Y | Y
#areaContraction | Y | Y | Y
#connectedComponentsV | Y | Y | Y
#----------------------
diff --git a/doc/dijkstraTRSP/CMakeLists.txt b/doc/dijkstraTRSP/CMakeLists.txt
new file mode 100644
index 000000000..3a424e867
--- /dev/null
+++ b/doc/dijkstraTRSP/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+SET(LOCAL_FILES
+ pgr_dijkstraTRSP.rst
+ )
+
+foreach (f ${LOCAL_FILES})
+ configure_file(${f} "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}")
+ list(APPEND LOCAL_DOC_FILES ${PGR_DOCUMENTATION_SOURCE_DIR}/${f})
+endforeach()
+
+set(PgRouting_DOC_FILES ${PgRouting_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
+
diff --git a/doc/dijkstraTRSP/pgr_dijkstraTRSP.rst b/doc/dijkstraTRSP/pgr_dijkstraTRSP.rst
new file mode 100644
index 000000000..90b321f81
--- /dev/null
+++ b/doc/dijkstraTRSP/pgr_dijkstraTRSP.rst
@@ -0,0 +1,141 @@
+..
+ ****************************************************************************
+ pgRouting Manual
+ Copyright(c) pgRouting Contributors
+
+ This documentation is licensed under a Creative Commons Attribution-Share
+ Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
+ ****************************************************************************
+
+.. _pgr_dijkstraTRSP:
+
+pgr_dijkstraTRSP
+===============================================================================
+
+``pgr_dijkstraTRSP`` — Returns the shortest path(s) using Dijkstra algorithm.
+In particular, the Dijkstra algorithm implemented by Boost.Graph.
+
+.. figure:: images/boost-inside.jpeg
+ :target: http://www.boost.org/libs/graph/doc/dijkstra_shortest_paths.html
+
+ Boost Graph Inside
+
+
+Synopsis
+-------------------------------------------------------------------------------
+
+Dijkstra's algorithm, conceived by Dutch computer scientist Edsger Dijkstra in 1956.
+It is a graph search algorithm that solves the shortest path problem for
+a graph with non-negative edge path costs, producing a shortest path from
+a starting vertex (``start_vid``) to an ending vertex (``end_vid``).
+This implementation can be used with a directed graph and an undirected graph.
+
+Characteristics
+-------------------------------------------------------------------------------
+
+The main Characteristics are:
+ - Process is done only on edges with positive costs.
+ - Values are returned when there is a path.
+
+ - When the starting vertex and ending vertex are the same, there is no path.
+
+ - The `agg_cost` the non included values `(v, v)` is `0`
+
+ - When the starting vertex and ending vertex are the different and there is no path:
+
+ - The `agg_cost` the non included values `(u, v)` is :math:`\infty`
+
+ - For optimization purposes, any duplicated value in the `start_vids` or `end_vids` are ignored.
+
+ - The returned values are ordered:
+
+ - `start_vid` ascending
+ - `end_vid` ascending
+
+ - Running time: :math:`O(| start\_vids | * (V \log V + E))`
+
+
+Signature Summary
+-----------------
+
+.. code-block:: none
+
+ pgr_dijkstra(edges_sql, start_vid, end_vid)
+
+ RETURNS SET OF (seq, path_seq, node, edge, cost, agg_cost)
+ OR EMPTY SET
+
+
+Signatures
+-------------------------------------------------------------------------------
+
+.. index::
+ single: dijkstraTRSP(Minimal Use)
+
+Minimal signature
+.......................................
+
+.. code-block:: none
+
+ pgr_dijkstraTRSP(edges_sql, start_vid, end_vid)
+ RETURNS SET OF (seq, path_seq, node, edge, cost, agg_cost) or EMPTY SET
+
+The minimal signature is for a **directed** graph from one ``start_vid`` to one ``end_vid``:
+
+:Example:
+
+.. literalinclude:: doc-pgr_dijkstraTRSP.queries
+ :start-after: -- q1
+ :end-before: -- q2
+
+
+.. index::
+ single: dijkstraTRSP(Complete signature)
+
+Complete Signature
+.......................................
+
+.. code-block:: none
+
+ pgr_dijkstraTRSP(edges_sql, start_vid, end_vid, directed);
+ RETURNS SET OF (seq, path_seq, node, edge, cost, agg_cost) or EMPTY SET
+
+This signature finds the shortest path from one ``start_vid`` to one ``end_vid``:
+ - on a **directed** graph when ``directed`` flag is missing or is set to ``true``.
+ - on an **undirected** graph when ``directed`` flag is set to ``false``.
+
+:Example:
+
+.. literalinclude:: doc-pgr_dijkstraTRSP.queries
+ :start-after: -- q2
+ :end-before: -- q3
+
+
+
+Description of the Signatures
+-------------------------------------------------------------------------------
+
+.. include:: pgRouting-concepts.rst
+ :start-after: basic_edges_sql_start
+ :end-before: basic_edges_sql_end
+
+.. include:: pgr_dijkstra.rst
+ :start-after: pgr_dijkstra_parameters_start
+ :end-before: pgr_dijkstra_parameters_end
+
+.. include:: pgRouting-concepts.rst
+ :start-after: return_path_start
+ :end-before: return_path_end
+
+
+See Also
+-------------------------------------------------------------------------------
+
+* http://en.wikipedia.org/wiki/Dijkstra%27s_algorithm
+* The queries use the :ref:`sampledata` network.
+
+.. rubric:: Indices and tables
+
+* :ref:`genindex`
+* :ref:`search`
+
diff --git a/doc/lineGraph/CMakeLists.txt b/doc/lineGraph/CMakeLists.txt
new file mode 100644
index 000000000..570fc3845
--- /dev/null
+++ b/doc/lineGraph/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+SET(LOCAL_FILES
+ pgr_lineGraph.rst
+ )
+
+foreach (f ${LOCAL_FILES})
+ configure_file(${f} "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}")
+ list(APPEND LOCAL_DOC_FILES ${PGR_DOCUMENTATION_SOURCE_DIR}/${f})
+endforeach()
+
+add_subdirectory("images")
+set(PgRouting_DOC_FILES ${PgRouting_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
+set(PgRouting_IMG_FILES ${PgRouting_IMG_FILES} PARENT_SCOPE)
diff --git a/doc/lineGraph/images/128px-Line_graph_construction_4.svg.png b/doc/lineGraph/images/128px-Line_graph_construction_4.svg.png
new file mode 100644
index 000000000..b132a5ed7
Binary files /dev/null and b/doc/lineGraph/images/128px-Line_graph_construction_4.svg.png differ
diff --git a/doc/lineGraph/images/135px-Line_graph_construction_1.svg.png b/doc/lineGraph/images/135px-Line_graph_construction_1.svg.png
new file mode 100644
index 000000000..15a136a17
Binary files /dev/null and b/doc/lineGraph/images/135px-Line_graph_construction_1.svg.png differ
diff --git a/doc/lineGraph/images/135px-Line_graph_construction_2.svg.png b/doc/lineGraph/images/135px-Line_graph_construction_2.svg.png
new file mode 100644
index 000000000..e7652375a
Binary files /dev/null and b/doc/lineGraph/images/135px-Line_graph_construction_2.svg.png differ
diff --git a/doc/lineGraph/images/135px-Line_graph_construction_3.svg.png b/doc/lineGraph/images/135px-Line_graph_construction_3.svg.png
new file mode 100644
index 000000000..284e82656
Binary files /dev/null and b/doc/lineGraph/images/135px-Line_graph_construction_3.svg.png differ
diff --git a/doc/lineGraph/images/CMakeLists.txt b/doc/lineGraph/images/CMakeLists.txt
new file mode 100644
index 000000000..966f52d72
--- /dev/null
+++ b/doc/lineGraph/images/CMakeLists.txt
@@ -0,0 +1,19 @@
+SET(LOCAL_FILES
+ 128px-Line_graph_construction_4.svg.png
+ 135px-Line_graph_construction_1.svg.png
+ 135px-Line_graph_construction_2.svg.png
+ 135px-Line_graph_construction_3.svg.png
+
+ Graph1.png
+ Graph2.png
+
+ Line-graph-with-edge-cost.png
+ Line-graph-with-node-cost.png
+ )
+
+foreach (f ${LOCAL_FILES})
+ configure_file(${f} "${PGR_DOCUMENTATION_SOURCE_DIR}/images/${f}" COPYONLY)
+ list(APPEND LOCAL_IMG_FILES "${PGR_DOCUMENTATION_SOURCE_DIR}/images/${f}")
+endforeach()
+
+set(PgRouting_IMG_FILES ${PgRouting_IMG_FILES} ${LOCAL_IMG_FILES} PARENT_SCOPE)
diff --git a/doc/lineGraph/images/Graph1.png b/doc/lineGraph/images/Graph1.png
new file mode 100644
index 000000000..938e9cbe0
Binary files /dev/null and b/doc/lineGraph/images/Graph1.png differ
diff --git a/doc/lineGraph/images/Graph2.png b/doc/lineGraph/images/Graph2.png
new file mode 100644
index 000000000..a4cce3dc5
Binary files /dev/null and b/doc/lineGraph/images/Graph2.png differ
diff --git a/doc/lineGraph/images/Line-graph-with-edge-cost.png b/doc/lineGraph/images/Line-graph-with-edge-cost.png
new file mode 100644
index 000000000..98bfece4d
Binary files /dev/null and b/doc/lineGraph/images/Line-graph-with-edge-cost.png differ
diff --git a/doc/lineGraph/images/Line-graph-with-node-cost.png b/doc/lineGraph/images/Line-graph-with-node-cost.png
new file mode 100644
index 000000000..967472a17
Binary files /dev/null and b/doc/lineGraph/images/Line-graph-with-node-cost.png differ
diff --git a/doc/lineGraph/pgr_lineGraph.rst b/doc/lineGraph/pgr_lineGraph.rst
new file mode 100644
index 000000000..ae8a7bcd8
--- /dev/null
+++ b/doc/lineGraph/pgr_lineGraph.rst
@@ -0,0 +1,171 @@
+..
+ ****************************************************************************
+ pgRouting Manual
+ Copyright(c) pgRouting Contributors
+
+ This documentation is licensed under a Creative Commons Attribution-Share
+ Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
+ ****************************************************************************
+
+.. _pgr_lineGraph:
+
+pgr_lineGraph
+===============================================================================
+
+``pgr_lineGraph`` — Transforms a given graph into its corresponding edge-based graph.
+
+.. figure:: images/boost-inside.jpeg
+ :target: http://www.boost.org/libs/graph/doc/dijkstra_shortest_paths.html
+
+ Boost Graph Inside
+
+
+Synopsis
+-------------------------------------------------------------------------------
+
+Given a graph G, its line graph L(G) is a graph such that:-
+
+ - each vertex of L(G) represents an edge of G
+
+ - two vertices of L(G) are adjacent if and only if their corresponding edges
+ share a common endpoint in G.
+
+The following figures show a graph (left, with blue vertices) and its
+Line Graph (right, with green vertices).
+
+| |first| |second| |third| |fourth|
+
+.. |first| image:: images/135px-Line_graph_construction_1.svg.png
+ :align: middle
+
+.. |second| image:: images/135px-Line_graph_construction_2.svg.png
+ :align: middle
+
+.. |third| image:: images/135px-Line_graph_construction_3.svg.png
+ :align: middle
+
+.. |fourth| image:: images/128px-Line_graph_construction_4.svg.png
+ :align: middle
+
+.. The images are taken from https://en.wikipedia.org/wiki/Line_graph.
+
+Signature Summary
+-----------------
+
+.. code-block:: none
+
+ pgr_lineGraph(edges_sql, directed)
+
+ RETURNS SET OF (seq, source, target, cost, reverse_cost)
+ OR EMPTY SET
+
+
+Signatures
+-------------------------------------------------------------------------------
+
+.. index::
+ single: lineGraph(Minimal Use)
+
+Minimal signature
+.......................................
+
+.. code-block:: none
+
+ pgr_lineGraph(edges_sql)
+ RETURNS SET OF (seq, source, target, cost, reverse_cost) or EMPTY SET
+
+The minimal signature is for a **directed** graph:
+
+:Example:
+
+.. literalinclude:: doc-pgr_lineGraph.queries
+ :start-after: -- q1
+ :end-before: -- q2
+
+
+.. index::
+ single: lineGraph(Complete signature)
+
+Complete Signature
+.......................................
+
+.. code-block:: none
+
+ pgr_lineGraph(edges_sql, directed);
+ RETURNS SET OF (seq, source, target, cost, reverse_cost) or EMPTY SET
+
+This signature returns the Line Graph of the current graph:
+ - on a **directed** graph when ``directed`` flag is missing or is set to ``true``.
+ - on an **undirected** graph when ``directed`` flag is set to ``false``.
+
+:Example:
+
+.. literalinclude:: doc-pgr_lineGraph.queries
+ :start-after: -- q2
+ :end-before: -- q3
+
+
+
+Description of the Signatures
+-------------------------------------------------------------------------------
+
+.. include:: pgRouting-concepts.rst
+ :start-after: basic_edges_sql_start
+ :end-before: basic_edges_sql_end
+
+
+Description of the parameters of the signatures
+-------------------------------------------------------------------------------
+
+======================= ====================== =================================================
+Column Type Description
+======================= ====================== =================================================
+**edges_sql** ``TEXT`` SQL query as described above.
+**directed** ``BOOLEAN`` * When ``true`` the graph is considered as `Directed`.
+ * When ``false`` the graph is considered as `Undirected`.
+======================= ====================== =================================================
+
+Description of the return values
+-------------------------------------------------------------------------------
+
+RETURNS SETOF (seq, source, target, cost, reverse_cost)
+
+============================ ================= ===================================================================
+Column Type Description
+============================ ================= ===================================================================
+**seq** ``INTEGER`` Sequential value starting from **1**.
+
+**source** ``BIGINT`` Identifier of the source vertex of the current edge `id`.
+
+ * When `negative`: the source is the reverse edge in the original graph.
+
+**target** ``BIGINT`` Identifier of the target vertex of the current edge `id`.
+
+ * When `negative`: the target is the reverse edge in the original graph.
+
+**cost** ``FLOAT`` Weight of the edge (`source`, `target`).
+
+ * When `negative`: edge (`source`, `target`) does not exist, therefore it’s not part of the graph.
+
+**reverse_cost** ``FLOAT`` Weight of the edge (`target`, `source`).
+
+ * When `negative`: edge (`target`, `source`) does not exist, therefore it’s not part of the graph.
+============================ ================= ===================================================================
+
+Examples
+-------------------------------------------------------------------------------
+
+.. literalinclude:: doc-pgr_lineGraph.queries
+ :start-after: -- q3
+ :end-before: -- q4
+
+See Also
+-------------------------------------------------------------------------------
+
+* https://en.wikipedia.org/wiki/Line_graph
+* The queries use the :doc:`sampledata` network.
+
+.. rubric:: Indices and tables
+
+* :ref:`genindex`
+* :ref:`search`
diff --git a/doc/queries/CMakeLists.txt b/doc/queries/CMakeLists.txt
index 6928c6b8c..2522f9705 100644
--- a/doc/queries/CMakeLists.txt
+++ b/doc/queries/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(LOCAL_FILES
doc-contraction.queries
doc-pgr_bdAstarCost.queries
doc-pgr_dijkstra.queries
+ doc-pgr_dijkstraTRSP.queries
doc-pgr_labelGraph.queries
doc-pgr_withPointsCost.queries
doc-trsp.queries
@@ -43,6 +44,7 @@ SET(LOCAL_FILES
trsp_notes_v2.5.0.queries
oneDepotWrapper.queries
doc-gsoc_vrppdtw.queries
+ doc-pgr_lineGraph.queries
)
foreach (f ${LOCAL_FILES})
@@ -51,4 +53,3 @@ foreach (f ${LOCAL_FILES})
endforeach()
set(PgRouting_DOC_FILES ${PgRouting_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
-
diff --git a/doc/queries/doc-pgr_dijkstraTRSP.queries b/doc/queries/doc-pgr_dijkstraTRSP.queries
new file mode 100644
index 000000000..f944c67b8
--- /dev/null
+++ b/doc/queries/doc-pgr_dijkstraTRSP.queries
@@ -0,0 +1,32 @@
+BEGIN;
+BEGIN
+-- q1
+SELECT * FROM pgr_dijkstraTRSP(
+ 'SELECT id, source, target, cost, reverse_cost FROM edge_table',
+ 2, 3
+);
+ seq | path_seq | node | edge | cost | agg_cost
+-----+----------+------+------+------+----------
+ 1 | 1 | 2 | 4 | 1 | 0
+ 2 | 2 | 5 | 8 | 1 | 1
+ 3 | 3 | 6 | 9 | 1 | 2
+ 4 | 4 | 9 | 16 | 1 | 3
+ 5 | 5 | 4 | 3 | 1 | 4
+ 6 | 6 | 3 | -1 | 0 | 5
+(6 rows)
+
+-- q2
+SELECT * FROM pgr_dijkstraTRSP(
+ 'SELECT id, source, target, cost, reverse_cost FROM edge_table',
+ 2, 3,
+ FALSE
+);
+ seq | path_seq | node | edge | cost | agg_cost
+-----+----------+------+------+------+----------
+ 1 | 1 | 2 | 2 | 1 | 0
+ 2 | 2 | 3 | -1 | 0 | 1
+(2 rows)
+
+-- q3
+ROLLBACK;
+ROLLBACK
diff --git a/doc/queries/doc-pgr_lineGraph.queries b/doc/queries/doc-pgr_lineGraph.queries
new file mode 100644
index 000000000..5c99bf47d
--- /dev/null
+++ b/doc/queries/doc-pgr_lineGraph.queries
@@ -0,0 +1,68 @@
+-BEGIN;
+ -BEGIN
+ --- q1
+ -SELECT * FROM edge_table;
+ - ID | source | target | cost | reverse_cost
+ -----+--------+--------+------+--------------
+ - 1 | 1 | 2 | 1 | 1
+ - 2 | 2 | 3 | -1 | 1
+ - 3 | 3 | 4 | -1 | 1
+ - 4 | 2 | 5 | 1 | 1
+ -(4 rows)
+ -
+ -SELECT * FROM pgr_lineGraph(
+ - 'SELECT id, source, target, cost, reverse_cost FROM edge_table'
+ -);
+ - seq | source | target | cost | reverse_cost
+ ------+--------+--------+------+--------------
+ - 1 | -4 | -1 | 1 | 1
+ - 2 | -3 | -2 | 1 | -1
+ - 3 | -2 | -1 | 1 | -1
+ - 4 | -2 | 4 | 1 | -1
+ -(4 rows)
+ -
+ --- q2
+ -SELECT * FROM edge_table;
+ - ID | source | target | cost | reverse_cost
+ -----+--------+--------+------+--------------
+ - 1 | 1 | 2 | 1 | 1
+ - 2 | 2 | 3 | -1 | 1
+ - 3 | 3 | 4 | -1 | 1
+ -(3 rows)
+ -
+ -SELECT * FROM pgr_lineGraph(
+ - 'SELECT id, source, target, cost, reverse_cost FROM edge_table',
+ - FALSE
+ -);
+ - seq | source | target | cost | reverse_cost
+ ------+--------+--------+------+--------------
+ - 1 | -2 | -1 | 1 | -1
+ - 2 | -2 | 1 | 1 | -1
+ - 3 | 1 | -2 | 1 | -1
+ - 4 | -1 | -2 | 1 | -1
+ - 5 | -3 | -2 | 1 | -1
+ - 6 | -2 | -3 | 1 | -1
+ -(6 rows)
+ -
+ --- q3
+ -SELECT * FROM edge_table;
+ - ID | source | target | cost | reverse_cost
+ -----+--------+--------+------+--------------
+ - 1 | 1 | 2 | 10 | -1
+ - 2 | 2 | 1 | 25 | -1
+ - 3 | 2 | 3 | 20 | 25
+ -(3 rows)
+ -
+ -SELECT * FROM pgr_lineGraph(
+ - 'SELECT id, source, target, cost, reverse_cost FROM edge_table'
+ -);
+ - seq | source | target | cost | reverse_cost
+ ------+--------+--------+------+--------------
+ - 1 | -3 | 2 | 1 | -1
+ - 2 | 1 | 3 | 1 | -1
+ - 3 | 2 | 1 | 1 | 1
+ -(3 rows)
+ -
+ --- q4
+ -ROLLBACK;
+ -ROLLBACK
diff --git a/doc/src/proposed.rst b/doc/src/proposed.rst
index 164ea91a9..8221cc1f3 100644
--- a/doc/src/proposed.rst
+++ b/doc/src/proposed.rst
@@ -38,19 +38,19 @@ As part of the :ref:`dijkstra`
.. rubric:: Families
:ref:`astar`
-
+
.. include:: aStar-family.rst
:start-after: index from here
:end-before: index to here
:ref:`bdAstar`
-
+
.. include:: bdAstar-family.rst
:start-after: index from here
:end-before: index to here
:ref:`bdDijkstra`
-
+
.. include:: bdDijkstra-family.rst
:start-after: index from here
:end-before: index to here
@@ -153,6 +153,14 @@ Experimental and Proposed functions
pgr_gsoc_vrppdtw
pgr_vrpOneDepot
+.. rubric:: Graph Transformation
+
+:doc:`pgr_lineGraph`
+
+.. toctree::
+ :hidden:
+
+ pgr_lineGraph
..
@@ -163,4 +171,3 @@ Experimental and Proposed functions
:hidden:
..
../src/funnyDijkstra/doc/pgr_funnyDijkstra.rst
-
diff --git a/include/c_common/get_check_data.h b/include/c_common/get_check_data.h
index 17602606c..5aead0d36 100644
--- a/include/c_common/get_check_data.h
+++ b/include/c_common/get_check_data.h
@@ -40,6 +40,7 @@ void pgr_check_any_numerical_type(Column_info_t info);
void pgr_check_char_type(Column_info_t info);
void pgr_check_text_type(Column_info_t info);
void pgr_check_boolean_type(Column_info_t info);
+void pgr_check_any_integerarray_type(Column_info_t info);
char pgr_SPI_getChar(
diff --git a/include/c_common/restrict_input.h b/include/c_common/restrict_input.h
new file mode 100644
index 000000000..fc76a0f4b
--- /dev/null
+++ b/include/c_common/restrict_input.h
@@ -0,0 +1,38 @@
+/*PGR-GNU*****************************************************************
+File: restrict_input.h
+
+Copyright (c) 2017 Celia Virginia Vergara Castillo
+Mail: [email protected]
+
+------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+********************************************************************PGR-GNU*/
+/*! @file */
+
+
+#ifndef INCLUDE_C_COMMON_RESTRICT_INPUT_H_
+#define INCLUDE_C_COMMON_RESTRICT_INPUT_H_
+#pragma once
+
+#include "c_types/restrict_t.h"
+
+void pgr_get_restriction_data(
+ char *restrictions_sql,
+ Restrict_t **restrictions,
+ size_t *total_restrictions);
+
+#endif // INCLUDE_C_COMMON_RESTRICT_INPUT_H_
diff --git a/include/c_types/column_info_t.h b/include/c_types/column_info_t.h
index f5421eb73..026d7fb31 100644
--- a/include/c_types/column_info_t.h
+++ b/include/c_types/column_info_t.h
@@ -62,7 +62,8 @@ enum {
ANY_INTEGER,
ANY_NUMERICAL,
TEXT,
- CHAR1
+ CHAR1,
+ ANY_INTEGER_ARRAY
} expectType;
@@ -77,4 +78,3 @@ struct {
#endif // INCLUDE_C_TYPES_COLUMN_INFO_T_H_
-
diff --git a/include/c_types/line_graph_rt.h b/include/c_types/line_graph_rt.h
new file mode 100644
index 000000000..7b822ea8f
--- /dev/null
+++ b/include/c_types/line_graph_rt.h
@@ -0,0 +1,69 @@
+/*PGR-GNU*****************************************************************
+File: line_graph_rt.h
+
+Copyright (c) 2017 Celia Virginia Vergara Castillo
+Mail: [email protected]
+
+Developed by: Vidhan Jain
+Mail: [email protected]
+
+------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+********************************************************************PGR-GNU*/
+/*! @file */
+
+#ifndef INCLUDE_C_TYPES_LINE_GRAPH_RT_H_
+#define INCLUDE_C_TYPES_LINE_GRAPH_RT_H_
+#pragma once
+
+
+#ifdef __cplusplus
+
+#include <cstddef>
+
+#else // __cplusplus
+
+// for bool
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-pedantic"
+#endif
+
+#include <postgres.h>
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+// For NULL & size_t
+#include <stdlib.h>
+
+
+#endif // __cplusplus
+
+// For int64_t etc
+#include <stdint.h>
+
+
+typedef struct {
+ int64_t id;
+ int64_t source;
+ int64_t target;
+ float cost;
+ float reverse_cost;
+} Line_graph_rt;
+
+#endif // INCLUDE_C_TYPES_LINE_GRAPH_RT_H_
diff --git a/include/c_types/restrict_t.h b/include/c_types/restrict_t.h
index 4bc2c9a1d..de2df5b3a 100644
--- a/include/c_types/restrict_t.h
+++ b/include/c_types/restrict_t.h
@@ -58,9 +58,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#define MAX_RULE_LENGTH 5
typedef struct {
- int64_t target_id;
- double to_cost;
- int64_t via[MAX_RULE_LENGTH];
+ int64_t id;
+ double cost;
+ int64_t restricted_edges[MAX_RULE_LENGTH];
}
Restrict_t;
diff --git a/include/cpp_common/line_vertex.h b/include/cpp_common/line_vertex.h
new file mode 100644
index 000000000..0236e2c92
--- /dev/null
+++ b/include/cpp_common/line_vertex.h
@@ -0,0 +1,98 @@
+/*PGR-GNU*****************************************************************
+File: line_vertex.h
+Generated with Template by:
+Copyright (c) 2015 pgRouting developers
+Mail: [email protected]
+
+Function's developer:
+Copyright (c) 2017 Vidhan Jain
+Mail: [email protected]
+
+------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+********************************************************************PGR-GNU*/
+
+/*! @file */
+
+#ifndef INCLUDE_CPP_COMMON_LINE_VERTEX_H_
+#define INCLUDE_CPP_COMMON_LINE_VERTEX_H_
+#pragma once
+
+#include <vector>
+#include <ostream>
+
+#include "c_types/pgr_edge_t.h"
+
+
+
+namespace pgrouting {
+
+class Line_vertex {
+ public:
+ Line_vertex() :
+ id(0) {}
+
+ Line_vertex(const pgr_edge_t& edge) :
+ id(edge.id),
+ vertex_id(edge.id),
+ source(edge.source),
+ target(edge.target),
+ cost(edge.cost) {}
+
+ Line_vertex(const Line_vertex &v) :
+ id(v.id),
+ vertex_id(v.vertex_id),
+ source(v.source),
+ target(v.target),
+ cost(v.cost) {}
+
+ void cp_members(const Line_vertex &other) {
+ this->id = other.id;
+ this->vertex_id = other.vertex_id;
+ this->cost = other.cost;
+ this->source = other.source;
+ this->target = other.target;
+ }
+
+ void cp_members(int64_t _id, int64_t _source) {
+ this->id = _id;
+ this->vertex_id = -1;
+ this->cost = 0;
+ this->source = _source;
+ this->target = -1;
+ }
+
+ friend std::ostream& operator<<(std::ostream& log, const Line_vertex &v) {