Disable code using CGAL

fontanf · Apr 5, 2024 · e4072a8 · e4072a8
1 parent e4d3a9a
commit e4072a8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,6 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install gmp (Darwin)
-      run: brew install gmp
-      if: matrix.os == 'macos-latest'
     - name: Build Linux
       run: bazel build --define clp=true -- //...
       if: matrix.os != 'windows-latest'

diff --git a/WORKSPACE b/WORKSPACE
@@ -322,4 +322,3 @@ cc_library(
     urls = ["https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6.zip"],
     sha256 = "b80e4825c4dd24c32b7326842cabf997129cd4ec6f06d73be144e979e592c74a",
 )
-
diff --git a/packingsolver/irregular/BUILD b/packingsolver/irregular/BUILD
@@ -23,7 +23,7 @@ cc_library(
                 "solution.cpp",
                 "algorithm_formatter.cpp",
                 "optimize.cpp",
-                "irregular_to_rectangle.cpp",
+                #"irregular_to_rectangle.cpp",
                 "nlp_circle.cpp",
                 "nlp.cpp",
         ],
@@ -32,7 +32,7 @@ cc_library(
                 "//packingsolver/algorithms:algorithms",
                 "//packingsolver/rectangle:rectangle",
                 "@treesearchsolver//treesearchsolver:treesearchsolver",
-                "@cgal//:cgal",
+                #"@cgal//:cgal",
         ] + KNITRO_DEP,
         copts = STDCPP17 + CLP_COPTS + CPLEX_COPTS + GUROBI_COPTS + XPRESS_COPTS + KNITRO_COPTS,
         visibility = ["//visibility:public"],

diff --git a/packingsolver/irregular/optimize.cpp b/packingsolver/irregular/optimize.cpp
@@ -36,6 +36,7 @@ const packingsolver::irregular::Output packingsolver::irregular::optimize(
 
     } else {
 
+        /*
         IrregularToRectangleParameters i2r_parameters
             = parameters.irregular_to_rectangle_parameters;
         i2r_parameters.verbosity_level = 0;
@@ -50,6 +51,7 @@ const packingsolver::irregular::Output packingsolver::irregular::optimize(
         irregular_to_rectangle(
                 instance,
                 i2r_parameters);
+        */
 
         /*
         NlpParameters nlp_parameters;

diff --git a/packingsolver/irregular/optimize.hpp b/packingsolver/irregular/optimize.hpp
@@ -2,7 +2,7 @@
 
 #include "packingsolver/irregular/solution.hpp"
 
-#include "packingsolver/irregular/irregular_to_rectangle.hpp"
+//#include "packingsolver/irregular/irregular_to_rectangle.hpp"
 
 namespace packingsolver
 {
@@ -20,7 +20,7 @@ using NewSolutionCallback = std::function<void(const Output&)>;
 struct OptimizeParameters: packingsolver::Parameters<Instance, Solution>
 {
     /** Parameters of the algorithm 'IrregularToRectangle'. */
-    IrregularToRectangleParameters irregular_to_rectangle_parameters;
+    //IrregularToRectangleParameters irregular_to_rectangle_parameters;
 
 
     /** Path of the .nl output file. */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -322,4 +322,3 @@ cc_library(
		urls = ["https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6.zip"],
		sha256 = "b80e4825c4dd24c32b7326842cabf997129cd4ec6f06d73be144e979e592c74a",
		)