Permalink
Browse files

Merge branch 'irk_hessians' into GNSF2.0

  • Loading branch information...
FreyJo committed Aug 23, 2018
2 parents a270bba + a026824 commit 22e0085fea178e7da7dabe8b740f84affc865864
Showing with 21 additions and 25 deletions.
  1. +0 −15 .appveyor.yml
  2. +6 −2 .codecov.yml
  3. +3 −3 .travis.yml
  4. +1 −1 external/blasfeo
  5. +1 −1 external/hpipm
  6. +10 −3 test/sim/sim_test_hessian.cpp
View
@@ -19,18 +19,3 @@ build_script:
- cmake -E make_directory appveyor-artifacts
- cmake -E chdir build cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\appveyor-artifacts ..
- cmake --build build --target install
- 7z a acados-windows.zip %APPVEYOR_BUILD_FOLDER%\appveyor-artifacts
artifacts:
- path: acados-windows.zip
name: Acados Windows
deploy:
- provider: GitHub
artifact: Acados Windows
draft: false
prerelease: fasle
auth_token:
secure: lmT6hGzdCqtbutvVHrWLpK+iUOwD6YhYmqx1Vkmm7ttqucLZy6EzDRTMT7YKL3KC
on:
branch: master
View
@@ -8,8 +8,12 @@ coverage:
range: "70...100"
status:
project: yes
patch: yes
project:
default:
target: 0%
patch:
default:
target: 0%
changes: no
parsers:
View
@@ -81,20 +81,20 @@ install:
script:
- cmake -E make_directory build
- export RELEASES_PREFIX="$(pwd)"
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/local -DMatlab_ROOT_DIR=$MATLAB_ROOT -DSWIG_MATLAB=$SWIG_MATLAB -DSWIG_PYTHON=ON ..
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/local -DMatlab_ROOT_DIR=$MATLAB_ROOT -DSWIG_MATLAB=$SWIG_MATLAB -DSWIG_PYTHON=ON -DBUILD_SHARED_LIBS=ON ..
- cmake --build build --target install
- tar -zcf acados.tar.gz ${HOME}/local/lib
- cmake --build build --target lint
- cmake --build build
- cmake -E chdir build ctest --output-on-failure
- rm -r -f build
- cmake -E make_directory build
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=ON -DSWIG_MATLAB=$SWIG_MATLAB -DMatlab_ROOT_DIR=$MATLAB_ROOT -DSWIG_PYTHON=$SWIG_PYTHON -DCOVERAGE=$COVERAGE -DCMAKE_INSTALL_PREFIX=$HOME/local ..
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=ON -DSWIG_MATLAB=$SWIG_MATLAB -DMatlab_ROOT_DIR=$MATLAB_ROOT -DSWIG_PYTHON=$SWIG_PYTHON -DBUILD_SHARED_LIBS=ON -DCOVERAGE=$COVERAGE -DCMAKE_INSTALL_PREFIX=$HOME/local ..
- export CXX="$CXX -std=c++11" # needed for octave
- cmake --build build
- cmake -E chdir build ctest --output-on-failure
- cmake --build build --target install
- python -c "import acados" # check installation
# - python -c "import acados" # check installation
- cmake --build build --target acados_coverage || echo "Coverage report not generated"
deploy:
Submodule blasfeo updated 232 files
Submodule hpipm updated 210 files
@@ -378,11 +378,11 @@ TEST_CASE("pendulum_hessians", "[integrators]")
for (int sens_forw = 1; sens_forw < 2; sens_forw++)
for (int sens_forw = 0; sens_forw < 2; sens_forw++)
{
SECTION("sens_forw = " + std::to_string((bool)sens_forw))
{
for (int sens_adj = 1; sens_adj < 2; sens_adj++)
for (int sens_adj = 0; sens_adj < 2; sens_adj++)
{
SECTION("sens_adj = " + std::to_string((bool)sens_adj))
{
@@ -437,9 +437,16 @@ TEST_CASE("pendulum_hessians", "[integrators]")
std::cout << "\n --->> NOT SUPPORTED -- corresponding test skipped \n";
break;
}
if ( sens_forw + sens_adj < 2 )
{
std::cout << "\n ERK hessians only tested with ";
std::cout << "sens_forw and sens_adj == true \n other settings are buggy";
std::cout << "\n --->> corresponding test skipped \n";
break;
}
else
{
opts->num_steps *= 2;
opts->num_steps *= 2; // use more steps as explict RK has lower order
}
}

0 comments on commit 22e0085

Please sign in to comment.