gpush.sh

Author: Manas23601

.gitignore

@@ -6,6 +6,8 @@ src/version/_version.h
 v[0-9]*
 ortools
 build1
+gpush.sh
+bin_packing.cc
 
 # files are ignored on gh-pages
 doxy

include/drivers/or_tools/knapsack_driver.h

@@ -6,7 +6,7 @@ Mail: [email protected]
 
 Function's developer:
 Copyright (c) 2022 Manas Sivakumar
-Mail:
+Mail: Manas Sivakumar
 
 ------
 
@@ -39,11 +39,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #   include <stddef.h>
 #endif
 
-#include "c_types/vehicle_t.h"
-#include "c_types/matrix_cell_t.h"
+
 
 typedef struct PickDeliveryOrders_t PickDeliveryOrders_t;
-typedef struct Solution_rt Solution_rt;
+typedef struct Knapsack_rt Knapsack_rt;
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,16 +54,11 @@ extern "C" {
     bin_capacity INTEGER,
     max_cycles INTEGER,
    ********************************************************/
-  void do_pgr_pickDeliver(
+  void do_knapsack(
       PickDeliveryOrders_t *pd_orders_arr, size_t total_pd_orders,
-      Vehicle_t *vehicles_arr, size_t total_vehicles,
-      Matrix_cell_t *matrix_cells_arr, size_t total_cells,
-
-      double factor,
-      int max_cycles,
-      int initial_solution_id,
+      
 
-      Solution_rt **return_tuples,
+      Knapsack_rt **return_tuples,
       size_t *return_count,
 
       char **log_msg,

src/or_tools/knapsack.c

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_common/e_report.h"
 #include "c_common/time_msg.h"
 
-
+#include "c_types/knapsack_rt.h"
 #include "drivers/or_tools/knapsack_driver.h"
 
 PGDLLEXPORT Datum
@@ -37,44 +37,10 @@ void
 process(
         char* weights_sql,
         char* values_sql,
-        char* matrix_sql,
         int bin_capacity,
-        double factor,
-        int max_cycles,
-        int initial_solution_id,
-
-        Solution_rt **result_tuples,
+        
+        Knapsack_rt **result_tuples,
         size_t *result_count) {
-#if 0
-    if (factor <= 0) {
-        ereport(ERROR,
-                (errcode(ERRCODE_INTERNAL_ERROR),
-                 errmsg("Illegal value in parameter: factor"),
-                 errhint("Value found: %f <= 0", factor)));
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-        return;
-    }
-
-    if (max_cycles < 0) {
-        ereport(ERROR,
-                (errcode(ERRCODE_INTERNAL_ERROR),
-                 errmsg("Illegal value in parameter: max_cycles"),
-                 errhint("Value found: %d <= 0", max_cycles)));
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-        return;
-    }
-
-    if (initial_solution_id < 0 || initial_solution_id > 7) {
-        ereport(ERROR,
-                (errcode(ERRCODE_INTERNAL_ERROR),
-                 errmsg("Illegal value in parameter: initial"),
-                 errhint("Value found: %d <= 0", initial_solution_id)));
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-        return;
-    }
 
     pgr_SPI_connect();
 
@@ -97,112 +63,13 @@ process(
         return;
     }
 
-
-    Vehicle_t *vehicles_arr = NULL;
-    size_t total_vehicles = 0;
-    get_vehicles_raw(vehicles_sql,
-           &vehicles_arr, &total_vehicles,
-           false);
-
-    if (total_vehicles == 0) {
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-
-        /* freeing memory before return */
-        if (pd_orders_arr) {pfree(pd_orders_arr); pd_orders_arr = NULL;}
-        if (vehicles_arr) {pfree(vehicles_arr); vehicles_arr = NULL;}
-
-        pgr_SPI_finish();
-        ereport(ERROR,
-                (errcode(ERRCODE_INTERNAL_ERROR),
-                 errmsg("No vehicles found")));
-        return;
-    }
-
-    PGR_DBG("total orders %ld", total_pd_orders);
-    for (size_t i = 0; i < total_pd_orders; i++) {
-        PGR_DBG("%ld %f pick %ld - %ld %ld %ld"
-                "deliver %ld - %ld %ld %ld ",
-                pd_orders_arr[i].id,
-                pd_orders_arr[i].demand,
-
-                pd_orders_arr[i].pick_node_id,
-
-                pd_orders_arr[i].pick_open_t,
-                pd_orders_arr[i].pick_close_t,
-                pd_orders_arr[i].pick_service_t,
-
-                pd_orders_arr[i].deliver_node_id,
-
-                pd_orders_arr[i].deliver_open_t,
-                pd_orders_arr[i].deliver_close_t,
-                pd_orders_arr[i].deliver_service_t);
-    }
-
-
-
-    PGR_DBG("total vehicles %ld", total_vehicles);
-    for (size_t i = 0; i < total_vehicles; i++) {
-        PGR_DBG("%ld %f %f , start %ld %ld %ld %ld "
-                "end %ld %ld %ld %ld number %ld ",
-               vehicles_arr[i].id,
-               vehicles_arr[i].capacity,
-               vehicles_arr[i].speed,
-
-               vehicles_arr[i].start_node_id,
-               vehicles_arr[i].start_open_t,
-               vehicles_arr[i].start_close_t,
-               vehicles_arr[i].start_service_t,
-
-               vehicles_arr[i].end_node_id,
-               vehicles_arr[i].end_open_t,
-               vehicles_arr[i].end_close_t,
-               vehicles_arr[i].end_service_t,
-
-               vehicles_arr[i].cant_v);
-    }
-
-    Matrix_cell_t *matrix_cells_arr = NULL;
-    size_t total_cells = 0;
-    get_matrixRows_plain(matrix_sql, &matrix_cells_arr, &total_cells);
-
-    PGR_DBG("total matrix rows %ld", total_cells);
-    for (size_t i = 0; i < total_cells; i++) {
-        PGR_DBG("%ld %ld %f",
-               matrix_cells_arr[i].from_vid,
-               matrix_cells_arr[i].to_vid,
-               matrix_cells_arr[i].cost);
-    }
-
-    if (total_cells == 0) {
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-
-        /* freeing memory before return */
-        if (pd_orders_arr) {pfree(pd_orders_arr); pd_orders_arr = NULL;}
-        if (vehicles_arr) {pfree(vehicles_arr); vehicles_arr = NULL;}
-        if (matrix_cells_arr) {pfree(matrix_cells_arr); matrix_cells_arr = NULL;}
-
-        ereport(WARNING,
-                (errcode(ERRCODE_INTERNAL_ERROR),
-                 errmsg("No matrix found")));
-        pgr_SPI_finish();
-        return;
-    }
-
-
-    PGR_DBG("Total %ld orders in query:", total_pd_orders);
-    PGR_DBG("Total %ld vehicles in query:", total_vehicles);
-    PGR_DBG("Total %ld matrix cells in query:", total_cells);
-
-
     PGR_DBG("Starting processing");
     clock_t start_t = clock();
     char *log_msg = NULL;
     char *notice_msg = NULL;
     char *err_msg = NULL;
 
-    do_pgr_pickDeliver(
+    do_knapsack(
             pd_orders_arr, total_pd_orders,
             vehicles_arr, total_vehicles,
             matrix_cells_arr, total_cells,
@@ -218,31 +85,7 @@ process(
             &notice_msg,
             &err_msg);
 
-    time_msg("pgr_pickDeliver", start_t, clock());
-
-    if (err_msg && (*result_tuples)) {
-        pfree(*result_tuples);
-        (*result_count) = 0;
-        (*result_tuples) = NULL;
-    }
-    pgr_global_report(log_msg, notice_msg, err_msg);
-/* TODO(dev) remove unused includes */
-#include "c_common/orders_input.h"
-#include "c_common/vehicles_input.h"
-#include "c_common/matrixRows_input.h"
-#include "c_types/pickDeliveryOrders_t.h"
-#include "drivers/pgr_pickDeliver/pickDeliver_driver.h"
-#include "c_types/solution_rt.h"
-    /* freeing memory before return */
-    if (log_msg) {pfree(log_msg); log_msg = NULL;}
-    if (notice_msg) {pfree(notice_msg); notice_msg = NULL;}
-    if (err_msg) {pfree(err_msg); err_msg = NULL;}
-    if (pd_orders_arr) {pfree(pd_orders_arr); pd_orders_arr = NULL;}
-    if (vehicles_arr) {pfree(vehicles_arr); vehicles_arr = NULL;}
-    if (matrix_cells_arr) {pfree(matrix_cells_arr); matrix_cells_arr = NULL;}
-
     pgr_SPI_finish();
-#endif
 }
 
 
@@ -263,10 +106,7 @@ _vrp_knapsack(PG_FUNCTION_ARGS) {
         process(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 text_to_cstring(PG_GETARG_TEXT_P(1)),
-                text_to_cstring(PG_GETARG_TEXT_P(2)),
-                PG_GETARG_FLOAT8(3),
-                PG_GETARG_INT32(4),
-                PG_GETARG_INT32(5),
+                PG_GETARG_INT32(2),
                 &result_tuples,
                 &result_count);
 
@@ -286,7 +126,7 @@ _vrp_knapsack(PG_FUNCTION_ARGS) {
 
     funcctx = SRF_PERCALL_SETUP();
     tuple_desc = funcctx->tuple_desc;
-    result_tuples = (Solution_rt*) funcctx->user_fctx;
+    result_tuples = (Knapsack_rt*) funcctx->user_fctx;
 
     if (funcctx->call_cntr <  funcctx->max_calls) {
         HeapTuple   tuple;

src/or_tools/knapsack_driver.cpp

@@ -1,9 +1,9 @@
 /*PGR-GNU*****************************************************************
 File: pickDeliver_driver.cpp
-Copyright (c) 2015 pgRouting developers
+Copyright (c) 2022 pgRouting developers
 Mail: [email protected]
 Function's developer:
-Copyright (c) 2015 Celia Virginia Vergara Castillo
+Copyright (c) 2022 Manas Sivakumar
 ------
 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