Skip to content

Commit

Permalink
Merge pull request #89 from alphaville/dev/alm/python
Browse files Browse the repository at this point in the history
Augmented Lagrangian Method: Python code generator
  • Loading branch information
alphaville authored Sep 27, 2019
2 parents 11f7b44 + e6f7dd1 commit 132356e
Show file tree
Hide file tree
Showing 46 changed files with 2,047 additions and 584 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ target/
*.odp#
*.egg-info
*.pyc
open-codegen/opengen/icasadi/extern/Makefile

# Python tests create this folder:
open-codegen/opengen/.python_test_build/
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.6.1-alpha.2] - 2019-09-7

### Fixed

* TCP server: Malformed error JSON is now fixed
* Algorithm now returns `u_bar`, which is feasible (not `u`)

### Added

* Rust implementation of augmented Lagrangian method (ALM)
* Rust implementation of joint ALM/PM algorithms
* Rust docs for ALM
* Release of crate version `0.6.1-alpha.1`
* Introduced `#![allow(dead_code)]` in ALM implementation
Expand All @@ -32,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed

* Support for Python <3.6 (deprecated)
* Module `continuation` is going to become obsolete

<!-- ---------------------
v0.5.0
Expand Down Expand Up @@ -116,7 +119,7 @@ This is a breaking API change.
--------------------- -->

<!-- Releases -->
[Unreleased]: https://github.com/alphaville/optimization-engine/compare/v0.5.0...master
[v0.6.1-alpha.2]: https://github.com/alphaville/optimization-engine/compare/v0.5.0...v0.6.1-alpha.2
[v0.5.0]: https://github.com/alphaville/optimization-engine/compare/v0.4.0...v0.5.0
[v0.4.0]: https://github.com/alphaville/optimization-engine/compare/v0.3.1...v0.4.0
[v0.3.1]: https://github.com/alphaville/optimization-engine/compare/v0.3.0...v0.3.1
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ homepage = "https://alphaville.github.io/optimization-engine/"
repository = "https://github.com/alphaville/optimization-engine"

# Version of this crate (SemVer)
version = "0.6.1-alpha.1"
version = "0.6.1-alpha.2"

edition = "2018"

Expand Down
24 changes: 15 additions & 9 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,25 @@ main() {
# TODO: Re-enable later

# Create virtual environment
# cd open-codegen
# export PYTHONPATH=.
# virtualenv -p python$PYTHON_VERSION venv
cd open-codegen
export PYTHONPATH=.
virtualenv -p python$PYTHON_VERSION venv

# activate venv
# source venv/bin/activate
# --- activate venv
source venv/bin/activate

# install opengen
# python setup.py install
# --- install opengen
python setup.py install

# --- uncomment to run main file
# run opengen main.py
# cd opengen
# export PYTHONPATH=.

# --- run the tests
cd opengen
export PYTHONPATH=.
python -W ignore test/test_constraints.py -v

# --- temporarily commented out:
# python -W ignore test/test.py -v
}

Expand Down
Loading

0 comments on commit 132356e

Please sign in to comment.