Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More changes on pickDeliver #864

Merged
merged 97 commits into from
Jul 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
72eba25
pick & deliver result doc, first proposal
cvvergara Jun 6, 2017
1b0332c
updated code & tests to match new names vehicles_sql & stoprs_seq
cvvergara Jun 6, 2017
596d846
updating to recent sql-update-scripts files
cvvergara Jun 6, 2017
0e119a3
updating the pick & deliver results doc to match latest code
cvvergara Jun 6, 2017
23b0d0a
added some TODO
cvvergara Jun 6, 2017
8176567
chnging the ordering of the columns
cvvergara Jun 6, 2017
9403046
saving latest documentation
cvvergara Jun 7, 2017
c7191fa
removing the vrppdtw documentation
cvvergara Jun 13, 2017
f713f01
fixing merge conflicts
cvvergara Jun 13, 2017
2d30f4c
Merge branch 'develop' into doc/pickDeliver
cvvergara Jun 13, 2017
cc8d139
added current signatrue to docs
cvvergara Jun 13, 2017
5c0b677
install.bat using latest postgis
cvvergara Jun 13, 2017
547ec5f
refining pick deliver documentation
cvvergara Jun 15, 2017
1504799
added links, reorganized the pick & delivery files
cvvergara Jun 15, 2017
1dfa3c2
fixed identation errors on pgRouting-concepts
cvvergara Jun 15, 2017
93872f3
Adding debug to some mesages
cvvergara Jun 15, 2017
64d96a0
adding wrapper for vrppdtw
cvvergara Jun 15, 2017
a35029c
updated the cmakelists for correct name
cvvergara Jun 15, 2017
ed56279
adding the queries files
cvvergara Jun 15, 2017
0c97659
not generating queries for deprecated finction pgr_gsoc_vrppdtw
cvvergara Jun 15, 2017
2a8ffe3
moved pgr_gsoc_vrppdtw tests to deprecated tests
cvvergara Jun 15, 2017
a17360e
moved gsoc_vrppdtw.sql to deprecated directory
cvvergara Jun 15, 2017
1b72e23
moved fixed some syntax errors
cvvergara Jun 15, 2017
9e8070c
moved the wraping code of pgr_gsoc_vrppdtw to deprecated
cvvergara Jun 15, 2017
1f6188d
changing the wrapper function name
cvvergara Jun 15, 2017
5dcda1b
changing the wrapper function call
cvvergara Jun 15, 2017
035f0e4
added deprecated message
cvvergara Jun 15, 2017
e567a80
added deprecated comment
cvvergara Jun 15, 2017
2e7f1ab
configured pgr_gsoc_vrppdtw on deprecated
cvvergara Jun 15, 2017
09e2bb4
removed configuration of _pgr_gsoc_vrppdtw from pick & deliver
cvvergara Jun 15, 2017
a1e4648
removed vrppdtw directory from the configuration
cvvergara Jun 15, 2017
c19e40f
updated doc-gsoc_vrppdtw.result to have the deprecated message
cvvergara Jun 15, 2017
4c04cff
updated generated .sql files to current status
cvvergara Jun 15, 2017
ec1f9d1
removed vrppdtw in sql directory and in src/ directory
cvvergara Jun 15, 2017
9c07dd8
removed vrppdtw in sql directory and in doc directory
cvvergara Jun 15, 2017
0be649d
adding new pot & po files
cvvergara Jun 15, 2017
e9a1063
not dealing wiht non 2 characters languages
cvvergara Jun 15, 2017
ecd7907
updating spanish po files
cvvergara Jun 16, 2017
cbced9d
adding stop_id on pgr_pickDeliver
cvvergara Jun 17, 2017
42c27fd
updating the queries result of pickDeliver
cvvergara Jun 17, 2017
f02b4a3
adding the current queries result
cvvergara Jun 17, 2017
7ce6042
adding the pick & deliver vehicles & orders data
cvvergara Jun 17, 2017
f32e192
adding the new test results
cvvergara Jun 17, 2017
ec425f8
fixing gsoc_vrppdtw wrapper
cvvergara Jun 17, 2017
42e5c46
removing underscore to pgr_pickDeliver
cvvergara Jun 17, 2017
73be495
removing underscore to pgr_pickDeliverEuclidean
cvvergara Jun 17, 2017
931d953
updating pgr_pickDeliver test to call with out underscore
cvvergara Jun 17, 2017
c518ca1
updating pgr_pickDeliverEuclidean test to call with out underscore
cvvergara Jun 17, 2017
c54a569
updating inner query pgtap test of pgr_pickDeliverEuclidean to call …
cvvergara Jun 17, 2017
2cdbccc
updating types check pgtap test of pgr_pickDeliverEuclidean to call w…
cvvergara Jun 17, 2017
b606344
updating the generated sql files to current functions
cvvergara Jun 17, 2017
01df99f
updating the signature files to current functions
cvvergara Jun 17, 2017
936e856
removing unused files
cvvergara Jun 17, 2017
a462731
fixing the rest of the pickDeliverEuclidean tests
cvvergara Jun 17, 2017
eb6188b
adding a design test for pgtap of the pickDeliverEuclidean tests
cvvergara Jun 17, 2017
a7b8866
adding a comparson test to euclidean version
cvvergara Jun 17, 2017
0abbf2a
adding a test using a cost matrix
cvvergara Jun 17, 2017
d0721d0
executing the old example as test
cvvergara Jun 19, 2017
1d2a605
adding the wrapper for pgr_vrpOneDepot
cvvergara Jun 19, 2017
90fe513
commiting changes to the update files
cvvergara Jun 19, 2017
59ec783
adding a test for the wrapper
cvvergara Jun 19, 2017
cc58505
updating the signature file
cvvergara Jun 19, 2017
46b7fcb
updating the result files to the current tests & code optimization ch…
cvvergara Jun 19, 2017
5eda37d
updating the test.conf files & some documentation results that are ne…
cvvergara Jun 19, 2017
e2ef6da
updating to latest changes on the wrapper
cvvergara Jun 19, 2017
9e10f15
adding a new example for the documentation
cvvergara Jun 19, 2017
00de8e2
updating example results for the documentation
cvvergara Jun 19, 2017
32cb72c
changes on optimizing: a little bit more optimized
cvvergara Jun 19, 2017
cde017f
added the new optimization results to test of deprecated gsoc_vrppdtw
cvvergara Jun 19, 2017
58daf85
fixing some titles
cvvergara Jun 21, 2017
10c8d55
moved pgtap tests to its own directory
cvvergara Jun 26, 2017
b3e5afa
removed unused variable
cvvergara Jun 26, 2017
74d74ee
removed unused code
cvvergara Jun 26, 2017
dec175a
simplified pg_prove_tests script
cvvergara Jun 26, 2017
d12c1e7
changing release_notes
cvvergara Jun 26, 2017
383a71b
making travis documentation tests as part of build tests
cvvergara Jun 26, 2017
8068b61
Merge pull request #157 from cvvergara/improve/pgtap
cvvergara Jun 28, 2017
d61cb57
braking the test in two files
cvvergara Jun 28, 2017
67b3d39
fixed some details on the Readme
cvvergara Jun 28, 2017
1d774ea
not compiling the C/C++ code of vrpOneDepot
cvvergara Jun 28, 2017
e53164b
adding example to documentation of pgr_vrpOneDepot
cvvergara Jun 28, 2017
2263d2e
adding the generated documentation of pgr_vrpOneDepot
cvvergara Jun 28, 2017
7e1915c
orginizing an example of pgr_vrpOneDepot
cvvergara Jun 28, 2017
68bf3ff
fixing a typo on a file name
cvvergara Jun 28, 2017
43e94b8
no name parameters on _pgr_vrpOneDepot
cvvergara Jun 28, 2017
6701a89
no name parameters on _pgr_vrpOneDepot
cvvergara Jun 28, 2017
cd908da
Merge pull request #159 from cvvergara/remove/unusedCode
cvvergara Jun 28, 2017
76e6435
Do not overwrite msys set path. Just add to it. otherwise can not fi…
robe2 Jul 3, 2017
49a6fb9
Change to use pg_prove test. Try to use built in cmake.
robe2 Jul 3, 2017
25cf33b
Change to use pg_prove test. Try to use built in cmake.
robe2 Jul 3, 2017
20a8c45
more fiddling with cmake
robe2 Jul 3, 2017
9e99dfd
more fiddling with cmake
robe2 Jul 3, 2017
dff44ee
fix path to pg_prove test script
robe2 Jul 3, 2017
a5faf45
moving around stalled pgtap test on jenkins
cvvergara Jul 4, 2017
b5785c0
returning test to its correct place
cvvergara Jul 4, 2017
bf30676
jenkins: on 32 bits use algorithm tester
cvvergara Jul 4, 2017
38ed131
jenkins: fixing a typo on last commit
cvvergara Jul 4, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ 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:
- ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice
#after_script:

