This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository aghermann.
commit 6c80127b20f93d9aa73e17aa49a5df17b71408ac Author: Andrei Zavada <[email protected]> Date: Wed Oct 23 20:04:11 2013 +0300 ICM --- upstream/src/aghermann/ui/sf/sf.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/upstream/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc index 9d46aea..5698a33 100644 --- a/upstream/src/aghermann/ui/sf/sf.cc +++ b/upstream/src/aghermann/ui/sf/sf.cc @@ -145,16 +145,18 @@ SScoringFacility (agh::CSubject& J, throw invalid_argument( string ("No channels found for combination (") + J.id + ", " + D + ", " + E + ")"); // collect common annotations - for ( auto& H : channels ) - for ( auto& A : H.crecording.F().annotations() ) - if ( not any_of( common_annotations.begin(), common_annotations.end(), - [&A]( const pair<const sigfile::CSource*, const sigfile::SAnnotation*>& a1) - { return *a1.second == A; }) ) - common_annotations.push_back( {&H.crecording.F(), &A}); // bitch& - common_annotations.sort( - []( const pair<const sigfile::CSource*, const sigfile::SAnnotation*>& a1, - const pair<const sigfile::CSource*, const sigfile::SAnnotation*>& a2) - { return *a1.second < *a2.second; }); + { + using T = decltype(common_annotations)::value_type; //const pair<const sigfile::CSource*, const sigfile::SAnnotation*>& a1, + for ( auto& H : channels ) + for ( auto& A : H.crecording.F().annotations() ) + if ( not any_of( common_annotations.begin(), common_annotations.end(), + [&A]( const T& a1) + { return *a1.second == A; }) ) + common_annotations.push_back( {&H.crecording.F(), &A}); // bitch& + common_annotations.sort( + []( const T& a1, const T& a2) + { return *a1.second < *a2.second; }); + } // count n_eeg_channels n_eeg_channels = -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
