Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated style docs #184

Merged
merged 2 commits into from
Sep 1, 2019
+9 −8
Merged

Updated style docs #184

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d259f32
Updated style docs
bstellato Aug 31, 2019
9ef2884
Fixed some links
gbanjac Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/_static/css/osqp_theme.css
View file
Original file line number Diff line number Diff line change
@@ -192,6 +192,7 @@ p.breathe-sectiondef-title.rubric {


/* Margin below tables */
p {
table p {
margin-bottom: 0px;
}

8 changes: 4 additions & 4 deletions docs/index.rst
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OSQP solver documentation
==========================
**Join our** `forum <https://groups.google.com/forum/#!forum/osqp>`_ **for any
**Join our** `forum <https://osqp.discourse.group/>`_ **for any
questions related to the solver!**

The OSQP (Operator Splitting Quadratic Program) solver is a numerical
@@ -70,11 +70,11 @@ OSQP is distributed under the `Apache 2.0 License <https://www.apache.org/licens
The following people have been involved in the development of OSQP:

* `Bartolomeo Stellato <https://stellato.io/>`_ (MIT): main development
* `Goran Banjac <http://people.ee.ethz.ch/~gbanjac/>`_ (ETH Zürich): main development
* `Nicholas Moehle <http://web.stanford.edu/~moehle/>`_ (Stanford University): methods, maths, and code generation
* `Goran Banjac <https://people.ee.ethz.ch/~gbanjac/>`_ (ETH Zürich): main development
* `Nicholas Moehle <https://www.nicholasmoehle.com/>`_ (Stanford University): methods, maths, and code generation
* `Paul Goulart <http://users.ox.ac.uk/~engs1373/>`_ (University of Oxford): methods, maths, and Matlab interface
* `Alberto Bemporad <http://cse.lab.imtlucca.it/~bemporad/>`_ (IMT Lucca): methods and maths
* `Stephen Boyd <http://web.stanford.edu/~boyd/>`_ (Stanford University): methods and maths
* `Stephen Boyd <https://web.stanford.edu/~boyd/>`_ (Stanford University): methods and maths

Interfaces development

4 changes: 2 additions & 2 deletions docs/parsers/jump.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
JuMP
=====

`JuMP <https://github.com/JuliaOpt/JuMP.jl>`_ supports the OSQP solver using the `MathProgBase interface <https://github.com/JuliaOpt/MathProgBase.jl>`_.
`JuMP <https://github.com/JuliaOpt/JuMP.jl>`_ supports the OSQP solver using the `MathOptInterface interface <https://github.com/JuliaOpt/MathOptInterface.jl>`_.
You can define a JuMP model to be solved via OSQP as follows


@@ -26,4 +26,4 @@ After defining your model, you can solve it by just calling
solve(model)


For more details on how to create and modify the models, see the `JuMP Documentation <https://github.com/JuliaOpt/JuMP.jl>`_.
For more details on how to create and modify the models, see the `JuMP Documentation <https://www.juliaopt.org/JuMP.jl/stable/>`_.
2 changes: 1 addition & 1 deletion docs/parsers/yalmip.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
YALMIP
======

`YALMIP <https://yalmip.github.io/download/>`_ support the OSQP solver. You can easily define problems in high-level format and then specify OSQP by simply setting
`YALMIP <https://yalmip.github.io/>`_ support the OSQP solver. You can easily define problems in high-level format and then specify OSQP by simply setting

.. code:: matlab