Merge pull request #227 from Manas23601/manas-week-4

GSoC 22 Manas Sivakumar : Week 4
pgRouting · Jul 10, 2022 · 0cb3be0 · 0cb3be0
2 parents 554d434 + 937dae5
commit 0cb3be0
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 160 deletions.
diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml
@@ -1,14 +1,7 @@
 name: Boost supported versions
 
 on:
-  push:
-    branches-ignore:
-      - 'translations_*'
-    tags: []
-  pull_request:
-    paths-ignore:
-      - '**.po'
-
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml
@@ -4,13 +4,7 @@ name: Check queries
 # - the latest postgis version
 
 on:
-  push:
-    branches-ignore:
-      - 'translations_*'
-    tags: []
-  pull_request:
-    paths-ignore:
-      - '**.po'
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -1,13 +1,7 @@
 name: Build for Ubuntu with clang
 
 on:
-  push:
-    branches-ignore:
-      - 'translations_*'
-    tags: []
-  pull_request:
-    paths-ignore:
-      - '**.po'
+  workflow_dispatch:
 
 
 jobs:

diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml
@@ -8,7 +8,8 @@ name: Check Documentation
 # - build Links
 # - English is always tested
 
-on: [push,pull_request]
+on:
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -6,11 +6,7 @@ name: Build documentation
 # - postgis 3
 
 on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/.github/workflows/locale-and-website.yml b/.github/workflows/locale-and-website.yml
@@ -2,10 +2,6 @@ name: Update Locale and Website
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
-      - develop
 
 jobs:
   release:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,13 +1,7 @@
 name: Build for macOS
 
 on:
-  push:
-    branches-ignore:
-      - 'translations_*'
-    tags: []
-  pull_request:
-    paths-ignore:
-      - '**.po'
+  workflow_dispatch:
 
 # TODO: Fix the macOS build for compiling and building VROOM with vrprouting.
 jobs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,9 +1,7 @@
 name: Release
 
 on:
-  push:
-    tags:
-      - 'v*.*.*'
+  workflow_dispatch:
 
 
 jobs:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -61,7 +61,7 @@ jobs:
             wget https://github.com/google/or-tools/releases/download/v9.3/or-tools_amd64_ubuntu-20.04_v9.3.10502.tar.gz
             ls or-tools_amd64_ubuntu-20.04_v9.3.10502.tar.gz
             mkdir ortools
-            tar xf or-tools_amd64_ubuntu-20.04_v9.3.10502.tar.gz ./ortools
+            tar xf or-tools_amd64_ubuntu-20.04_v9.3.10502.tar.gz -C ./ortools
 
 
       - name: Install VROOM dependencies

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,9 +1,7 @@
 name: Build for Windows
 
 on:
-  push:
-    branches-ignore:
-        - '**'
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -327,12 +327,20 @@ foreach (subdir ${PROJECT_SRC_DIRECTORIES})
   add_subdirectory("${PROJECT_SOURCE_DIR}/src/${subdir}")
 endforeach()
 
-#---------------------
+#----------------------
 # Google OR tools
-#---------------------
+#----------------------
+
+# set(CMAKE_PREFIX_PATH "/home/manas/Codes/GSOC-2022/MyFork/ortools/build")
+add_subdirectory(ortools)
+# set(ortools_DIR "/home/manas/Codes/GSOC-2022/MyFork/ortools/build")
+# set(absl_DIR "/home/manas/Codes/GSOC-2022/MyFork/ortools/build/_deps/absl-build")
+# set(re2_DIR "/home/manas/Codes/GSOC-2022/MyFork/ortools/build/_deps/re2-build/CMakeFiles/Export/lib/cmake/re2")
+# set(Protobuf_DIR "/home/manas/Codes/GSOC-2022/MyFork/ortools/build/_deps/protobuf-build/lib/cmake/protobuf")
+# find_package(ortools CONFIG REQUIRED)
+add_executable(myapp bin_packing.cc)
+target_link_libraries(myapp ortools::ortools)
 
-find_package(ortools CONFIG REQUIRED)
-target_link_libraries(vrprouting ortools::ortools)
 
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------

diff --git a/include/drivers/or_tools/knapsack_driver.h b/include/drivers/or_tools/knapsack_driver.h
@@ -76,4 +76,5 @@ extern "C" {
 }
 #endif
 
-#endif  // INCLUDE_DRIVERS_PGR_PICKDELIVER_PICKDELIVER_DRIVER_H_
+#endif  // INCLUDE_DRIVERS_OR_TOOLS_KNAPSACK_DRIVER_H_
+
diff --git a/src/or_tools/knapsack.c b/src/or_tools/knapsack.c
@@ -35,9 +35,10 @@ PG_FUNCTION_INFO_V1(_vrp_knapsack);
 static
 void
 process(
-        char* pd_orders_sql,
-        char* vehicles_sql,
+        char* weights_sql,
+        char* values_sql,
         char* matrix_sql,
+        int bin_capacity,
         double factor,
         int max_cycles,
         int initial_solution_id,
@@ -324,4 +325,4 @@ _vrp_knapsack(PG_FUNCTION_ARGS) {
     } else {
         SRF_RETURN_DONE(funcctx);
     }
-}
+}
diff --git a/src/or_tools/knapsack_driver.cpp b/src/or_tools/knapsack_driver.cpp
@@ -265,4 +265,4 @@ do_pgr_pickDeliver(
         *err_msg = pgr_msg(err.str().c_str());
         *log_msg = pgr_msg(log.str().c_str());
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,11 +6,7 @@ name: Build documentation @@
     # - postgis 3
     on:
-      push:
-        branches:
-          - main
-        tags:
-          - '*'
+      workflow_dispatch:
     jobs:
       build:
@@ Expand Down @@