Skip to content

Named variables in Function expression #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 3, 2020
Merged

Named variables in Function expression #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31ae469
- Tests are passing locally.
Mar 2, 2020
c4b221e
Developers emails are back in travis config file.
Mar 2, 2020
900dff0
If a symbol already exists, do not add it again. Fixed typo.
Mar 2, 2020
29146c8
If sympy not found, allow failure. Added sympy on travis but not on …
Mar 2, 2020
65eef51
removed custom OrderedDict. Python2.6 is not needed to be supported.
Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .ci/travis_build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ $PYTHON2 -m pip install libNeuroML pyNeuroML python-libsbml --upgrade --user
$PYTHON3 -m pip install pip --upgrade --user
$PYTHON3 -m pip install libNeuroML pyNeuroML python-libsbml --upgrade --user

# sympy is only needed for pretty-priting for one test.
$PYTHON3 -m pip install sympy --upgrade --user

NPROC=$(nproc)
MAKE="make -j$NPROC"

Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ matrix:
osx_image: xcode11.3

notifications:
email:
recipients:
- [email protected]
- [email protected]
- [email protected]
on_success: change
on_failure: always
email:
recipients:
- [email protected]
- [email protected]
- [email protected]
on_success: change
on_failure: always

addons:
apt:
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ add_executable(moose.bin basecode/main.cpp)


################################### SETUP BUILD ################################

# default include paths.
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )

Expand Down
3 changes: 1 addition & 2 deletions basecode/FieldElement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ class FieldElement: public Element
*
* Returns 0 if either index is out of range.
*/
char* data( unsigned int rawIndex,
unsigned int fieldIndex = 0 ) const;
char* data( unsigned int rawIndex, unsigned int fieldIndex = 0 ) const;

/**
* virtual
Expand Down
Loading