More changes on pickDeliver

.travis.yml

@@ -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

.tx/config

@@ -1,6 +1,5 @@
 [main]
 host = https://www.transifex.com
-lang_map = pt_br:pg_BR
 type = PO
 
 [pgrouting.pgr_analyzeGraph]

CMakeLists.txt

@@ -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
 #---------------------------------------------

NEWS

@@ -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*
 

README.md

@@ -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:
 
@@ -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
 

VERSION

@@ -1 +1 @@
-5440-c5f4530ab develop
+5535-54b9b7a6b develop

ci/appveyor/install.bat

@@ -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
 

configuration.conf

@@ -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
@@ -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

doc/CMakeLists.txt

@@ -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}")
 
@@ -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
@@ -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" 
 
@@ -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}"
 

doc/_static/custom.css

@@ -0,0 +1,12 @@
+
+abbr {
+    font-size: 80%;
+}
+
+/* Content */
+div.content-wrapper {
+    background-color: blue;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+

doc/_templates/layout.thml

@@ -0,0 +1,7 @@
+
+{# Import the theme's layout. #}
+{% extends "!layout.html" %}
+
+{# Custom CSS overrides #}
+{% set bootswatch_css_custom = ['_static/custom.css'] %}
+

doc/conf.py.in

@@ -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'
@@ -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.
@@ -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