#after_success:
# blank
1 change: 0 additions & 1 deletion .tx/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[main]
host = https://www.transifex.com
lang_map = pt_br:pg_BR
type = PO

[pgrouting.pgr_analyzeGraph]
Expand Down
78 changes: 4 additions & 74 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,84 +98,14 @@ foreach(line ${PgRouting_CONFIGURATION_FILE})
list(APPEND PgRouting_DOC_DIRECTORIES "${directory}")
endif()
endforeach()
message(STATUS "${PgRouting_SOURCE_NAMES}")
message(STATUS "${PgRouting_SQL_DIRECTORIES}")
message(STATUS "${PgRouting_DOC_DIRECTORIES}")

if(false)
set(PgRouting_SOURCE_NAMES

#----------------------
# "common" must be first can not be removed
#----------------------
"common"

#----------------------
# "dijkstra" can not be removed
# Has the command needed to link with prostgresl
#----------------------
"dijkstra" #2.1

#----------------------
# Directories that have being rewritten
#----------------------
"allpairs" # 2.2
"astar" # 2.4
"driving_distance" # 2.1
"ksp" # 2.1
"tsp" # 2.3

#----------------------
# Code needs to be rewritten
#----------------------
"alpha_shape"
"bdAstar" # 2.5
"bdDijkstra" # 2.4
"trsp"

#----------------------
# Proposed
# - Not officially on the release
# - number indicates version when was propsosed with code
#----------------------
"max_flow" # 2.3
"contraction" # 2.3
"pickDeliver" # 2.3
"vrp_basic" # 2.0
"withPoints" # 2.2

# template generated name
#"funnyDijkstra"

)

