Merge pull request #123 from cvvergara/pd/issue122

Pd/issue122

CMakeLists.txt

@@ -104,7 +104,7 @@ set(PgRouting_SOURCE_NAMES
     #----------------------
     "max_flow"    # 2.3
     "contraction" # 2.3
-    "pickDeliver" # 2.3
+    #"pickDeliver" # 2.3
     "pickDeliverE" # 2.5
     "vrp_basic"   # 2.0 
     "withPoints"  # 2.2
@@ -192,8 +192,10 @@ endif()
 
 if(COMPILER_SUPPORTS_CXX11)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    message(STATUS "Using  -std=c++11.")
 elseif(COMPILER_SUPPORTS_CXX0X)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    message(STATUS "Using  -std=c++0x.")
 else()
     message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++0x or C++11 flags support.")
 endif()

doc/conf.py.in

@@ -72,6 +72,7 @@ exclude_patterns = [
     'doc/build',
     'pgr_withPointsVia.rst',
     'pgr_pickDeliver.rst',
+    'pgr_pickDeliverEuclidean.rst',
     'src/pickDeliver',
     'maxFlowApplications.rst',
     '*/notUsed',

doc/src/pgRouting-concepts.rst

@@ -356,13 +356,13 @@ Where:
 
 .. pd_euclidean_sql_start
 
-.. note:: TODO 
+.. note TODO 
 
 .. pd_euclidean_sql_end
 
 .. pd_vehicle_sql_start
 
-.. note:: TODO 
+.. note TODO 
 
 .. pd_vehicle_sql_end
 

doc/src/proposed.rst

@@ -140,7 +140,6 @@ Experimental and Proposed functions
 
 .. rubric:: Vehicle Routing Problems
 
--  :ref:`pgr_pickDeliverEuclidean` - VRP Pickup & Delivery with Euclidean distances
 -  :ref:`pgr_gsocvrppdtw` - VRP Pickup & Delivery (Euclidean)
 -  :ref:`pgr_vrp_basic` - VRP One Depot
 
@@ -152,7 +151,6 @@ Experimental and Proposed functions
   contraction-family
   flow-family
   pgr_labelGraph
-  pgr_pickDeliverEuclidean
   pgr_gsoc_vrppdtw
   pgr_vrpOneDepot
 
@@ -171,4 +169,6 @@ Experimental and Proposed functions
     :hidden:
     ..
      ../src/funnyDijkstra/doc/pgr_funnyDijkstra.rst
+    -  :ref:`pgr_pickDeliverEuclidean` - VRP Pickup & Delivery with Euclidean distances
+    pgr_pickDeliverEuclidean
 

doxygen/Doxyfile.in

@@ -140,7 +140,7 @@ INLINE_INHERITED_MEMB  = YES
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = YES
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -806,7 +806,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */notUsed/* */test/* */src/trsp/doc/README.md
+EXCLUDE_PATTERNS       = */notUsed/* */test/* */src/trsp/doc/README.md */pickDeliver/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

include/c_common/README.md

@@ -14,8 +14,6 @@ Example
 
 in `foo.c` file
 
-```
-#include "c_input/edges_input.h"
-#include "c_input/arrays_input.h"
-```
+    #include "c_common/edges_input.h"
+    #include "c_common/arrays_input.h"
 

include/cpp_common/Dmatrix.h

@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_DMATRIX_H_
 #define INCLUDE_CPP_COMMON_DMATRIX_H_
 #pragma once

include/cpp_common/basePath_SSEC.hpp

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_
 #define INCLUDE_CPP_COMMON_BASEPATH_SSEC_HPP_
 #pragma once

include/cpp_common/basic_edge.h

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_BASIC_EDGE_H_
 #define INCLUDE_CPP_COMMON_BASIC_EDGE_H_
 #pragma once

include/cpp_common/basic_vertex.h

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_BASIC_VERTEX_H_
 #define INCLUDE_CPP_COMMON_BASIC_VERTEX_H_
 #pragma once

include/cpp_common/identifier.h

@@ -0,0 +1,59 @@
+/*PGR-GNU*****************************************************************
+ *
+
+Copyright (c) 2017 Celia Virginia Vergara Castillo
+vicky_vergara@hotmail.com
+
+------
+
+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_IDENTIFIER_H_
+#define INCLUDE_CPP_COMMON_IDENTIFIER_H_
+#pragma once
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
+#include <stdint.h>
+#endif
+
+#include <ostream>
+
+namespace pgrouting {
+
+class Identifier {
+ public:
+     Identifier() = default;
+     Identifier(const Identifier &v) = default;
+     Identifier(const size_t _idx, const int64_t _id);
+
+     int64_t id() const;
+     size_t idx() const;
+     void reset_id(int64_t);
+
+     friend std::ostream& operator<<(std::ostream& log, const Identifier&);
+
+ private:
+     size_t  m_idx;
+     int64_t m_id;
+};
+
+
+}  // namespace pgrouting
+
+#endif  // INCLUDE_CPP_COMMON_IDENTIFIER_H_

include/cpp_common/identifiers.hpp

@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_IDENTIFIERS_HPP_
 #define INCLUDE_CPP_COMMON_IDENTIFIERS_HPP_
 #pragma once

include/cpp_common/path_t.h

@@ -21,6 +21,7 @@ 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_PATH_T_H_

include/cpp_common/pgr_alloc.hpp

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_PGR_ALLOC_HPP_
 #define INCLUDE_CPP_COMMON_PGR_ALLOC_HPP_
 #pragma once
@@ -36,7 +38,7 @@ extern "C" {
 #endif
 
 #include "c_common/postgres_connection.h"
-#include <utils/palloc.h>
+#include "utils/palloc.h"
 }
 
 #include <string>

include/cpp_common/pgr_base_graph.hpp

@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_
 #define INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_
 #pragma once

include/cpp_common/pgr_bidirectional.hpp

@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_
 #define INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_
 #pragma once

include/pickDeliver/pgr_messages.h → include/cpp_common/pgr_messages.h

@@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
-/*! @file pgr_messages.h */
+/*! @file */
 
-#ifndef INCLUDE_PICKDELIVER_PGR_MESSAGES_H_
-#define INCLUDE_PICKDELIVER_PGR_MESSAGES_H_
+#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_H_
+#define INCLUDE_CPP_COMMON_PGR_MESSAGES_H_
 #pragma once
 
 
@@ -35,9 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <sstream>
 
 namespace pgrouting {
-namespace vrp {
-namespace pickdeliver {
-
 
 class Pgr_messages {
  public:
@@ -61,6 +58,12 @@ class Pgr_messages {
      */
     std::string get_notice() const;
 
+    /*! @brief get_error
+     *
+     * @returns the current contents of the log and clears the log
+     */
+    bool has_error() const;
+
     /*! @brief get_error
      *
      * @returns the current contents of the log and clears the log
@@ -84,22 +87,40 @@ class Pgr_messages {
     std::string get_dbglog() const;
 #endif
 
+#if 0
+    void entering(const char* function) {
+#if defined(__MINGW32__) || defined(_MSC_VER)
+#else
+    log << "ENTERING: " << function << "\n";
+#endif
+    }
+#endif
 
 
  public:
     /*! Stores the hint information*/
-    std::ostringstream log;
+    mutable std::ostringstream log;
     /*! Stores the notice information*/
-    std::ostringstream notice;
+    mutable std::ostringstream notice;
     /*! Stores the error information*/
-    std::ostringstream error;
+    mutable std::ostringstream error;
 #ifndef NDEBUG
     mutable std::ostringstream dbg_log;
 #endif
 };
 
-}  // namespace pickdeliver
-}  // namespace vrp
+
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
+#define ENTERING()
+#define EXITING()
+#else
+#define ENTERING() msg.log << "--> " << __PRETTY_FUNCTION__ << "\n"
+#define EXITING() msg.log << "<-- " << __PRETTY_FUNCTION__ << "\n"
+#endif
+
+
+
 }  // namespace pgrouting
 
-#endif  // INCLUDE_PICKDELIVER_PGR_MESSAGES_H_
+#endif  // INCLUDE_CPP_COMMON_PGR_MESSAGES_H_

include/cpp_common/xy_vertex.h

@@ -22,6 +22,8 @@
 
  ********************************************************************PGR-GNU*/
 
+/*! @file */
+
 #ifndef INCLUDE_CPP_COMMON_XY_VERTEX_H_
 #define INCLUDE_CPP_COMMON_XY_VERTEX_H_
 #pragma once

include/drivers/pickDeliver/pickDeliverEuclidean_driver.h

@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 /*! @file pickDeliverEuclidean_driver.h */
 
-#ifndef SRC_PICKDELIVER_SRC_PICKDELIVEREUCLIDEAN_DRIVER_H_
-#define SRC_PICKDELIVER_SRC_PICKDELIVEREUCLIDEAN_DRIVER_H_
+#ifndef INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_
+#define INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_
 #pragma once
 
 #include "c_types/pickDeliver/general_vehicle_orders_t.h"
@@ -50,6 +50,7 @@ extern "C" {
             PickDeliveryOrders_t *pd_orders_arr, size_t total_pd_orders,
             Vehicle_t *vehicles_arr, size_t total_vehicles,
 
+            double factor,
             int max_cycles,
             int initial_solution_id,
 
@@ -65,4 +66,4 @@ extern "C" {
 }
 #endif
 
-#endif  // SRC_PICKDELIVER_SRC_PICKDELIVEREUCLIDEAN_DRIVER_H_
+#endif  // INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVEREUCLIDEAN_DRIVER_H_

include/drivers/pickDeliver/pickDeliver_driver.h

@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 /*! @file pickDeliver_driver.h */
 
-#ifndef SRC_PICKDELIVER_SRC_PICKDELIVER_DRIVER_H_
-#define SRC_PICKDELIVER_SRC_PICKDELIVER_DRIVER_H_
+#ifndef INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVER_DRIVER_H_
+#define INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVER_DRIVER_H_
 #pragma once
 
 #include "c_types/pickDeliver/pickDeliveryOrders_t.h"
@@ -67,4 +67,4 @@ extern "C" {
 }
 #endif
 
-#endif  // SRC_PICKDELIVER_SRC_PICKDELIVER_DRIVER_H_
+#endif  // INCLUDE_DRIVERS_PICKDELIVER_PICKDELIVER_DRIVER_H_