bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Remove unused parameter."

Browse Source 
This reverts commit 284d32816f.
This commit is contained in:
Bert Peters
2018-02-19 16:26:24 +01:00
parent 1e9cc7c6c5
commit 6d64830a46
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@@ -114,8 +114,7 @@ static void updateVisualisers()
for (LayerData &layer : *rendererData.currentData) { for (LayerData &layer : *rendererData.currentData) {
LayerVisualisation* visualisation = getVisualisationForLayer(layer); LayerVisualisation* visualisation = getVisualisationForLayer(layer);
if (prevState && prevVisualisation && visualisation) { if (prevState && prevVisualisation && visualisation) {
auto interaction = getActivityAnimation(*prevState, rendererData.layerInfo.at(layer.name()), auto interaction = getActivityAnimation(*prevState, layer, rendererData.layerInfo.at(layer.name()), prevVisualisation->nodePositions(), visualisation->nodePositions());
prevVisualisation->nodePositions(), visualisation->nodePositions());
rendererData.animations.emplace_back(interaction); rendererData.animations.emplace_back(interaction);
} }

5
src/visualisations.cpp
View File

@@ -62,8 +62,9 @@ static Animation *getFullyConnectedAnimation(const fmri::LayerData &prevState, c
return new ActivityAnimation(result, prevPositions.data(), curPositions.data(), -10); return new ActivityAnimation(result, prevPositions.data(), curPositions.data(), -10);
} }
Animation *fmri::getActivityAnimation(const fmri::LayerData &prevState, const fmri::LayerInfo &layer, Animation * fmri::getActivityAnimation(const fmri::LayerData &prevState, const fmri::LayerData &curState,
const vector<float> &prevPositions, const vector<float> &curPositions) const fmri::LayerInfo &layer, const vector<float> &prevPositions,
const vector<float> &curPositions)
{ {
if (prevPositions.empty() || curPositions.empty()) { if (prevPositions.empty() || curPositions.empty()) {
// Not all positions know, no visualisation possible. // Not all positions know, no visualisation possible.

5
src/visualisations.hpp
View File

@@ -14,6 +14,7 @@ namespace fmri {
*/ */
LayerVisualisation* getVisualisationForLayer(const LayerData& layer); LayerVisualisation* getVisualisationForLayer(const LayerData& layer);
Animation *getActivityAnimation(const fmri::LayerData &prevState, const fmri::LayerInfo &layer, Animation * getActivityAnimation(const fmri::LayerData &prevState, const fmri::LayerData &curState,
const vector<float> &prevPositions, const vector<float> &curPositions); const fmri::LayerInfo &layer, const vector<float> &prevPositions,
const vector<float> &curPositions);
} }