Skip to content

Commit

Permalink
Feature 377 (#388)
Browse files Browse the repository at this point in the history
* feature(ExpData) make ts mandatory, remove nt variable, change setter function to vector

* feature(ExpData) add more finegrained getter and setter routines for my, sigmay, mz, sigmaz

* feature(ExpData) rename my,mz,sigmay,sigmaz

* fix(core) fix downstream code after edata changes, streamline model::fdsigmaydp and model::fdsigmazdp

* fix(core) fix bad merge

* feature(core) better code style

* fix(core) add missing constructor to fix missing symbol in swig interface

* fix(doc) update documentation

* feature(test) add ExpData dimension checking routines and add unittests

* fix(CI) fix python coverage report by running in build venv

* fix(CI) ignore amici_without_hdf5.py in python report, remove -c flag from codecov uploads to not remove previous reports

* test(CI) whats wrong with the python upload?

* fix(CI) remove file display

* fix(doc) fix documentation
  • Loading branch information
FFroehlich authored Aug 3, 2018
1 parent 2f5f1b2 commit 5e17a2d
Show file tree
Hide file tree
Showing 15 changed files with 840 additions and 940 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ matrix:
env: ENABLE_GCOV_COVERAGE=TRUE
after_success:
- ./scripts/run-codecov.sh
- bash <(curl -s https://codecov.io/bash) -f coverage_py.xml -X fix -cF python
- bash <(curl -s https://codecov.io/bash) -f coverage.info -X fix -cF cpp
- bash <(curl -s https://codecov.io/bash) -f coverage.info -X fix -F cpp
- bash <(curl -s https://codecov.io/bash) -f coverage_py.xml -X fix -F python

- os: osx
osx_image: xcode9.3
compiler: clang
Expand Down Expand Up @@ -59,7 +60,7 @@ install:
- pyenv versions
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv shell 2.7 3.6; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/Users/travis/Library/Python/3.7/bin:/Library/TeX/texbin:$PATH; fi
- pip3 install --user --upgrade pip setuptools wheel pkgconfig doxypypy coverage scipy
- pip3 install --user --upgrade pip setuptools wheel pkgconfig doxypypy scipy
- ./scripts/buildSuiteSparse.sh
- ./scripts/buildSundials.sh
- ./scripts/buildCpputest.sh
Expand Down
Binary file modified AMICI_guide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(ENABLE_SWIG OFF)
set(ENABLE_SWIG ON)

# Compiler flags
include(CheckCXXCompilerFlag)
Expand Down
Loading

0 comments on commit 5e17a2d

Please sign in to comment.