Skip to content

Commit ae4442d

Browse files
authored
Merge branch 'master' into chordal
2 parents 66e07d6 + b43a510 commit ae4442d

File tree

120 files changed

+5104
-2477
lines changed

Some content is hidden

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

120 files changed

+5104
-2477
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,42 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- version: '1.6'
15+
- version: '1.10'
1616
os: ubuntu-latest
1717
arch: x64
1818
- version: '1'
1919
os: ubuntu-latest
2020
arch: x64
21-
- version: '1'
22-
os: ubuntu-latest
23-
arch: x86
21+
# # See https://github.com/jump-dev/SumOfSquares.jl/pull/331
22+
# - version: 'nightly'
23+
# os: ubuntu-latest
24+
# arch: x86
2425
# - version: 'nightly'
2526
# os: ubuntu-latest
2627
# arch: x64
2728
steps:
28-
- uses: actions/checkout@v2
29-
- uses: julia-actions/setup-julia@v1
29+
- uses: actions/checkout@v4
30+
- uses: julia-actions/setup-julia@v2
3031
with:
3132
version: ${{ matrix.version }}
3233
arch: ${{ matrix.arch }}
33-
- uses: actions/cache@v1
34-
env:
35-
cache-name: cache-artifacts
36-
with:
37-
path: ~/.julia/artifacts
38-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
39-
restore-keys: |
40-
${{ runner.os }}-test-${{ env.cache-name }}-
41-
${{ runner.os }}-test-
42-
${{ runner.os }}-
34+
- uses: julia-actions/cache@v1
35+
- name: MOI
36+
shell: julia --project=@. {0}
37+
run: |
38+
using Pkg
39+
Pkg.add([
40+
PackageSpec(name="StarAlgebras", rev="main"),
41+
PackageSpec(name="SymbolicWedderburn", rev="master"),
42+
PackageSpec(name="MultivariateBases", rev="master"),
43+
PackageSpec(name="MultivariateMoments", rev="master"),
44+
PackageSpec(name="PolyJuMP", rev="master"),
45+
])
4346
- uses: julia-actions/julia-buildpkg@v1
4447
- uses: julia-actions/julia-runtest@v1
4548
with:
4649
depwarn: error
4750
- uses: julia-actions/julia-processcoverage@v1
48-
- uses: codecov/codecov-action@v1
51+
- uses: codecov/codecov-action@v3
4952
with:
5053
file: lcov.info

.github/workflows/documentation.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# Fix for Plots with GR backend, see https://github.com/JuliaPolyhedra/Polyhedra.jl/pull/265
1313
GKSwstype: nul
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- uses: julia-actions/setup-julia@latest
1717
with:
1818
# Build documentation on the latest Julia 1.x
@@ -22,6 +22,11 @@ jobs:
2222
run: |
2323
using Pkg
2424
Pkg.add([
25+
PackageSpec(name="StarAlgebras", rev="main"),
26+
PackageSpec(name="SymbolicWedderburn", rev="master"),
27+
PackageSpec(name="MultivariateBases", rev="master"),
28+
PackageSpec(name="MultivariateMoments", rev="master"),
29+
PackageSpec(name="PolyJuMP", rev="master"),
2530
PackageSpec(path=pwd()),
2631
])
2732
Pkg.instantiate()

.github/workflows/examples.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
run: |
1818
using Pkg
1919
Pkg.add([
20+
PackageSpec(name="StarAlgebras", rev="main"),
21+
PackageSpec(name="SymbolicWedderburn", rev="master"),
22+
PackageSpec(name="MultivariateBases", rev="master"),
23+
PackageSpec(name="MultivariateMoments", rev="master"),
24+
PackageSpec(name="PolyJuMP", rev="master"),
2025
PackageSpec(path=pwd()),
2126
])
2227
Pkg.instantiate()

