Skip to content

Commit

Permalink
Merge pull request #165 from krashish8/ashish-2021
Browse files Browse the repository at this point in the history
vrp_vroom GSoC-2021 Bonding Period
  • Loading branch information
krashish8 authored Jun 5, 2021
2 parents 1482e08 + d9a3d80 commit 07daae5
Show file tree
Hide file tree
Showing 10 changed files with 549 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ indent_size = 4
indent_style = space
charset = utf-8
end_of_line = lf
insert_final_newline = false
insert_final_newline = true
trim_trailing_whitespace = true

# C++ files want tab indentation
Expand Down Expand Up @@ -52,4 +52,4 @@ indent_style = space
# RST files
[*.html]
indent_size = 2
indent_style = space
indent_style = space
1 change: 1 addition & 0 deletions configuration.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ viewRoute | N | Y | N
simulation | N | Y | N
optimizers | Y | N | N
initialsol | Y | N | N
vroom | N | N | Y
6 changes: 4 additions & 2 deletions doc/conf.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ html_last_updated_fmt = '%b %d, %Y'

# Custom sidebar templates, maps document names to template names.
html_sidebars = {
# '**': ['globaltoc.html', 'relations.html', 'sourcelink.html', 'searchbox.html'],
# 'using/windows': ['windowssidebar.html', 'searchbox.html'],
# '**': ['globaltoc.html', 'relations.html', 'sourcelink.html', 'searchbox.html'],
# 'using/windows': ['windowssidebar.html', 'searchbox.html'],
}

# Additional templates that should be rendered to pages, maps page names to
Expand Down Expand Up @@ -317,6 +317,8 @@ linkcheck_ignore = [
r"https://gis.stackexchange.com/",
"https://vrp.pgrouting.org/v0/en/pgr-category.html",
"https://vrp.pgrouting.org/latest/en/pgr-category.html",
"https://vrp.pgrouting.org/v0/en/vrp_vroom.html",
"https://vrp.pgrouting.org/latest/en/vrp_vroom.html",

# (see: https://github.com/sphinx-doc/sphinx/issues/7388)
r"https://github.com/pgRouting/vrprouting/", # limit only vrprouting
Expand Down
7 changes: 7 additions & 0 deletions doc/general/experimental.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ Experimental Functions

pgr-category

:doc:`pgr-category`

.. toctree::
:maxdepth: 1

vrp_vroom

.. rubric:: See Also

* :doc:`proposed`
Expand Down
12 changes: 12 additions & 0 deletions doc/vroom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

SET(LOCAL_FILES
vrp_vroom.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(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
set(PROJECT_IMG_FILES ${PROJECT_IMG_FILES} PARENT_SCOPE)
489 changes: 489 additions & 0 deletions doc/vroom/vrp_vroom.rst

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions docqueries/vroom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Do not use extensions
SET(LOCAL_FILES
doc-vrp_vroom
)

foreach (f ${LOCAL_FILES})
configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
list(APPEND LOCAL_DOC_FILES "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
endforeach()

set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
6 changes: 6 additions & 0 deletions docqueries/vroom/doc-vrp_vroom.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
BEGIN;
BEGIN
SET client_min_messages TO NOTICE;
SET
ROLLBACK;
ROLLBACK
Empty file.
17 changes: 17 additions & 0 deletions docqueries/vroom/test.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/perl -w

%main::tests = (
'any' => {
'comment' => 'VRP with VROOM tests.',
'data' => [ ],
'tests' => [qw(
doc-vrp_vroom
)],
'documentation' => [qw(
doc-vrp_vroom
)]
},

);

1;

0 comments on commit 07daae5

Please sign in to comment.