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

Use Color type wherever possible.

Browse Source
This commit is contained in:
Bert Peters
2018-04-03 19:22:14 +02:00
parent f62c2859e3
commit d4d4d6d431
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fmri/visualisations.cpp
View File

@@ -170,11 +170,11 @@ static Animation *getReLUAnimation(const fmri::LayerData &prevState,
const auto maxValue = max_element(results.begin(), results.end())->first;
return new ActivityAnimation(results, prevPositions.data(), curPositions.data(),
[=](float i) -> ActivityAnimation::Color {
[=](float i) -> Color {
if (maxValue == 0) {
return {1, 1, 1};
return {1, 1, 1, 1};
} else {
return {1 - i / maxValue, 1 - i / maxValue, 1};
return {1 - i / maxValue, 1 - i / maxValue, 1, 1};
}
});
} else {
@@ -202,11 +202,12 @@ static Animation *getNormalizingAnimation(const fmri::LayerData &prevState, cons
auto max_val = *max_element(scaling.begin(), scaling.end());
return new ActivityAnimation(entries, prevPositions.data(), curPositions.data(),
[=](float i) -> ActivityAnimation::Color {
[=](float i) -> Color {
auto intensity = clamp((i - 1) / (max_val - 1), 0.f, 1.f);
return {
1 - intensity,
1,
1,
1
};
});