669b981 VERSION conflict file is added
29362b6 Merge commit '628138cb'

git-subtree-dir: moose-core
git-subtree-split: 669b981fd06bf9b0919dca08cf87505c2f411802

c15c1b1 Changes to testSynapse so it can compile in DEBUG mode. Issue #175.
e4caa2f Merge branch 'master' of github.com:BhallaLab/moose-core
f99cd77 Removed VERSION file .. again.
7646e6b Python3/python2 compatible import statements.
b77448d Removed VERSION file from source.
97e1a25 Fixed broken test in synapse/testSynapse.cpp file
eb4eeb2 Install python3-numpy using pip on travis. Another failure is with synapse tests setResponseScale and setWeightScale ; these functions are not available.
1998b5f Fixes to python3 import .
22849ab Find python3 on travis.
f5870c9 missing parentheses for print stm
17462d1 Merge branch 'master' of https://github.com/BhallaLab/moose-core
9471341 Group's with annotation is written and read from SBML model
5ab33ad Put SparseMatrix access functions into SparseMsg
46d80cc All default units are added, as some of the simulator requires all the units to be specfied, km unit is defined, group and annotation to the group (compartme...

434c478 qMerge branch 'master' of https://github.com/BhallaLab/moose-core
425d8c8 writeKKit: checked if matplotlib is install before importing, moose.py:removed all unwanted check's on genesis_support and sbml_support
0791eb5 Fixes to SeqSynHandler
51a3a30 Moved Pool::increment, decrement and nIn to PoolBase for uniformity with Solvers. Dummy functions except in Pool and BufPool
1c9a9df group info is added to plot
03dbc2c While connecting table for plotting, a check is made to see if its pool
fdc4924 Cleaner way to replace the string
4f92820 libsbml spell corrected
22a276d unwanted print statement cleanup
2c48b1c reading group information from the SBML if exist into moose
e68a509 spell correction
8deaed8 switched from new to old to old to new while providing the files for mergering
ef9edd1 clenup while loading model and solvers are deleted
c2383e2 python3 compatibility with print statement
4ac79b1 Function cleanup while mergering and path cleanup
6fd5ed6 chemUtil and merge folders also needed to copied while using "make install" while using cmake
caaafc9 Fixed test script for python3. Removed VERSION file. Pull request BhallaLab/moose#206 .
a9a8344 Merge commit '7c713058'
6d907ee Script testing DifShells
0dd5cd6 Merge commit 'a5122cfb'
4fc5760 Fixed docstring on example.

git-subtree-dir: moose-core
git-subtree-split: 434c47885637c72d820f92914660a679b34c0301

f3d0477 Merge branch 'master' of https://github.com/BhallaLab/moose-core
176a5f0 solver's short form should also be taken
8624e24 Merge branch 'master' of https://github.com/BhallaLab/moose-core
6c964b1 Added isBuffered field to Pool to let users convert the object class to BufPool, and vice versa.
97db69e moose::Neuron uses global RNG object. Global RNG object behaviour is following. - moose.seed(0) or moose.seed( ) assign a random value to seed. Use   random_device if avaible else time(NULL) is used. - moose.seed( x) set moose.seed to x.
c1dec94 Fixed long argument for mtseed in moosemodule.cpp
54c94f7 Modified travis scripts and reenabled developers to the list.
31dd779 Fixed import error with python3. No module should be imported in python/moose/__init__.py . Added a note for developers. This should fix the travis.

git-subtree-dir: moose-core
git-subtree-split: f3d0477a3ea5045db044aaae94b46a133527dbc7

14e2d78 Fixes broken Makefile. Object MMPump.o not found error is resolved by commenting out the object. Either source is missing for it was introduced by recent PR.
aeddce7 Fixes to python3 test command in travis script. Previous fixes passed with python2.
00ad9e2 Fixes to recent Travis build failure.  (#170)
3ebc0a5 Merge commit '5bceacfe'
df5ff48 Merge branch 'difshell' of https://github.com/asiaszmek/moose into asiaszmek-difshell
e4a4bcd Change order of operations to slightly improve accuracy
aacebcc Small changes to make the code more alike genesis and other moose objects
4246932 Difshells and difbuffers initialize close to equilibrium
40a200f Add forgotten setting of helper variables to zero after calculations
dad35e6 Add state in t(i-1)
45c2286 Fix wrong definitions
567444a Fix errors in volume calculation
4e0a857 Indentation
cb40719 Add MMPump to scheduling and makefiles
bfc456c Add MMPump to DifShell
be1ceac Implementation of MMPump
c721713 Add ticks for DifBufferBase and DifShellBase
a3bee38 Fix bugs: DifShell now compiles and seems to give correct results
b131c44 Fix a typo in zombify
f1cbfb0 Rewrite DifShell. Inherit from DifShellBase
1486cdd Write base class for DifShell
336cbd1 Indentation
d8ee906 Implement exponential Euler for DifShell
f72d6a1 Move source messages to class. Correctly initialize Faraday's constant
b309dc4 Move source messages to class
5d3b7d2 Make DifBuffer look more like other moose classes and fix ticks
9a1e166 Add DifBuffer to clocks
f949b27 Add DifBuffer to compilation
5418e0b Fix no ticks when initializing difshells warning
5fba26e Remove useless variable
7e29b64 Reintroduce an old version of DifBuffer from moose
8f544e6 Moved to cmake folder.
ae1a5ba Merge commit '0d12ebb0'
3ac6c58 master branch.
65c371c Fixes to BhallaLab/moose#204.

git-subtree-dir: moose-core
git-subtree-split: 14e2d78a7b6e41e67bdce6e3a07fa0d65565744b

7c9fe23 Fixes to issue #167. (#168)
3f077c1 Resolved merge conflict with Table.h
9b175c8 Major bugfix for Table and derived class Streamer, to fix error introduced by duplicating the 'name' field which is already defined for Neutral. Minor bugfix for melement.cpp
f0d4c02 Update INSTALL.md
2737220 Fixes to issue165 (#166)
a934676 Update .travis.yml
601d06a Fixes to PYTHON3 build failure on travis.
9d9d925 Tested locally for linux. The scripts seems to be fine on openSUSE-42.2
93bbd4f By default travis pick up /opt/bin/python when `which python` is used. Do not use this construct in script. Moved travis related scripts to a hidden folder .travis.
c0d3871 If python3 exists (installed on travis), then check for the compatibility otherwise don't.
65a85da Almost there. Calling script from top of directory.
0db2016 Make trusty default build environment. python3-matplotlib is not available by default.
d8c1c6a setuid to root for linux script.
4c90f04 Some more f...

3f8c345 Make sure all python scripts are python3 compatible. BhallaLab/moose#202.
937fdf4 Allow failure with clang compiler. python-libsbml module doest not get build with clang.
b7f1834 Merge commit '1680bac6'
d28a94d Changes to cmake file so that we can find the correct static library.
67c0d52 Fix a development warning in cmake.
9bb0aa9 Removing shebangs from the python scripts. These scripts were never called as standalone executables.
3b2296b A test commit to package hdf5-devel BhallaLab/moose#201.
06adf59 Fixed another typo in FindGSL. Library list was converted to string.
3893081 Fixed a typo in FindGSL file.
b635a2c FindGSL also looks for GSL_VERSION now.
6bcc61d Fixes to travis failure.
88d49cb Updated CMake and FindGSL.
0fb10a5 Fixes to extension bug.
a9b9f2a Some fixes to static library dependencies [skip ci]
6614991 Cleanup in cmake files. Using bash scripts to generate subprojects. This way I can handle environment variables cleanly.
7fc33ef New hdf5 version generates static library with different name. Fix it.
1b55fa5 This should pass on travis.
700bb53 Merge commit 'd0a6060b'
cd0ae83 Merge commit 'b5a7c2e2'
358b59f Merge commit '273124ec'
02fa6cf Merge commit '8bfef2e6'
e7138d9 Merge commit '6c8f2012'
0462858 Merge commit '96580978'
fdadcf4 A test case test_sbml_support.py which inturn calls to write moosewriteSBML which needs networkx which is added as a dependency for travis
c90cae4 Oops moment. Fixed the typo in compiler flag for apple-clang
1878ce8 updated apple-clang flags in compiler. Fix to missing symbols from stl.
f50cfe2 Merge commit '2af833a0'
72de2fa Moved docs to moose. Removed temp directory.

git-subtree-dir: moose-core
git-subtree-split: 3f8c345800c8227e975ae3cf9c714dc6c2c014ee

6a6bcc1 Python module can also use VERSION file generated by CMAKE. Copy to build directory for not-in-source builds. BhallaLab/moose#200.
7805364 Failsafe mechanism in VERSION reading script.

git-subtree-dir: moose-core
git-subtree-split: 6a6bcc15556a58e08c24203599c3c84837eb65bd

9eeca0c Fixed a typo in setup.py file. Due to which installation was failing without any warning.

git-subtree-dir: moose-core
git-subtree-split: 9eeca0ca8135fbf3c8fe7dd65ce408681b1e4605

14cf2df Fixed the setup.py file. Use absolute path for script to determine absolute path of VERSION file.

git-subtree-dir: moose-core
git-subtree-split: 14cf2df3a65456c6b4ce67b2d34110fd3400c982

343cb02 Fixes to  VERSION issue BhallaLab/moose#200.
835bf9a Added a version file.

git-subtree-dir: moose-core
git-subtree-split: 343cb02705b0874ad0035eea648019420475f7ed