Skip to content
This repository has been archived by the owner on Nov 3, 2022. It is now read-only.

Commit

Permalink
Bugfix | moose.Streamer streams to numpy format correctly (BhallaLab#395
Browse files Browse the repository at this point in the history
)

* saving data to npy format in streamer is now bug free. Added three tests: 2 python and 1 at cpp level.

* boost::filesystem is no longer used even when boost is used.

* Default tick for Streamer is 10s.

* Able to run nml2 example with python3 (BhallaLab/moose#253).

Co-authored-by: Dilawar Singh <dilawars@ncbs.res.in>
  • Loading branch information
dilawar and Dilawar Singh committed Mar 11, 2020
1 parent 280dfa5 commit 0e85a57
Show file tree
Hide file tree
Showing 19 changed files with 979 additions and 763 deletions.
14 changes: 10 additions & 4 deletions basecode/Id.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,17 @@ string Id::id2str( Id id )
string Id::path( const string& separator) const
{
string ret = Neutral::path( eref() );
// Trim off trailing []
assert( ret.length() > 0 );
// the 'back' operation is not supported by pre 2011 compilers

while ( ret[ ret.length() - 1 ] == ']' )
// FIXME: Monday 09 March 2020 12:30:27 PM IST, Dilawar Singh
// This beaks the path comparison. Getting x.path from x returned in a
// list by moose.wildcardFind() and getting path from here doesn't math
// when this is enabled.
// If we want to remove [0] then it should be done globally and not just
// here.

// Trim off trailing []
assert( ret.length() > 0 );
while ( ret.back() == ']' )
{
size_t pos = ret.find_last_of( '[' );
if ( pos != string::npos && pos > 0 )
Expand Down
Loading

0 comments on commit 0e85a57

Please sign in to comment.