Skip to content
Snippets Groups Projects
  1. Nov 14, 2016
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 9eeca0c..6a6bcc1 · d0a6060b
      Dilawar Singh authored
      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
      d0a6060b
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 14cf2df..9eeca0c · b5a7c2e2
      Dilawar Singh authored
      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
      b5a7c2e2
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 343cb02..14cf2df · 273124ec
      Dilawar Singh authored
      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
      273124ec
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from ed5f015..343cb02 · 8bfef2e6
      Dilawar Singh authored
      343cb02 Fixes to  VERSION issue BhallaLab/moose#200.
      835bf9a Added a version file.
      
      git-subtree-dir: moose-core
      git-subtree-split: 343cb02705b0874ad0035eea648019420475f7ed
      8bfef2e6
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from c2c32b9..ed5f015 · 6c8f2012
      Dilawar Singh authored
      ed5f015 Update README.md
      a4a5cc1 Fixed linking error compiling with new gcc.
      9a82850 Merge commit '912c550e28d1fccfd310c5968a07ae38dc60c698'
      0fb7431 Added option to explicitly set CMAKE_DL_LIBS flag (-ldl).
      da5fd97 Merge commit '9296cecdffbe647a929af4792360adbc3768e4bd'
      093e681 Disabled unused part of code #86.
      c698620 Merge commit '11af2e3b2ecd7b31aefa957412abb5b64ce54014'
      57714ae Fixes to VERSION bug. See #BhallaLab/moose#200
      59512e1 Merge commit '1d69d002939cc4b270ff4fc51e8a4800a6fbdad1'
      3adb8b3 removed a print statement
      9aa9405 Use git to generate version when not passed via command line. BhallaLab/moose#200 .
      2f8a48e Merge commit '18331bb5a2f6aa2918a4e49b178297a79e3c791b'
      c9714fd Merge branch 'master' of github.com:BhallaLab/moose-python-package
      df2186a Merge commit 'ec45fa526f0e2de2b49bf05f3f7f8ddb1c7ff463'
      
      git-subtree-dir: moose-core
      git-subtree-split: ed5f0151b5c12301b826e47e5a1daaaa7044a714
      6c8f2012
  2. Nov 07, 2016
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from a15a538..c2c32b9 · 96580978
      Dilawar Singh authored
      c2c32b9 Before tagging runing with clang.
      1cc19f1 updated runtime to annotation field in moose
      3ad9558 runTime and solver type is read from xml file to moose, cleaning in names
      5de1f05 function output to pool object set's "setN" as input is "nOut"
      ae24a3d Merge branch 'master' of https://github.com/BhallaLab/moose-core
      7b43f70 Fixed Function unzombification for increment messages. Added update for time in Zombie Functions.
      f4310e6 for now function output connected to pool via setConc message, but there is "increment" which depend on the function input this will be fixed later
      f286dca removed writekkit.py duplicate file
      6d299eb replace all the obj under /kinetics or /kinetics/group which is required by genesis format
      a6dad52 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      0ddbd21 Gsolve updates to monitor number of reac events. Stoich updates to avoid crashes when handling edge cases without objects in model.
      2ab410d function can be connected to pool,bufpool and reaction
      086ef95 using networkX spring_layout rather than grapviz dot layout
      0000d51 Ids begining with numbers needed to processed with dash for sbml compartability,No substrate, no product enzymes are not written down, function are now placed under compartment and for backwarcs compartability with genesis they are placed under BufPool
      f0f1444 Merge branch 'master' of github.com:BhallaLab/moose-core
      e0c6c1a Allow failure with clang. I could not reproduce the error on my local machine.
      9e4db61 First skeleton changes to the Gsolver to track the number of reaction firings for each reaction. Also some fixes to the SeqSynHandler.
      cff32e4 Fixes to include path of muparsers. This is passing on openSUSE.
      2117969 Added missing SeqSynHandler source file to CMake.
      58ddb2b Added SeqSynHandler class to deal with single-neuron sequence recognition models
      1e42ece Merge branch 'master' of https://github.com/BhallaLab/moose-core
      659a908 Fixes for Ksolve accuracy, and some ReadKkit edge cases
      7c3e72e small correction
      0d7f908 clean up for Annotation, plots, reactions, enz
      a2f6a95 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      fb70792 empty reaction are not written,units corrections, plot paths are written from compartment level unlike before from model level
      a1593e9 Disabled pip install python-sbml with clang.
      13acd0f Disabled SBML test for time being till issue #145 and #152 are resolved.
      f3b42fd Merge branch 'master' of https://github.com/BhallaLab/moose-core
      b16311e Fixed unicode conversion for docstrings Put in sorting of fields in showfields.
      793ae62 Added pygraphviz to pip3 install list. pygraphviz is a dependency for SBML.
      396e607 Both python2-networkx and python3-networkx can't be installed simultaneously. Fixes that on travis.
      ac02cea Added python-networkx to python3 dependency. Test run on travis.
      dd4fc4e Removed option WITH_SBML deprecated warning [skip ci]
      c6c60e6 Removed c++ sbml support code. Test run on travis.
      c73e4cd Removed C++ sbml code.
      68ea7c2 Changed SBML script to make them compatible with python3.
      8614680 Fixed Leakage class
      8b15511 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      24a01e8 Added ICa for NMDA channel to known plot variables for rdesigneur
      52ae361 Fix to issue #147.
      c251c0d reaction rateLaw and enz's km is corrected
      a03cb6a initial concentration is set if hasOnlySubstanceUnit=false with correct units
      7018230 Fixes for SynChan modulation, added a couple of synaptic channel prototypes
      66bfcff Upi fixed the scaling factor
      b6532e8 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      b7a3ad4 MMEnz is created
      37c5312 Deprecating sbml related code on travis. Don't download SBML debian package and install.
      791762a plots populated to moose if defined in the sBML file
      b05a983 Adding python-networkx as dependency in travis.     python-networkx seems to be required to run SBML related code (needs confirmation?)     python-networkx is a dependency for moose-gui.
      76c5381 print statement needed paranthese
      d52bd19 fixed a work around for small bug in the draw_grapviz function in networkx-1.11 which no longer import toplevel namespace, readSBML:cleanup
      2fd15b6 updated to read SBML file into moose
      422bbc0 One of the testcase where model loaded in moose are written to SBML file
      dbc5412 Removing sbml build from cmake. SBML test is failing.
      8876581 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      66f55c2 A check made to see if python-libsbml modules is installed if yes then reading and writing to SBML is done, else a warning message to install module is done
      073ef60 Merge pull request #144 from dilawar/master
      94b686a Fix to BhallaLab/moose-core#143.
      b460557 Removing c++ depenedency of libsbml and its files
      fea73c3 Merge pull request #141 from subhacom/master
      7644e69 Fixed adding spike generators in ReadCell dotp.
      3928fae Merge remote-tracking branch 'upstream/master'
      5822181 Merge branch 'master' of https://github.com/subhacom/moose-core
      79d5a5c Updated generated neuroml2 module and test file.
      5a4197c Merge branch 'master' of https://github.com/BhallaLab/moose-core
      06aea5b SBML is removed from the make file
      2a5bc46 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      1a55310 Fixes for enzyme rate scaling when reading kkit files
      8f44029 Merge pull request #140 from dilawar/master
      f9e8720 Merge branch 'master' of github.com:BhallaLab/moose-core
      1aee89a When WITH_SBML=OFF is given from command line, do not compile its support.
      c959613 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      00a9171 Fixed access functions for kinetic objects and solvers
      d70da97 some more colors to ignore which are light
      4d89fd6 color if not defined in genesis then random color from pyqt Qcolor matplotlib files are taken as saved, matplotlib
      5ecd2b1 all the co-ordinate are calculated and pass from kkit to this file and only we run in commandline then auto-coordinates are calculated with appropriate zoom factor
      27bfae9 using graphviz_layout instead of pygraphviz_layout to get the position for auto-coordinates for layout the moodels
      1f93ddb Removing pygraphviz lib dependency and using pygraphviz_layout to get the position of spring_layout
      2c421a0 readSBML gets x and y co-ordinates from the file and loads it
      eba7d75 cleanup in layout co-ordinates to save the model from moose to genesis
      17863ee Layout co-ordinates from GUI is saved into SBML file, 2.Automatic Layout done using pyqgraphviz when model saved from command line to SBML file. InitialConc are saved with mole as default units
      395daa7 Fix for muParser for C++ 10
      ef2196e Adding quot operator in muparser.
      6deb249 Merge branch 'master' of github.com:BhallaLab/moose-core
      a6f8bab Updates to rdesigneur
      b922890 Fix dependency on hdf5
      6f7e46d cleanup
      b943072 added networkx's Graph for layout the co-ordinates when model is save to SBML at commandline, if model saved at GUI level then pyqt's scenepos which is used for layout in GUI, those co-ordinates are used
      8b1a05d Co-ordinates,group,textcolor and background color are written to SBML file in Annotation field
      2718470 auto co-ordinates if one saves model from commandline and also cleanup with co-ordinates for genesis
      41b6bfb color index is cleanedup according to genesis requirement and co-ordinates calculation is removed, since I am sending ScenePos
      ce6b740 cleanup in writing genesis file with scene co-ordinates and few other clean up
      8f2a3e1 Added compiler macros for AppleClang.
      076ecf6 libsbml-5.9.0 is not available on brew. Build breaks with sbml 5.11.0
      2976483 Fix apple build. adding -stdlib=libc++ to cmake.
      530d69b Merge branch 'master' of https://github.com/BhallaLab/moose-core
      d8cd4bd Updated python setup script to include streaming classes
      5d6ee59 Actual fix for issue #110
      5df0a7f Merge branch 'master' of https://github.com/BhallaLab/moose-core
      39145e3 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      2634422 Merge branch 'master' of https://github.com/subhacom/moose-core
      ddbdd8c Removed mgui and moogli from Python setup.py
      c2fa2cf Added hsolve test comparing to NEURON
      
      git-subtree-dir: moose-core
      git-subtree-split: c2c32b97caecd422d6bc9398094073ce9f1b7492
      96580978
  3. Jun 26, 2016
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 1318029..a15a538 · 2af833a0
      Dilawar Singh authored
      a15a538 Merge pull request #131 from dilawar/master
      1800283 Merge branch 'master' of github.com:dilawar/moose-core
      2ad812f Rdesigeur by sarthak,
      8e87707 Fixed the streamer test.
      e62ec09 Merge remote-tracking branch 'bhallalab/master'
      002edb6 Fix to BhallaLab/moose-core#130.
      d7ebbe7 No need to have header name in inverted commas.
      414a8d9 stimulustable is check and some more correction
      343a08a First version of model merging pools and reaction are done
      943f96f  clean up in notes field
      f2b71f5 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      c742934 kkitUtil: check to see if the color goes beyond genesis color Sequence, _main.py: eliminated enzyme cplx pool to genesis under compartment
      9aca1c1 Merge pull request #128 from dilawar/master
      322093e Streamer uses name of the table whenever possible.
      5be9eb4 Added getName, setName to table. If these are set, use them in Streamer class to write the header of csv file.
      f9178d2 Merge branch 'master' of github.com:BhallaLab/moose-core
      3d420b0 species concentration/amount is calculated depending on the hasOnlySubstanceUnit flag
      9188681 Merge branch 'master' of github.com:BhallaLab/moose-core
      cf3d4f8 Merge branch 'master' of github.com:dilawar/moose-core
      4d98756 Write path without [0] in streamer numpy table instead of table name.
      9b143e4 reaction and enzyme are added with the ratelaw
      b2fbc15 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      0a765fb Rules are added
      07a68b9 If -Wno-unused-but-set-variable is supported by compiler, enable it.
      d98241c Merge branch 'master' of github.com:BhallaLab/moose-core
      d22bfea Moved Doc from here to BhallaLab/moose . In docs folder.
      9f18f0a Merge pull request #125 from dilawar/master
      a942a4c Fixed the failed build on travis https://travis-ci.org/BhallaLab/moose-core/jobs/134133078
      3d6a8cc Added support to float and double to numpy format. Fixed some documentation about Streamer, correct dt is docstring. More assert statements in streamer test script.
      aada8c4 Merge branch 'master' of github.com:BhallaLab/moose-core
      303ad71 Changes for gcc4.4. on nargis.
      1af4a69 Temporary change before switching to another branch.
      0018c55 notes are written for species
      895766a species added
      a7e9509 paremeter and compartment info is read back to moose
      2b9076e  update with more details
      170739f Put some more utility inside namespace moose. When writing numpy format, do not write whole path in header. Just name would do.
      f01727c Merge remote-tracking branch 'bhallalab/master'
      7e95a6d A fix to failing unit-tests. When user writes /compt/a/b, inside MOOSE it is represented as /compt[0]/a[0]/b[0] which could be annoying for Streamer user. Just remove [0]. For other [n], don't do anything.
      21fe695 Bringing back some changed undone by bad merge strategy. This should now pass on travis.
      ca8d55b Merge branch 'master' of https://github.com/BhallaLab/moose-core
      c165976 Fixes issue dilawar/moose-core#3  (#123)
      c17df70 clean up in filename while writing into SBML
      db701fc Enzyme's are written
      320b0c3 Function and reaction are written
      a8bfc7c compartment and species are written
      008e25e moose Annotation like runtime,dts and plots are written
      3ba5e33 units are written
      bcfa3c7 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      d3b3789 firstphase of write file
      4418691 For cmake, enable the c++11 support on compiler which supports it. This should fix ">>" to "> >" error in template parameters in boost code which is only supported in cmake build system.
      dc9d0c3 Merge branch 'master' of http://github.com/BhallaLab/moose-core
      156e762 python readSBML file
      2786757 Fixed #124. Not using gsl_rng in global rng. It is not working as expected in class RNG. Using Subha's mtrand() when boost or c++11 is not available.
      eecc171 Adding a small print statement about why assert failed in rdesigneur.
      6454673 Merge branch 'master' of github.com:BhallaLab/moose-core
      270f1d6 Fixed #112. Not using gsl_rng in global rng. It is not working as expected in class RNG. Using Subha's mtrand() when boost or c++11 is not available.
      738d9dc Fixed issue #124.  Adding the issue #124 file to repo for reference. Can't reproduce the error with latest commit (this and previous one).
      cc85cfb Update README.md
      af178bf This fixes the missing time column in streamer. dilawar/moose-core#3.
      9faf02e Don't rewrite the table path before writing them to csv in header. dilawar/moose-core#3.
      806f6a1 Checks if not of tables added are more than 0 or not. If zero, then disable the streamer. Notify the user. Issue dilawar/moose-core#3
      0a93eaa Importing <cstdio> so that it passes with legacy makefiles as well.
      4dc2a6c Merge branch 'master' of https://github.com/BhallaLab/moose-core
      56fdc36 Fixes to issue #116  (#120)
      357b1b5 Fixed the test script. Method rk4 is not good enough when using boost. Use rk5a.
      8057a8f Generate h5 name using tmpnam. If tests are run by two different users on the same system, there won't be any issue with permissions. However this makes testing bit harder during development.
      b01caf4 Fixes to gcc-5.x on Ubuntu-16.04.
      fc98bfc Adding random library to link flags.
      ceea4f0 Use RNG object rather than pointer. Can't figure out why pointer did not work well.
      ea5529d FIxed -std=c++11 error.
      014175d Fixed issue #116. Using real_distribution instead of int_distribution. Let the library take care of scaling to between 0 and 1.
      ab91625 Merge branch 'master' of github.com:BhallaLab/moose-core
      e23c827 Some temporary changes before merging. I forgot what there are. Probably RNG initialization is changed.
      cf73c1f Update of python setup file. (#118)
      51bcf63 Disabled part of code which checks for extension . On some platform it reutrns x86_64.so etc, which probably we don't want. In any case, if build fails on open build service, we can bring it back #78.
      fb558d8 Modifying SBML_LIBRARY related macros. Since libsbml is now distributed from mosoe repo as well.
      487587b test scripts points to directory commited by @subha #issue #94.
      e47a492 Update INSTALL.md
      13afeaf Update README.md
      8b33ae5 Merge branch 'master' of github.com:BhallaLab/moose-core
      1268296 Merge branch 'master' of github.com:BhallaLab/moose-core
      808ae94 Update INSTALL.md
      6316820 Update INSTALL.md
      2522f47 Merge branch 'master' of github.com:dilawar/moose-core
      3f13efd Temp commit.
      347e5b0 Update INSTALL.md
      d14e4e8 moved to appropriate doc folder.
      5a48285 CheckMOOSECompiler -> CheckCXXCompiler.
      5ecd06e Updated INSTALL.md file.
      0c42d28 Merge remote-tracking branch 'bhallalab/master'
      87c193d Deleted cymoose from master branch.
      e77361c Fixed moose building after moving _moose target to subdirectory.
      af97ec3 Cymoose remains only in my personal clone branch cymoose. Removing it from master branch.
      b3542f6 Cleaned up Cmakefile.
      7fec36b Moved pymoose target to its own directory.
      7575c55 Update test_ksolve.py
      904e32a Added missing cmake file.
      1998e27 Using ptr instead of object of RNG.
      1ee1427 Added ksolve test.
      fbf9d90 Test script for ksolve is modified. Total 40 pools.
      2ea5ed1 Separate file to check compiler macro.
      c7d3e15 Removed the copy constrcutor from RNG class.
      1acec97 GssaVoxelPools gets its won random number generator. Had to remove constantness of a function to be able to use uniform( ) or rng call.
      08fa1ed test display is changed a bit. Removed some hanging c++11 auto .
      c6bc8c3 Printing tests name during tests.
      4116cc5 More verbose output when tests are runnug. Added a macro which runs test.
      d1c77ce Replaced simple assert( doubleEq(a, b) ) with ASSERT_DOUBLE_EQ( "", a, b );
      
      git-subtree-dir: moose-core
      git-subtree-split: a15a538e22f0cd62de95532c2932156055d58673
      2af833a0
  4. May 18, 2016