Skip to content

Commit

Permalink
Merge pull request #141 from cvxgrp/clarabel_interface
Browse files Browse the repository at this point in the history
Clarabel interface
  • Loading branch information
bnaras authored Jun 27, 2024
2 parents 6e1f87c + 2f3f1f9 commit b3cdd37
Show file tree
Hide file tree
Showing 438 changed files with 1,962 additions and 441 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
^CRAN-RELEASE$
^inst/issues/*
^\.github$
^\.Rhistory$
7 changes: 5 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: CVXR
Type: Package
Title: Disciplined Convex Optimization
Version: 1.0-13
Version: 1.0-14
VignetteBuilder: knitr
Authors@R: c(
person("Anqi", "Fu",
Expand Down Expand Up @@ -51,7 +51,8 @@ Imports:
ECOSolveR (>= 0.5.4),
scs (>= 3.0),
stats,
osqp
osqp,
clarabel (>= 0.9.0)
Suggests:
knitr,
rmarkdown,
Expand Down Expand Up @@ -83,9 +84,11 @@ Collate:
'reduction_solvers.R'
'complex2real.R'
'conic_solvers.R'
'clarabel.R'
'eliminate_pwl.R'
'dcp2cone.R'
'dgp2dcp.R'
'sparse_utils.R'
'qp2quad_form.R'
'qp_solvers.R'
'utilities.R'
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export("dual_value<-")
export("objective<-")
export("value<-")
export(CBC_CONIC)
export(CLARABEL)
export(CPLEX_CONIC)
export(CPLEX_QP)
export(CallbackParam)
Expand Down Expand Up @@ -161,6 +162,7 @@ export(vec)
export(violation)
export(vstack)
exportClasses(CBC_CONIC)
exportClasses(CLARABEL)
exportClasses(CPLEX_QP)
exportClasses(ECOS)
exportClasses(ECOS_BB)
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# CVXR 1.0-14

* Address further inefficiency in use of diagonal matrices in
`qp2quad_form.R`
* Add initial interface to clarabel solver

# CVXR 1.0-13

* Address inefficient processing of cones for MOSEK (Issue 137
Expand Down
Loading

0 comments on commit b3cdd37

Please sign in to comment.