scikit-build-core as build backend and pull the main branch of HGS-CVRP

.github/workflows/ci.yml

@@ -42,8 +42,9 @@ jobs:
 
       - name: Install and Build
         run: |
-          pip install .
-          python setup.py build
+          pip install build
+          python -m build
+          pip install dist/hygese*.whl
 
       - name: Test with pytest
         run: |

CMakeLists.txt

@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.15)
+
+set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH "install prefix" FORCE)
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+if(WIN32)
+    # MSBUILD toolchain names the shared library as hgscvrp.dll
+    # this forces it to use libhgscvrp.dll
+    set(CMAKE_SHARED_LIBRARY_PREFIX_CXX "lib")
+endif()
+
+project(
+    ${SKBUILD_PROJECT_NAME}
+    VERSION ${SKBUILD_PROJECT_VERSION}
+    LANGUAGES CXX
+)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include(FetchContent)
+FetchContent_Declare(
+  hgscvrp
+  GIT_REPOSITORY https://github.com/vidalt/HGS-CVRP.git
+  GIT_TAG 1a927955cd2861a29d978f0d359d6e647db9319c
+)
+FetchContent_MakeAvailable(hgscvrp)
+
+# runtime library
+if(CMAKE_HOST_WIN32)
+  install(TARGETS lib RUNTIME DESTINATION hygese)
+else()
+  install(TARGETS lib LIBRARY DESTINATION hygese)
+endif()

hygese/hygese.py

@@ -47,9 +47,13 @@ class CAlgorithmParameters(Structure):
         ("lambda", c_int),
         ("nbElite", c_int),
         ("nbClose", c_int),
+        ("nbIterPenaltyManagement", c_int),
         ("targetFeasible", c_double),
+        ("penaltyDecrease", c_double),
+        ("penaltyIncrease", c_double),
         ("seed", c_int),
         ("nbIter", c_int),
+        ("nbIterTraces", c_int),
         ("timeLimit", c_double),
         ("useSwapStar", c_int),
     ]
@@ -62,9 +66,13 @@ class AlgorithmParameters:
     lambda_: int = 40
     nbElite: int = 4
     nbClose: int = 5
+    nbIterPenaltyManagement: int = 100
     targetFeasible: float = 0.2
+    penaltyDecrease: float = 0.85
+    penaltyIncrease: float = 1.2
     seed: int = 0
     nbIter: int = 20000
+    nbIterTraces: int = 500
     timeLimit: float = 0.0
     useSwapStar: bool = True
 
@@ -76,9 +84,13 @@ def ctypes(self) -> CAlgorithmParameters:
             self.lambda_,
             self.nbElite,
             self.nbClose,
+            self.nbIterPenaltyManagement,
             self.targetFeasible,
+            self.penaltyDecrease,
+            self.penaltyIncrease,
             self.seed,
             self.nbIter,
+            self.nbIterTraces,
             self.timeLimit,
             int(self.useSwapStar),
         )

pyproject.toml

@@ -1,3 +1,14 @@
+[project]
+name = "hygese"
+version = "0.0.0.11"
+authors = [{name = "Changhyun Kwon"}]
+description = "Wrapper for the Hybrid Genetic Search algorithm for Capacitated Vehicle Routing Problems (HGS-CVRP)"
+readme = {file = "README.md", content-type = "text/markdown"}
+requires-python=">=3.10"
+
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["scikit-build-core"]
+build-backend = "scikit_build_core.build"
+
+[tool.scikit-build]
+cmake.build-type = "Release"