Skip to content
Snippets Groups Projects
  1. Apr 14, 2017
    • HarshaRani's avatar
      added deleted files · de4e03f5
      HarshaRani authored
      de4e03f5
    • HarshaRani's avatar
      temp deleted · 7cb7cc7a
      HarshaRani authored
      7cb7cc7a
    • HarshaRani's avatar
      Resolved merge conflict · 0015fd23
      HarshaRani authored
      0015fd23
    • HarshaRani's avatar
      temp deletion · 15733245
      HarshaRani authored
      15733245
    • HarshaRani's avatar
      Squashed 'moose-examples/' changes from 7318878..69062d9 · 6ed2f701
      HarshaRani authored
      69062d9 For crossComptSimpleReac a temp fix so that segfault doesn't occur, rest cleanup
      729f216 deleted unwanted files and added new files
      045aa11 Fixed assert by Upi
      2b16c59 Deleted temp files.
      3881f8a khali khali
      97599aa Fixed docstring on example.
      
      git-subtree-dir: moose-examples
      git-subtree-split: 69062d9340a032a32f316eed69f914e486c19171
      6ed2f701
    • HarshaRani's avatar
      deleted unwanted files and added new files · f890fa08
      HarshaRani authored
      f890fa08
    • HarshaRani's avatar
      Squashed 'moose-examples/' changes from 8038f56..7318878 · 0e491aa4
      HarshaRani authored
      7318878 cleanups
      9b83291 Merge branch 'master' of github.com:BhallaLab/moose-examples
      2f46ad0 Convert u'ABCD' to 'ABCD' to probably fix the python3 issue on travis. Works fine with python3 on ubuntu 16.04/Debian8.
      6232b3a Send email to malav if build fails.
      4a92db2 Merge branch 'master' of github.com:BhallaLab/moose-examples
      4800cd6 Adding python-libsbml to dependencies.
      c045972 Fixed second script as well.
      e927a88 Merge branch 'master' of github.com:BhallaLab/moose-examples
      626afb8 Added a hack to make this script work with both python3 and python2.
      24fdc9e Indentation for python3
      e9e5d92  Using force-yes with -y
      3c60a82 Upi fix the assert error
      ca2d409 Upi cleaned up the file
      a9ddced Merge branch 'master' of https://github.com/BhallaLab/moose-examples
      b4715d0 First commit.
      2c4fa33 This is removed b'cos Rdesignuer does the job
      4ca1f6d missing closing braces
      d120484 small correction for input eval with is str
      18990fd enter key replaced to zero, as function \'input\' with \'enter\' key give SyntaxError: unexpected EOF while parsing
      0db144c Ready for put into demo #15.
      39aa6e4 Closed docstring.
      f2dc6be Merge commit '07ef36e1'
      
      git-subtree-dir: moose-examples
      git-subtree-split: 731887849ac227fa304780406ff913c69af425ca
      0e491aa4
    • HarshaRani's avatar
      Merge commit 'ccf3e614' · 593b3f73
      HarshaRani authored
      593b3f73
    • HarshaRani's avatar
      Squashed 'moose-core/' changes from c15c1b1..669b981 · ccf3e614
      HarshaRani authored
      669b981 VERSION conflict file is added
      29362b6 Merge commit '628138cb'
      
      git-subtree-dir: moose-core
      git-subtree-split: 669b981fd06bf9b0919dca08cf87505c2f411802
      ccf3e614
    • HarshaRani's avatar
      Merge commit 'e565756c' · 50279060
      HarshaRani authored
      50279060
    • HarshaRani's avatar
      Squashed 'moose-gui/' changes from 2a1f94f..6104940 · e565756c
      HarshaRani authored
      6104940 units added to k1,k2,k3
      a3a80bf Using force-yes with -y to avoid problem with gpg keys. Probably breaking due to policy change in apt install.
      c994d93 one more attempt -y is removed
      b869143 one more attempt expired key
      a172670 checking with travis expired key
      8ee7c22 checking with travis expired key
      a208321 travis has a problem installing moose with -y opition trying this
      ff92eb5 print stm with python3 and changes made WRT to pool and bufpool with isBuffered flag
      744f262 isbuffered is editable and if value is set/unset
      a46cec9 cleanup in demo, filemenu links
      
      git-subtree-dir: moose-gui
      git-subtree-split: 61049405f17b22f27c74e7834dc1b2cfbab61699
      e565756c
    • HarshaRani's avatar
      VERSION conflict file is added · c50a82a9
      HarshaRani authored
      c50a82a9
    • HarshaRani's avatar
      Squashed 'moose-core/' changes from 434c478..c15c1b1 · 24dea426
      HarshaRani authored
      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 (compartment and color) is added
      b76929f Find gsl header as well.
      4df3c47 If user set the GSL_ROOT_DIR then do not search in system dir.
      1ef020e Always use private muparser.
      abfa2c8 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      ff7bf04 Moved isBuffered field from Pool to PoolBase.
      c470f10 group information is populated as per SBML rules under listofGroups instead of annotation
      70c1e8b clean up in documention
      98c5a76 Hopefully description given for merging the files will be clear to user
      
      git-subtree-dir: moose-core
      git-subtree-split: c15c1b1b41e429e96ea769c85c105e6167c68ffa
      24dea426
  2. Apr 06, 2017
  3. Mar 16, 2017
  4. Feb 20, 2017
  5. Feb 15, 2017
    • Dilawar Singh's avatar
      Merge commit '628138cb' · 55a2f09e
      Dilawar Singh authored
      55a2f09e
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from f3d0477..434c478 · 628138cb
      Dilawar Singh authored
      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
      628138cb
    • Dilawar Singh's avatar
      Merge commit 'edb505a7' · acafba2c
      Dilawar Singh authored
      acafba2c
    • Dilawar Singh's avatar
      Squashed 'moose-gui/' changes from 2ba6bd5..2a1f94f · edb505a7
      Dilawar Singh authored
      2a1f94f modelRoot is cleanup for plotting if its comes from genesis or sbml, cleanup in networkx clean while import graphvizlayout
      9d55f14 Function can be now on pool class also, and networkx need not to be checked for version for using graphviz_layout, import from network.drawing took care off.
      35fb3ac If python-libsbml libs in not found, gui was failing to report which is fix here
      34df1fb found a way to use networkX graphviz_layout directly using a importing lib, now no need to check networkx version
      7b160c2 corrected indentation
      e3e5d2e Merge commit 'f0fd0e53'
      a89f6b3 BhallaLab/moose#204.
      
      git-subtree-dir: moose-gui
      git-subtree-split: 2a1f94f4be0d4643956232d2eed290b649f12a71
      edb505a7
    • Dilawar Singh's avatar
      Deleted temp files. · fe2d8940
      Dilawar Singh authored
      fe2d8940
  6. Feb 09, 2017
  7. Feb 02, 2017
    • Dilawar Singh's avatar
      Merge commit '7c713058' · 2936ba85
      Dilawar Singh authored
      2936ba85
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 14e2d78..f3d0477 · 7c713058
      Dilawar Singh authored
      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
      7c713058
    • Dilawar Singh's avatar
      Merge pull request #206 from asiaszmek/difshell-tests · f2b5cfdc
      Dilawar Singh authored
      Script testing DifShells
      f2b5cfdc
  8. Jan 26, 2017
    • Asia Jedrzejewska-Szmek's avatar
      Script testing DifShells · 3618469d
      Asia Jedrzejewska-Szmek authored
      Script creates a test model of a dendrite segment with one Ca
      channel. DifShells are created. DifBuffers are created. DifShells are
      connected to provide diffusion. DifBuffers are connected to provide
      diffusion. DifBuffers are connected with DifShells to provide
      buffer. MMPumps are created and connected to the outer DifShell. Ca
      channel is connected to the outer Difshell to provide Ca influx and
      outer DifShell is connected to Ca channel to provide ion
      concentration. Segment's Vm, channel's Gk and Ik, DifShell's C and
      DifBuffer's bBound are connected with output to save simulation
      results.
      3618469d
  9. Jan 23, 2017
    • Dilawar Singh's avatar
      Merge commit 'a5122cfb' · ac0b8002
      Dilawar Singh authored
      ac0b8002
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 1b5b9a9..14e2d78 · a5122cfb
      Dilawar Singh authored
      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
      a5122cfb
    • Dilawar Singh's avatar
      Fixed docstring on example. · 2edfcf15
      Dilawar Singh authored
      2edfcf15
    • Dilawar Singh's avatar
      Merge commit 'f0fd0e53' · f95d827b
      Dilawar Singh authored
      f95d827b
    • Dilawar Singh's avatar
      Squashed 'moose-gui/' changes from e49ca7d..2ba6bd5 · f0fd0e53
      Dilawar Singh authored
      2ba6bd5 cleanup
      d0f5918 replace writeKkit to moosewriteKkit
      cb067ac correct from writeKkit to mooseWriteKkit
      6b1bff4 Ubuntu16.04 with networkx and pygraphviz has some bug, for now small fix, automatic layout will be done spring_layout format
      dbe6875 Update .travis.yml
      8a71426 Update README.md
      fcbacd5 Added travis file to moose-gui.
      ddcfbdc Removed shebangs from python scripts.
      d5cf170 Fixed the address of Free Software Foundation Inc.
      b88d5cc Merge commit 'aca40347'
      e0cea9f Squashed 'moose-gui/' changes from 1ef13c9-1ef13c9
      
      git-subtree-dir: moose-gui
      git-subtree-split: 2ba6bd5d8e6b022edf3f3aa1a567462ab7ddf6ed
      f0fd0e53
    • Dilawar Singh's avatar
      Merge commit '07ef36e1' · 3324aa5a
      Dilawar Singh authored
      3324aa5a
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from ed3253d..8038f56 · 07ef36e1
      Dilawar Singh authored
      8038f56 documentation is moved under main function
      6ebca4d Corrected kkitwrite function
      1726122 Merge branch 'master' of https://github.com/BhallaLab/moose-examples
      fbcaef7 added line to show how to set solver to sbml files
      07a11d3 Merge pull request #11 from dilawar/master
      536b53e Construct absolute path relative to script directory.
      f5a7d84 All files must be python2 and python3 compatible [skip ci]
      6895e56 All compiles with python2 and python3.
      d9cb5b7 This version compiles with python2.
      d80ec97 print_statement is the first statement of file.
      74c70bc Custom fixes to print end='' statement on python2. Whenever possible import from __future__.
      8977107 python-qt4 instead of python-pyqt4 is valid name package.
      5e47fd8 Install and do not use moogli.
      7b8c680 Fixed all files breaking with python3 compielall module.
      e00a845 Fixed two more files.
      3f789a1 Fixed one more script.
      54f9549 Fixed syntax of this file as well.
      63b9c43 Fix some more syntax issues.
      5446b0e All scripts are now python3 compatible.
      e5e259f This script is broken.
      3e420f0 Merge remote-tracking branch 'bhallalab/master'
      92ba920 Merge branch 'master' of github.com:dilawar/moose-examples
      8a47205 Fixed print( , end='' ) with python2
      f756065 Fixed print_function in couple of scripts.
      3c6fbe0 Converted files to be campatible with python3 with tool 2to3.
      da8c0dc Ran 2to3 on all examples. See which scripts are failing on travis.
      469e3f3 These scripts were not chmod to executable. Removed hashbang from header.
      3429792 Merge branch 'master' of github.com:BhallaLab/moose-examples
      d34c8df Merge branch 'master' of github.com:BhallaLab/moose-examples
      d56f575 Changelog:     - No python3 incompatible file should be added to repo.     - moose contains moogli now. No need to install it separately.
      31137eb Fixed, python2 incompatible print function use.
      a5375cc Merge commit '00a12e20'
      15de0ce Since none of the following files was executable, removed shebangs.
      4a20952 To run this file libsbml needs to be installed and not compile with moose as its at python level
      092eec8 Doxygen_1.8.9 is added which should be used to generate doxygen files,Rdesigneur folder is creater under "user" folder and corrected index.rst file is updated, deleted "html" folder,Rdesigneur markdown file with correct date,"snippet " and "tutorial"folder is created with relevant files to generate html files
      bee94a1 Merge commit '3c9138df'
      4590e9e Merge branch 'master' of https://github.com/BhallaLab/moose-examples
      62e3218 Moved docs to moose. Removed temp directory.
      dc5a230 Merge branch 'master' of https://github.com/BhallaLab/moose-examples
      c8f96c5 Once simulation is done, store the results in png file.
      5c36c87 Used 2to3 tool to make these scripts python3 compatibles. Also saving results to a png file after run is over.
      
      git-subtree-dir: moose-examples
      git-subtree-split: 8038f56ec24965353de70fb460ceccff3861f7b1
      07ef36e1
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 7c9fe23..1b5b9a9 · 5bceacfe
      Dilawar Singh authored
      1b5b9a9 cspace and genesis model can be merged, yet to check what will happen with co-ordinates
      9a405f6 for merging model one can pass file path or the modelpath
      51da21a auto-coodinates are not done here, writter(SBML or kkit) will take care
      4ba03b7 spell mistake
      355e3e6 missing msg definition
      3969bcb removed SBML option in Makefile
      d1c4119 Merging 2 genesis model
      1469b6e clean up in writting plot when file was read from SBML
      4894a96 changes made to co-ordinate calculation depending where it comes from (GUI/direct), and type of file (GENESIS,SBML,cspace)
      c11fcf0 validation.py is added: common place to validate SBML model before reading and writing, various changes made wrt chemUtil
      6e7fa32 changes made to add chemUtil as a package and moose.py spell mistake
      4551455 removing pyc files
      e6f8c8f chemical based utils like add_delete_ChemicalSolver, chemiConnectionUtil: where chemical objects and connection are searched, graphUtils: used just pygraphviz to layout the model when x and y position are missing e.g for cspace and SBML models
      
      git-subtree-dir: moose-core
      git-subtree-split: 1b5b9a9104c0b7f461b569f62abf5f78fd531230
      5bceacfe
    • Dilawar Singh's avatar
      Merge commit '5bceacfe' · d92afeeb
      Dilawar Singh authored
      d92afeeb