#-----------------------------------------------------------------------------
# Name of the directories containing only SQL files
#
# - <directory>/sql/CMakeLists.txt must exist
#-----------------------------------------------------------------------------
set(PgRouting_SQL_DIRECTORIES

"topology" # needs to be revised

#----------------------
# Proposed
# Not officially on the release
#----------------------
"label_graph" # needs to be rewritten using Boost
"costMatrix" # proposed on 2.3

#----------------------
# Wrappers for backwards compatibility
#----------------------
"vrppdtw" # 2.1 wraps of _pgr_pickDeliver
"deprecated"
)
if (PGROUTING_DEBUG)
message(STATUS "${PgRouting_SOURCE_NAMES}")
message(STATUS "${PgRouting_SQL_DIRECTORIES}")
message(STATUS "${PgRouting_DOC_DIRECTORIES}")
endif()




#---------------------------------------------
# minimum versions
#---------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@ To see the issues closed by this release see the [Git closed issues for 2.5.0 ](
* pgr_bdDijkstraCost(many to one)
* pgr_bdDijkstraCost(many to many)
* pgr_bdDijkstraCostMatrix
* pgr_pgr_pickDeliver
* pgr_pgr_pickDeliverEuclidean

*Deprecated Signatures*

* pgr_bdastar - use pgr_bdAstar instead
* pgr_gsoc_vrppdtw - use pgr_pickDeliverEuclidean instead

