Skip to content
Snippets Groups Projects
  • Dilawar Singh's avatar
    Squashed 'moose-core/' changes from 2657e3345..268a28862 · 7b3c355a
    Dilawar Singh authored
    268a28862 Merge pull request #224 from upibhalla/master
    3ab452e97 Fixed test_nsdf.py. It had relied on the old (and incorrect) function of the spike message to the Table. I have now updated the test_nsdf.py to work with the fixed version of the Table.
    616f33a60 Fixed spike timing functionality in Table class. Incorporated into rdesigneur so that tables can record spike times for saving, and users can plot spike times as a dot raster.
    7f372b6aa Merge pull request #223 from upibhalla/master
    186e91d68 Merge branch 'master' into master
    d91a681bf Fix on diffusion scaling in spines, and added Pool::volume field for plotting in rdesigneur.
    41c71b147 Merge pull request #221 from upibhalla/master
    e27ef8a45 Merge branch 'master' of https://github.com/BhallaLab/moose-core
    b07046e15 New Neuron::getSpineIdsFromCompartmentIds function, needed for rdesineur to connect adaptors for spine size and other spine properties.
    69d985877 Merge pull request #220 from bhanu151/master
    4f67f3338 retracting seqActivation normalization by dt to restore time-step invariance
    ca1f36ca6 Merge pull request #219 from hrani/master
    be6dc0a28 Hopefully last cleanup
    e03c69ddd Hopefully last cleanup
    7332ff66b spell correction
    d17d383dc absolute import with mtypes just for python3
    fb28e1009 Hopefully last one, tested for filepath,moose path and moose object
    b782b9552 In merge.py, clean way of cheking the type of path provided, filepath,moose obj, moose path are taken,if source is empty then nothing to copy, if destination was empty list is update with new object
    dc0c83027 clean up with in mergeChemModel file
    13152346b cleanup in setup file
    1f9100b7f cleanup in init file
    50cd8feee removed unwanted lines and clean up
    e9b88cee7 folder "merge" renamed to "chemMerge", moose.py: func added so that chemMerge can be imported directly,cleanup in test_import.py with the changes made to this commit,merge.py file Neutral object is copied into des path instead of creating and now user have to genesis/SBML format
    072913a9c Merge pull request #218 from BhallaLab/missing_merge
    fab362fa7 Couple of lines added to moose import test.
    064fbea56 Fixed moose.merge import. Added a test which tests moose module import (incomplete).
    4211da0e8 Merge pull request #216 from hrani/master
    a45e9f0a1 Merge branch 'master' of http://github.com/hrani/moose-core
    dacd64039 some more checks made for empty model, empty compartment and for display atleast one reaction should exist for displaying into widget
    e0566d476 Merge branch 'master' of https://github.com/BhallaLab/moose-core
    2db1b4dac Merge branch 'master' into master
    a62961a27 Merge pull request #217 from upibhalla/master
    15ee2cc7f Merge branch 'master' of https://github.com/BhallaLab/moose-core
    aca164612 Two important fixes for numerics of stochastic solver with diffusion. Affects models using sumtotals and functions.
    f5302b08f validator was switched off, which is not correct, so switching ON
    87e66a18d if in reaction stoichiometry is not defined then assume 1 and if no unit base unit defined then assume 1 which is mole
    38879fd5b Merge pull request #215 from hrani/master
    2384657e0 readSBML: explicitly ratio is set to 4, so that e2,e1 is balanced, If units are defined in the rate law for the reaction then checks are made and if not in milli mole the base unit then recalculate, spell correction. writeSBML: instead of printing error msg, saving into string for later use writekkit : instead of printing error msg, saving into string for later use
    798c0b6a7 Merge pull request #213 from hrani/master
    c1c26f698 Merge branch 'master' into master
    aa1cb43e2 Merge pull request #214 from bhanu151/master
    b60b73b3a SeqSynHnadler fixes - normalized seqActivation by dt
    3d36e7bd1 unwanted print statement is removed
    67e026ab8 function definition are read from SBML files, rules which are not read to moose a errorFlag is set out, rateLaw without unit definition, are taken from the substance units and recalculated for all higher reaction, validator checks if model is valid and send out errormsg if not valid, if model doesn't have atleast one compartment, then errormsg is send out
    91180c067 Merge pull request #210 from dilawar/master
    1f37c10f0 Python3/Python2 import thread has been fixed.
    012b5f3ca Preserve the order of plots. Use OrderedDict. Since OrderedDict is not available in python2.6; added implementation.
    78f244b0c Utility function to plot tables matching a regular expression.
    03dc5a8fc Fixed import error.
    2b9e30565 try/except import in moose.py file.
    574a12503 Added a test script.
    f5202b0cd Merge branch 'master' of github.com:BhallaLab/moose-core
    b792838ee Merge pull request #207 from hrani/master
    e39c76df2 resolved conflicts
    75e289296 all conflict a removed
    1e7ebbe3c unwanted statements
    98d625b62 Merge branch 'master' into master
    cdbe6add9 Fixed clock dt assignment bug in rdesigneur, came up when turnOffElec flag is true (#208)
    0da306f5a Fixed clock dt assignment bug in rdesigneur, came up when turnOffElec flag is true
    e9526f7c3 Fixes to import plot_util library.
    abd664d1e unwanted print statement removed
    fd794de74 in print stm space clean up,added findcompartment function to one common place, some space char are allowed in name field, in kkit writer, moose obj which doesn't have compartment are not written, which then appended to error msg for user
    5015b14cd Merge branch 'master' of github.com:BhallaLab/moose-core
    b32a0bbe9 Fixes to issue204 (#205)
    9f88d7c5f Merge pull request #203 from hrani/master
    6dbf8bef2 Merge branch 'master' of http://github.com/hrani/moose-core
    3c6d41ce4 Restoring contents after bad commit and bad merge
    1d34b9b2c Restored some old commit, after the bad commit and after revert fail
    f2d3e94ad Restored some old commit, after the bad commit and after revert fail
    daa657802 Restoring contents after bad commit and bad merge
    30b1c36b2 Merge pull request #202 from upibhalla/master
    24c079561 Restoring updates to ksolve including isBuffered flag
    d71f6eb53 Merge branch 'master' of https://github.com/BhallaLab/moose-core
    eb43e5524 Fixed Rdesigneur verbose flag
    5e42df95c Merge branch 'master' of github.com:BhallaLab/moose-core
    3c46150a1 Merge branch 'master' of github.com:dilawar/moose-core
    b04156b03 Fixes to issue #200. (#201)
    1e3bbe04f Merge branch 'master' of github.com:BhallaLab/moose-core
    f11ef0a3f Added test script but has not been enabled. This tests the SparseMsg::connectionLists.
    
    git-subtree-dir: moose-core
    git-subtree-split: 268a2886219290af163c9c95b755901fa68cfa5d
    7b3c355a