.github/workflows/format_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: julia-actions/setup-julia@latest
1515
with:
1616
version: '1'
17-
- uses: actions/checkout@v1
17+
- uses: actions/checkout@v4
1818
- name: Format check
1919
shell: julia --color=yes {0}
2020
run: |

Project.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ PolyJuMP = "ddf597a6-d67e-5340-b84c-e37d84115374"
1717
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1818
SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204"
1919
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
20+
StarAlgebras = "0c0c59c1-dc5f-42e9-9a8b-b5dc384a6cd1"
2021
SymbolicWedderburn = "858aa9a9-4c7c-4c62-b466-2421203962a2"
2122

2223
[compat]
@@ -31,5 +32,6 @@ MutableArithmetics = "1"
3132
PolyJuMP = "0.7"
3233
Reexport = "0.2, 1.0"
3334
SemialgebraicSets = "0.3"
34-
SymbolicWedderburn = "0.3"
35-
julia = "1.6"
35+
StarAlgebras = "0.3"
36+
SymbolicWedderburn = "0.4"
37+
julia = "1.10"

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SumOfSquares.jl
22

3-
[![Build Status](https://github.com/jump-dev/SumOfSquares.jl/workflows/CI/badge.svg?branch=master)](https://github.com/jump-dev/SumOfSquares.jl/actions?query=workflow%3ACI)
3+
[![Build Status](https://github.com/jump-dev/SumOfSquares.jl/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jump-dev/SumOfSquares.jl/actions?query=workflow%3ACI)
44
[![codecov](https://codecov.io/gh/jump-dev/SumOfSquares.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/jump-dev/SumOfSquares.jl)
55
[![](https://zenodo.org/badge/DOI/10.5281/zenodo.1208672.svg)](https://doi.org/10.5281/zenodo.1208672)
66

@@ -34,7 +34,9 @@ for the in-development version of the documentation.
3434
Some presentations on, or using, SumOfSquares (see [blegat/SumOfSquaresSlides](https://github.com/blegat/SumOfSquaresSlides)
3535
for the source code of the presentations):
3636

37+
* Benoît Legat at [JuMP-dev 2024](https://jump.dev/meetings/jumpdev2024/) [[Slides](https://jump.dev/assets/jump-dev-workshops/2024/legat.html)] [[Video](https://youtu.be/CGPHaHxCG2w)]
3738
* Benoît Legat at [JuMP-dev 2023](https://pretalx.com/juliacon2023/talk/XLT8H3/) [[Slides](https://drive.google.com/file/d/1H-_Ot7tP2g7t95r0K_mTaXvGO1ChUPci/view?usp=drive_link)]
39+
* Benoît Legat at [SIAM DS 2023](https://www.siam.org/conferences/cm/conference/ds23) [[Slides](https://drive.google.com/file/d/18isl8aCr_mAsLg9v3eqe-t1BxEP4_TPE/view?usp=drive_link)]
3840
* Benoît Legat, Marek Kaluba and Tillmann Weisser at INFORMS 2022 [[Slides](https://drive.google.com/file/d/1rlsIxgcnKWT436k4MNenjHfgH0UYRLAB/view?usp=share_link)]
3941
* Benoît Legat at [POEMA Learning Week 2](http://poema-network.eu/index.php/news-and-events/project-workshops/13-poema-learning-week-2)
4042
* Benoît Legat, Marek Kaluba and Tillmann Weisser at [JuMP-dev 2021](https://pretalx.com/juliacon2021/talk/L8DTE3/) [[Slides](https://drive.google.com/file/d/1HtArDFNMQ6IYUqRjSWR3JviJp9xLtSlB/view?usp=sharing)]

bench/sos_polynomial.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function sos_polynomial(n)
55
@polyvar x
66
monos = monomials(x, 0:2n)
77
set = SumOfSquares.SOSPolynomialSet(
8-
SumOfSquares.FullSpace(), monos,
8+
SumOfSquares.FullSpace(), MB.SubBasis{MB.Monomial}(monos),
99
SumOfSquares.Certificate.Remainder(
1010
SumOfSquares.SOSCone(),
1111
SumOfSquares.MonomialBasis,

docs/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Cyclotomics = "da8f5974-afbb-4dc8-91d8-516d5257c83b"
77
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
88
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
99
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
10+
DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
1011
Dualization = "191a621a-6537-11e9-281d-650236a99e60"
1112
DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
1213
GroupsCore = "d5909c97-4eac-4ecc-a3dc-fdd0858a4120"
@@ -28,9 +29,11 @@ PolyJuMP = "ddf597a6-d67e-5340-b84c-e37d84115374"
2829
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
2930
SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13"
3031
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
32+
StarAlgebras = "0c0c59c1-dc5f-42e9-9a8b-b5dc384a6cd1"
3133
SumOfSquares = "4b9e565b-77fc-50a5-a571-1244f986bda1"
3234
SymbolicWedderburn = "858aa9a9-4c7c-4c62-b466-2421203962a2"
3335
TypedPolynomials = "afbbf031-7a57-5f58-a1b9-b774a0fad08d"
3436

3537
[compat]
3638
Documenter = "1"
39+
DynamicPolynomials = "0.6"

docs/make.jl

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
using SumOfSquares
44
using Documenter, Literate
5+
import DocumenterCitations
56

67
const _TUTORIAL_DIR = joinpath(@__DIR__, "src", "tutorials")
78
const _OUTPUT_DIR = joinpath(@__DIR__, "src", "generated")
@@ -34,12 +35,21 @@ literate_directory.(_TUTORIAL_SUBDIR)
3435
makedocs(
3536
sitename = "SumOfSquares",
3637
# See https://github.com/JuliaDocs/Documenter.jl/issues/868
37-
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
38+
format = Documenter.HTML(
39+
prettyurls = get(ENV, "CI", nothing) == "true",
40+
assets = ["assets/citations.css"],
41+
),
3842
pages = [
3943
"Index" => "index.md",
4044
"Sum-of-Squares Programming" => "sumofsquares.md",
4145
"Variables" => "variables.md",
4246
"Constraints" => "constraints.md",
47+
"API Reference" => [
48+
"reference/standard_form.md",
49+
"reference/constraints.md",
50+
"reference/certificate.md",
51+
"reference/internal.md",
52+
],
4353
"Tutorials" => map(
4454
subdir ->
4555
subdir => map(
@@ -51,10 +61,17 @@ makedocs(
5161
),
5262
_TUTORIAL_SUBDIR,
5363
),
64+
"Bibliography" => "bibliography.md",
5465
],
5566
# The following ensures that we only include the docstrings from
5667
# this module for functions define in Base that we overwrite.
57-
modules = [SumOfSquares, PolyJuMP]
68+
modules = [SumOfSquares, PolyJuMP],
69+
plugins = [
70+
DocumenterCitations.CitationBibliography(
71+
joinpath(@__DIR__, "src", "references.bib");
72+
style = :authoryear,
73+
),
74+
],
5875
)
5976

6077
deploydocs(

docs/src/assets/citations.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.citation dl {
2+
display: grid;
3+
grid-template-columns: max-content auto; }
4+
.citation dt {
5+
grid-column-start: 1; }
6+
.citation dd {
7+
grid-column-start: 2;
8+
margin-bottom: 0.75em; }
9+
.citation ul {
10+
padding: 0 0 2.25em 0;
11+
margin: 0;
12+
list-style: none;}
13+
.citation ul li {
14+
text-indent: -2.25em;
15+
margin: 0.33em 0.5em 0.5em 2.25em;}
16+
.citation ol li {
17+
padding-left:0.75em;}

docs/src/bibliography.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Bibliography
2+
3+
```@bibliography
4+
```

0 commit comments

Comments
 (0)