This repository has been archived by the owner on Jul 8, 2022. It is now read-only.
Add GenericLoader to load events from file. #81
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
tribal-tec
reviewed
Feb 1, 2017
apps/commandLineApplication.h
Outdated
| @@ -58,6 +58,7 @@ std::istream& operator >> ( std::istream& is, Vector2ui& vec ) | |||
|
|
|||
| namespace | |||
| { | |||
| typedef fivox::FloatVolume::Pointer VolumePtr; | |||
apps/computeVSD/computeVSD.cpp
Outdated
| @@ -328,7 +328,8 @@ class ComputeVSD : public CommandLineApplication | |||
|
|
|||
| file << "VSDPositionFile=" << _outputFile + ".psp" << std::endl; | |||
| file << "VSDIntensityFile=" << filename + ".psi" << std::endl; | |||
| file << "TimeStep=" << _eventSource->getDt() << std::endl; | |||
| file << "TimeStep=" << _eventSource->getCurrentTime() << std::endl; | |||
doc/Changelog.md
Outdated
| @@ -3,6 +3,9 @@ Changelog {#changelog} | |||
|
|
|||
| # git master {#master} | |||
|
|
|||
| * [#!!](https://github.com/BlueBrain/Fivox/pull/!!) | |||
fivox/eventSource.cpp
Outdated
| @@ -90,6 +109,65 @@ class EventSource::Impl | |||
| events.reset((float*) ptr ); | |||
| } | |||
|
|
|||
| bool isBinary( const lunchbox::MemoryMap& binaryFile ) | |||
fivox/eventSource.cpp
Outdated
| if( _impl->isBinary( binaryFile )) | ||
| return _impl->readBinary( binaryFile, filename ); | ||
|
|
||
| std::string line; |
There was a problem hiding this comment.
move this to _impl->readAscii()
fivox/genericLoader.cpp
Outdated
| { | ||
| return Vector2f( 0.f, 100.f ); | ||
| } | ||
|
|
||
| ssize_t TestLoader::_load( const size_t /*chunkIndex*/, | ||
| ssize_t GenericLoader::_load( const size_t /*chunkIndex*/, | ||
| const size_t /*numChunks*/ ) |
chevtche
force-pushed
the
master
branch
2 times, most recently
from
97f4200
to
3071ab5
Compare
Added read and write methods in the EventSource, to
save/load events to/from binary or ASCII files.
Use "fivox://" for the GenericLoader ("fivoxcompartments://"
for the CompartmentLoader)
Replace TestLoader with new GenericLoader, behaving the same way
as previously when no events file is specified.
tribal-tec
approved these changes
Feb 1, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added read and write methods in the EventSource, to
save/load events to/from binary or ASCII files.
Use "fivox://" for the GenericLoader ("fivoxcompartments://"
for the CompartmentLoader)
Replace TestLoader with new GenericLoader, behaving the same way
as previously when no events file is specified.