Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/thowell/CALIPSO.jl into main
Browse files Browse the repository at this point in the history
  • Loading branch information
thowell committed Jun 6, 2022
2 parents cbe10c7 + d0d7c2f commit 1d27b60
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Documentation

on:
push:
branches:
- main
tags: '*'
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: 1.7
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
run: julia --project=docs/ docs/make.jl
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[![CI](https://github.com/thowell/CALIPSO.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/thowell/CALIPSO.jl/actions/workflows/CI.yml)
[![codecov](https://codecov.io/gh/thowell/CALIPSO.jl/branch/main/graph/badge.svg?token=RNX4943S70)](https://codecov.io/gh/thowell/CALIPSO.jl)
[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://thowell.github.io/CALIPSO.jl/dev)

# CALIPSO.jl
Conic Augmented Lagrangian Interior-Point SOlver: A solver for contact-implicit trajectory optimization
Expand All @@ -21,7 +22,7 @@ $$
can be optimized for

- $x$: decision variables
- $\theta$: problem parameters
- $\theta$: problem data
- $\mathcal{K}$: Cartesian product of convex cones; nonnegative orthant $\mathbf{R}_+$ and second-order cones $\mathcal{Q}$ are currently implemented

## Trajectory optimization
Expand All @@ -45,7 +46,7 @@ $$
\partial w^*(\theta) / \partial \theta,
$$

with respect to the problem parameters are efficiently computed.
with respect to the problem data are efficiently computed.

## Examples

Expand Down
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
push!(LOAD_PATH, "../src/")

using Documenter#, CALIPSO
using Documenter, CALIPSO

makedocs(
modules = [CALIPSO],
Expand Down

2 comments on commit 1d27b60

@thowell
Copy link
Owner Author

@thowell thowell commented on 1d27b60 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/61916

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.0 -m "<description of version>" 1d27b603f889c1bc3173cff280bb39c7c1a68137
git push origin v0.1.0

Please # to comment.