[med-svn] [aghermann] 57/60: there's no unique+sort trick for vectors

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit d93e4718e4a9d58c6a900e9383fe2cfc70b49608
Author: Andrei Zavada <hmmr at ao>
Date:   Tue Oct 29 15:51:35 2013 +0200

    there's no unique+sort trick for vectors
---
 upstream/src/aghermann/expdesign/expdesign.cc |    8 ++++----
 upstream/src/aghermann/expdesign/expdesign.hh |    2 +-
 upstream/src/aghermann/ui/mw/mw.hh            |    2 +-
 upstream/src/aghermann/ui/mw/populate.cc      |    8 ++++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index cc034a8..32cf887 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -426,11 +426,11 @@ enumerate_all_channels() const
 }
 
 
-vector<size_t>
+list<size_t>
 agh::CExpDesign::
 used_samplerates( sigfile::SChannel::TType type) const
 {
-        vector<size_t> recp;
+        list<size_t> recp;
         for ( auto &G : groups )
                 for ( auto &J : G.second )
                         for ( auto &D : J.measurements )
@@ -441,8 +441,8 @@ used_samplerates( sigfile::SChannel::TType type) const
                                                              type == F().signal_type(h) ) {
                                                                 recp.push_back( F().samplerate(h));
                                                         }
-        sort(recp.begin(), recp.end());
-        unique(recp.begin(), recp.end());
+        recp.sort();
+        recp.unique();
         return move(recp);
 }
 
diff --git a/upstream/src/aghermann/expdesign/expdesign.hh b/upstream/src/aghermann/expdesign/expdesign.hh
index f3b8ec0..e56276d 100644
--- a/upstream/src/aghermann/expdesign/expdesign.hh
+++ b/upstream/src/aghermann/expdesign/expdesign.hh
@@ -147,7 +147,7 @@ class CExpDesign {
         list<string> enumerate_episodes() const;
         list<sigfile::SChannel> enumerate_all_channels() const;
         list<sigfile::SChannel> enumerate_eeg_channels() const;
-        vector<size_t> used_samplerates( sigfile::SChannel::TType type = sigfile::SChannel::TType::other) const;
+        list<size_t> used_samplerates( sigfile::SChannel::TType type = sigfile::SChannel::TType::other) const;
 
       // omp-enabled lists:foreach
         typedef function<void(CSubject&)>
diff --git a/upstream/src/aghermann/ui/mw/mw.hh b/upstream/src/aghermann/ui/mw/mw.hh
index b813781..7ed9c0f 100644
--- a/upstream/src/aghermann/ui/mw/mw.hh
+++ b/upstream/src/aghermann/ui/mw/mw.hh
@@ -185,7 +185,7 @@ class SExpDesignUI
         int AghDi() const;
 
         // samplerates
-        vector<size_t>
+        list<size_t>
                 used_samplerates,
                 used_eeg_samplerates;
 
diff --git a/upstream/src/aghermann/ui/mw/populate.cc b/upstream/src/aghermann/ui/mw/populate.cc
index 463f2e9..c5b94f2 100644
--- a/upstream/src/aghermann/ui/mw/populate.cc
+++ b/upstream/src/aghermann/ui/mw/populate.cc
@@ -56,8 +56,12 @@ populate( bool do_load)
                 ED->used_samplerates( sigfile::SChannel::TType::eeg);
         if ( used_eeg_samplerates.size() == 1 )
                 APPLOG_INFO ("single common EEG samplerate: %zu", used_eeg_samplerates.front());
-        else
-                APPLOG_INFO ("multiple EEG samplerates (%zu)", used_eeg_samplerates.size());
+        else {
+                ostringstream o;
+                for ( decltype(used_eeg_samplerates)::const_iterator I = used_eeg_samplerates.begin(); I != used_eeg_samplerates.end(); ++I )
+                        o << agh::str::sasprintf( "%zu%s", *I, (next(I) == used_eeg_samplerates.end()) ? "" : ", ");
+                APPLOG_INFO ("multiple EEG samplerates (%s)", o.str().c_str());
+        }
 
         if ( do_load ) {
                 if ( load_settings() ) {

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git