Removed CLARABEL from testing also.

cvxgrp · Jun 30, 2024 · 19a403c · 19a403c
1 parent b05ba59
commit 19a403c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -52,7 +52,8 @@ Imports:
     scs (>= 3.0),
     stats,
     osqp,
-    cli
+    cli,
+    utils
 Suggests:
     knitr,
     rmarkdown,

diff --git a/R/solver_utilities.R b/R/solver_utilities.R
@@ -87,7 +87,7 @@ get_solver_codes <- function(name) {
   result <- .CVXR_cache$status_codes[[name]]
   if (is.null(result)) {
     result <- .CVXR_cache$status_codes[[name]] <- 
-      read.csv(system.file("extdata", paste0(name, "_status_codes.csv"), package = "CVXR"))
+      utils::read.csv(system.file("extdata", paste0(name, "_status_codes.csv"), package = "CVXR"))
   }
   result
 }

diff --git a/tests/testthat/test-g05-solver_tests.R b/tests/testthat/test-g05-solver_tests.R
@@ -171,7 +171,8 @@ test_that("Test a basic SDP with all solvers", {
                            .8590441, -.1760618, .11665767,
                            -.17606183, .03608155), nrow = n)
   # SCS and MOSEK and CVXOPT, CLARABEL are the only solvers that support SDPs
-  for(solver in intersect(INSTALLED_SOLVERS, c("SCS", "MOSEK", "CVXOPT", "CLARABEL"))) {
+  ## Not adding clarabel for now
+  for(solver in intersect(INSTALLED_SOLVERS, c("SCS", "MOSEK", "CVXOPT"))) {
     result <- solve(prob, solver = solver)
     print(sprintf("Solver: %s status: %s\n", solver, result$status))
     expect_equal(result$value, 1.395479, tolerance=TOL)
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,8 @@ Imports: @@
         scs (>= 3.0),
         stats,
         osqp,
-        cli
+        cli,
+        utils
     Suggests:
         knitr,
         rmarkdown,
@@ Expand Down @@