Merge pull request #84 from cvxgrp/v_1.0.8

V 1.0.8
cvxgrp · Sep 13, 2020 · ab4836f · ab4836f
2 parents bb4f929 + 5c5686a
commit ab4836f
Show file tree

Hide file tree

Showing 429 changed files with 2,542 additions and 2,368 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: CVXR
 Type: Package
 Title: Disciplined Convex Optimization
-Version: 1.0-2
+Version: 1.0-8
 VignetteBuilder: knitr
 Authors@R: c(
            person("Anqi", "Fu",
@@ -35,7 +35,9 @@ Description: An object-oriented modeling language for disciplined
     mathematical convention and DCP rules. The system analyzes the
     problem, verifies its convexity, converts it into a canonical
     form, and hands it off to an appropriate solver to obtain the
-    solution.
+    solution. Interfaces to solvers on CRAN and elsewhere are
+    provided, both commercial and open source.
+Additional_repositories: https://bnaras.github.io/drat
 Depends:
     R (>= 3.4.0)
 Imports:
@@ -55,14 +57,8 @@ Suggests:
     rmarkdown,
     testthat,
     nnls,
-    Rglpk,
     slam,
-    Rmosek,
-    gurobi,
-    Rcplex,
-    rcbc,
-    covr,
-    cccp
+    covr
 LinkingTo: Rcpp, RcppEigen
 License: Apache License 2.0 | file LICENSE
 LazyData: true
@@ -105,5 +101,12 @@ Collate:
     'CVXcanon-R6.R'
     'Deque.R'
     'canonInterface.R'
-RoxygenNote: 7.1.0
+RoxygenNote: 7.1.1
 Encoding: UTF-8
+Enhances: 
+    Rcplex,
+    gurobi,
+    rcbc,
+    cccp,
+    Rmosek,
+    Rglpk
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,13 @@
+# CVXR 1.0-8 to 1.0-3
+
+* Conforming to CRAN suggestions on non-CRAN packages, but no actual
+  changes.
+
 # CVXR 1.0-2
 
 * Added exponential cone support for `MOSEK` and uncommented
   associated test.
+* Added JSS publication DOI.
 
 # CVXR 1.0-1
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/cvxr_intro.html b/docs/articles/cvxr_intro.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/version1.html b/docs/articles/version1.html
diff --git a/docs/authors.html b/docs/authors.html