Skip to content

Commit b3cdd37

Browse files
authored
Merge pull request #141 from cvxgrp/clarabel_interface
Clarabel interface
2 parents 6e1f87c + 2f3f1f9 commit b3cdd37

File tree

438 files changed

+1962
-441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

438 files changed

+1962
-441
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
^CRAN-RELEASE$
1212
^inst/issues/*
1313
^\.github$
14+
^\.Rhistory$

DESCRIPTION

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: CVXR
22
Type: Package
33
Title: Disciplined Convex Optimization
4-
Version: 1.0-13
4+
Version: 1.0-14
55
VignetteBuilder: knitr
66
Authors@R: c(
77
person("Anqi", "Fu",
@@ -51,7 +51,8 @@ Imports:
5151
ECOSolveR (>= 0.5.4),
5252
scs (>= 3.0),
5353
stats,
54-
osqp
54+
osqp,
55+
clarabel (>= 0.9.0)
5556
Suggests:
5657
knitr,
5758
rmarkdown,
@@ -83,9 +84,11 @@ Collate:
8384
'reduction_solvers.R'
8485
'complex2real.R'
8586
'conic_solvers.R'
87+
'clarabel.R'
8688
'eliminate_pwl.R'
8789
'dcp2cone.R'
8890
'dgp2dcp.R'
91+
'sparse_utils.R'
8992
'qp2quad_form.R'
9093
'qp_solvers.R'
9194
'utilities.R'

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export("dual_value<-")
1313
export("objective<-")
1414
export("value<-")
1515
export(CBC_CONIC)
16+
export(CLARABEL)
1617
export(CPLEX_CONIC)
1718
export(CPLEX_QP)
1819
export(CallbackParam)
@@ -161,6 +162,7 @@ export(vec)
161162
export(violation)
162163
export(vstack)
163164
exportClasses(CBC_CONIC)
165+
exportClasses(CLARABEL)
164166
exportClasses(CPLEX_QP)
165167
exportClasses(ECOS)
166168
exportClasses(ECOS_BB)

NEWS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# CVXR 1.0-14
2+
3+
* Address further inefficiency in use of diagonal matrices in
4+
`qp2quad_form.R`
5+
* Add initial interface to clarabel solver
6+
17
# CVXR 1.0-13
28

39
* Address inefficient processing of cones for MOSEK (Issue 137

0 commit comments

Comments
 (0)