Skip to content

Commit 9489bbd

Browse files
authored
Named variables in Function expression (#390)
* - Tests are passing locally. - MooseParser is a pointer in Function. Simplifies header include. - Added wrapper.py which generates a derived class moose.A for each _moose.A. `moose.A` provides `connect` function. Instead of, moose.connect(a, 'f1', b, 'f2') One can do, a.connect('f1', b, 'f2') * Developers emails are back in travis config file. * If a symbol already exists, do not add it again. Fixed typo. * If sympy not found, allow failure. Added sympy on travis but not on OSX. Don't install sympy with python2. * removed custom OrderedDict. Python2.6 is not needed to be supported. Centos6 is EOL.
1 parent ec9e209 commit 9489bbd

38 files changed

+2332
-3040
lines changed

.ci/travis_build_linux.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ $PYTHON2 -m pip install libNeuroML pyNeuroML python-libsbml --upgrade --user
2121
$PYTHON3 -m pip install pip --upgrade --user
2222
$PYTHON3 -m pip install libNeuroML pyNeuroML python-libsbml --upgrade --user
2323

24+
# sympy is only needed for pretty-priting for one test.
25+
$PYTHON3 -m pip install sympy --upgrade --user
26+
2427
NPROC=$(nproc)
2528
MAKE="make -j$NPROC"
2629

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ matrix:
1111
osx_image: xcode11.3
1212

1313
notifications:
14-
email:
15-
recipients:
16-
- bhalla@ncbs.res.in
17-
- dilawar.s.rajput@gmail.com
18-
- hrani@ncbs.res.in
19-
on_success: change
20-
on_failure: always
14+
email:
15+
recipients:
16+
- bhalla@ncbs.res.in
17+
- dilawar.s.rajput@gmail.com
18+
- hrani@ncbs.res.in
19+
on_success: change
20+
on_failure: always
2121

2222
addons:
2323
apt:

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ add_executable(moose.bin basecode/main.cpp)
110110

111111

112112
################################### SETUP BUILD ################################
113-
114113
# default include paths.
115114
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
116115

basecode/FieldElement.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class FieldElement: public Element
9090
*
9191
* Returns 0 if either index is out of range.
9292
*/
93-
char* data( unsigned int rawIndex,
94-
unsigned int fieldIndex = 0 ) const;
93+
char* data( unsigned int rawIndex, unsigned int fieldIndex = 0 ) const;
9594

9695
/**
9796
* virtual

0 commit comments

Comments
 (0)