*Renamed Functions*

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,18 @@ This library contains following features:
* Shortest Path Dijkstra Cost Family of functions
* Driving Distance
* K-Shortest Path, Multiple Alternative Paths (Yen's algorithm)
* Traveling Sales Person
* Traveling Sales Person (TSP)
* Turn Restriction Shortest Path (TRSP)

Additionally, ready for testing and to be part of 2.3 official version:
Additionally, ready for testing and to be part of 2.5 official version:

* Shortest Path Dijkstra With Points Family of functions
* Shortest Path Dijkstra Cost With Points Family of functions
* Driving Distance With Points
* K-Shortest Path With Points, Multiple Alternative Paths (Yen's algorithm)
* Dijkstra Via vertices
* Dijkstra Via (Vertices)

and many more.

Family of functions include:

Expand Down Expand Up @@ -147,7 +149,7 @@ Postgresql 9.2+

## USAGE

See online documentation: http://docs.pgrouting.org/2.3/en/doc/index.html
See online documentation: http://docs.pgrouting.org/dev/en/index.html

## LICENSE

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5440-c5f4530ab develop
5535-54b9b7a6b develop
2 changes: 1 addition & 1 deletion ci/appveyor/install.bat
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if not defined COMMON_INSTALL_DIR set COMMON_INSTALL_DIR=%BUILD_ROOT_DIR%\local\

:: for cmake its the min version
if not defined CMAKE_VERSION set CMAKE_VERSION=3.5.2
if not defined PG_VERSION set PG_VERSION=2.3.1
if not defined PG_VERSION set PG_VERSION=2.3.2
if not defined BOOST_VERSION set BOOST_VERSION=1.58.0
if not defined CGAL_VERSION set CGAL_VERSION=4.8.1

Expand Down
3 changes: 1 addition & 2 deletions configuration.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trsp | Y | Y | Y
max_flow | Y | Y | Y
contraction | Y | Y | Y
pickDeliver | Y | Y | Y
vrp_basic | Y | Y | Y
vrp_basic | N | Y | Y
withPoints | Y | Y | Y
#doc-dijkstraTRSP | Y | Y | Y
#areaContraction | Y | Y | Y
Expand All @@ -37,5 +37,4 @@ withPoints | Y | Y | Y
topology | N | Y | Y
label_graph | N | Y | Y
costMatrix | N | Y | Y
vrppdtw | N | Y | Y
deprecated | N | Y | N
14 changes: 9 additions & 5 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ foreach(opt HTML LATEX SINGLEHTML EPUB DUMMY)
endif()
endforeach()

if (LOCALE)
set(WITH_DOC ON)
endif()


message(STATUS "PgRouting_DOC_TARGETS = ${PgRouting_DOC_TARGETS}")

Expand Down Expand Up @@ -183,13 +187,13 @@ configure_file("../tools/testers/sampledata.sql" "${PGR_DOCUMENTATION_SOURCE_DIR
#TODO ???
#add_subdirectory("static")
#add_subdirectory("themes")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/static" DESTINATION "${PGR_DOCUMENTATION_BUILD_DIR}")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/themes" DESTINATION "${PGR_DOCUMENTATION_BUILD_DIR}")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/_static" DESTINATION "${PGR_DOCUMENTATION_SOURCE_DIR}")
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/_themes" DESTINATION "${PGR_DOCUMENTATION_SOURCE_DIR}")


configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
"${PGR_DOCUMENTATION_BUILD_DIR}/conf.py"
"${PGR_DOCUMENTATION_SOURCE_DIR}/conf.py"
@ONLY)

# Add documentation to targets
Expand All @@ -211,7 +215,7 @@ if (LOCALE)
add_custom_target(locale
COMMAND ${SPHINX_EXECUTABLE}
-b gettext
-c "${PGR_DOCUMENTATION_BUILD_DIR}"
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/locale/pot"

Expand Down Expand Up @@ -247,7 +251,7 @@ foreach (target ${PgRouting_DOC_TARGETS})
#-a # write all files; default is to only write new and changed files
-b ${target}
-D language='${lang}'
-c "${PGR_DOCUMENTATION_BUILD_DIR}"
-c "${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_SOURCE_DIR}"
"${PGR_DOCUMENTATION_BUILD_DIR}/${target}/${lang}"

Expand Down
12 changes: 12 additions & 0 deletions doc/_static/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

abbr {
font-size: 80%;
}

/* Content */
div.content-wrapper {
background-color: blue;
padding-top: 20px;
padding-bottom: 20px;
}

File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
7 changes: 7 additions & 0 deletions doc/_templates/layout.thml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

{# Import the theme's layout. #}
{% extends "!layout.html" %}

{# Custom CSS overrides #}
{% set bootswatch_css_custom = ['_static/custom.css'] %}

File renamed without changes.
17 changes: 13 additions & 4 deletions doc/conf.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extensions = [
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['doc/templates']
templates_path = ["_templates"]

# The suffix of source filenames.
source_suffix = '.rst'
Expand Down Expand Up @@ -129,17 +129,20 @@ html_title = "pgRouting Manual (@PGROUTING_SHORT_VERSION@@PGROUTING_VERSION_DEV@

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
html_logo = "static/images/pgrouting.png"
html_logo = "_static/images/pgrouting.png"

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
html_favicon = "static/images/favicon.ico"
html_favicon = "_static/images/favicon.ico"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['static']
html_static_path = ["_static"]

def setup(app):
app.add_stylesheet('custom.css')

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
Expand Down Expand Up @@ -287,6 +290,12 @@ pdf_stylesheets = ['sphinx','kerning','a4']
# A list of folders to search for stylesheets. Example:
pdf_style_path = ['.', '_styles']


rst_epilog="""
.. |ANY-INTEGER| replace:: :abbr:`ANY-INTEGER(SMALLINT, INTEGER, BIGINT)`
.. |ANY-NUMERICAL| replace:: :abbr:`ANY-NUMERICAL(SMALLINT, INTEGER, BIGINT, REAL, FLOAT)`
"""

# Create a compressed PDF
# Use True/False or 1/0
# Example: compressed=True
Expand Down
Loading