Merge pull request #143 from cvxgrp/clarabel_interface

Clarabel optional for now

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: CVXR
 Type: Package
 Title: Disciplined Convex Optimization
-Version: 1.0-14
+Version: 1.0-15
 VignetteBuilder: knitr
 Authors@R: c(
            person("Anqi", "Fu",
@@ -42,7 +42,6 @@ Depends:
     R (>= 3.4.0)
 Imports:
     methods,
-    R6,
     Matrix,
     Rcpp (>= 0.12.12),
     bit64,
@@ -52,7 +51,8 @@ Imports:
     scs (>= 3.0),
     stats,
     osqp,
-    clarabel (>= 0.9.0)
+    cli,
+    utils
 Suggests:
     knitr,
     rmarkdown,
@@ -92,24 +92,23 @@ Collate:
     'qp2quad_form.R'
     'qp_solvers.R'
     'utilities.R'
+    'coll_utils.R'
     'solver_utilities.R'
     'transforms.R'
     'exports.R'
     'rcppUtils.R'
-    'R6List.R'
-    'ProblemData-R6.R'
-    'LinOp-R6.R'
-    'LinOpVector-R6.R'
+    'LinOp.R'
+    'LinOpVector.R'
     'RcppExports.R'
-    'CVXcanon-R6.R'
-    'Deque.R'
+    'CVXcanon.R'
     'canonInterface.R'
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Encoding: UTF-8
 Enhances: 
     Rcplex,
     gurobi,
     rcbc,
     cccp,
     Rmosek,
-    Rglpk
+    Rglpk,
+    clarabel (>= 0.9.0)

NAMESPACE

@@ -3,6 +3,7 @@
 S3method(max,Expression)
 S3method(mean,Expression)
 S3method(min,Expression)
+S3method(print,cvxr_result)
 S3method(prod,Expression)
 S3method(sum,Expression)
 S3method(t,Expression)
@@ -207,12 +208,12 @@ import(Matrix)
 import(methods)
 importClassesFrom(gmp,bigq)
 importClassesFrom(gmp,bigz)
-importFrom(R6,R6Class)
 importFrom(Rcpp,evalCpp)
 importFrom(Rmpfr,getPrec)
 importFrom(Rmpfr,mpfr)
 importFrom(bit64,as.bitstring)
 importFrom(bit64,as.integer64)
+importFrom(cli,cli_bullets)
 importFrom(gmp,as.bigq)
 importFrom(gmp,as.bigz)
 importFrom(gmp,asNumeric)

NEWS.md

@@ -1,3 +1,15 @@
+# CVXR 1.0-15
+
+* Revert `clarabel` requirement and use enhance rather than import
+  until really necessary ([Issue
+  142](https://github.com/cvxgrp/CVXR/issues/142)).
+* Update return codes for `user_limit` etc to be
+  `infeasible_inaccurate` to match [`CVXPY` for gurobi](https://github.com/cvxpy/cvxpy/pull/1270)
+* Add an S3 print method for result from `solve()`.
+* Move `upper_tri_to_full` to C++
+* Drop use of R6 classes
+* Address bug in copying `Power` object ([Issue 145](https://github.com/cvxgrp/CVXR/issues/142)).
+
 # CVXR 1.0-14
 
 * Address further inefficiency in use of diagonal matrices in

R/CVXcanon.R

@@ -0,0 +1,33 @@
+
+CVXcanon.build_matrix <- function(constraints, id_to_col, constr_offsets) {
+  ## Returns a ProblemData object
+  ptr <- NA
+  if (missing(constr_offsets)) {
+    ptr <- .Call('_CVXR_build_matrix_0',
+                 constraints$getXPtr(),
+                 id_to_col,
+                 PACKAGE = 'CVXR')
+  } else {
+    ptr <- .Call('_CVXR_build_matrix_1',
+                 constraints$getXPtr(),
+                 id_to_col,
+                 constr_offsets,
+                 PACKAGE = 'CVXR')
+  }
+  getV <- function() {
+    .Call('_CVXR_ProblemData__get_V', ptr, PACKAGE = "CVXR")
+  }
+
+  getI <- function() {
+    .Call('_CVXR_ProblemData__get_I', ptr, PACKAGE = "CVXR")
+  }
+
+  getJ <- function() {
+    .Call('_CVXR_ProblemData__get_J', ptr, PACKAGE = "CVXR")
+  }
+
+  getConstVec <- function() {
+    .Call('_CVXR_ProblemData__get_const_vec', ptr, PACKAGE = "CVXR")
+  }
+  list(getV = getV, getI = getI, getJ = getJ, getConstVec = getConstVec)
+}