[med-svn] [aghermann] 19/34: ICM

[andrei zavada]

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

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

commit 8e788b65a77fa4ec39e063849836486a23626ed6
Author: andrei zavada <hmmr at fa2>
Date:   Fri Nov 15 17:06:58 2013 +0200

    ICM
---
 upstream/src/aghermann/expdesign/expdesign.cc    | 4 ++--
 upstream/src/aghermann/expdesign/recording.cc    | 8 +++-----
 upstream/src/aghermann/expdesign/tree-scanner.cc | 1 -
 upstream/src/aghermann/ui/mw/measurements.cc     | 1 +
 upstream/src/aghermann/ui/mw/settings_cb.cc      | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index 2910137..31b2975 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -103,10 +103,10 @@ CExpDesign (const string& session_dir_,
                 _session_dir.erase( _session_dir.size()-1, 1);
 
         if ( fs::exists_and_is_writable( session_dir()) == false )
-                throw invalid_argument (string("Experiment directory ") + _session_dir + " does not exist or is not writable");
+                throw invalid_argument (agh::str::sasprintf( "Experiment directory \"%s\" does not exist or is not writable", _session_dir.c_str()));
 
         if ( chdir( session_dir()) == -1 )
-                throw invalid_argument (string("Failed to cd to ") + _session_dir);
+                throw invalid_argument (agh::str::sasprintf( "Failed to cd to \"%s\"", _session_dir.c_str()));
 
         load_settings();
 
diff --git a/upstream/src/aghermann/expdesign/recording.cc b/upstream/src/aghermann/expdesign/recording.cc
index ab0bbcf..d1aef91 100644
--- a/upstream/src/aghermann/expdesign/recording.cc
+++ b/upstream/src/aghermann/expdesign/recording.cc
@@ -114,7 +114,6 @@ CProfile (CSubject& J, const string& d, const sigfile::SChannel& h,
                 if ( Mi == _mm_list.begin() ) {
                         _0at = F.start_time();
                         _pagesize = M.pagesize();
-                        printf( "constructing profile ps %d\n", _pagesize);
                         _pages_in_bed = 0;
                 } else
                         if ( _pagesize != M.pagesize() ) {
@@ -123,8 +122,7 @@ CProfile (CSubject& J, const string& d, const sigfile::SChannel& h,
                         }
 
                 int     pa = (size_t)difftime( F.start_time(), _0at) / _pagesize,
-                        //pz = (size_t)difftime( F.end_time(), _0at) / _pagesize;
-                        pz = pa + M.hypnogram().n_pages();
+                        pz = (size_t)difftime( F.end_time(), _0at) / _pagesize;
               // anchor zero page, get pagesize from edf^W CBinnedPower^W either goes
                 time_t dima = F.start_time();
                 APPLOG_INFO ("adding %s of [%s, %s, %s] %zu full pages (%zu total, %zu in hypnogram @%zu) recorded %s",
@@ -265,10 +263,10 @@ create_timeline()
 
               // collect M's power and scores
                 valarray<TFloat>
-                        lumped_bins {M.course( *(SProfileParamSet*)this)};
+                        lumped_bins = M.course( *(SProfileParamSet*)this);
 
                 size_t  pa = (size_t)difftime( F.start_time(), _0at) / _pagesize,
-                        pz = pa + lumped_bins.size(); // (size_t)difftime( F.end_time(), _0at) / _pagesize;
+                        pz = (size_t)difftime( F.end_time(), _0at) / _pagesize;
                 for ( size_t p = pa; p < pz; ++p ) {
                         _timeline[p] = sigfile::SPageSimulated {Y[p-pa]};
                       // fill unscored/MVT per user setting
diff --git a/upstream/src/aghermann/expdesign/tree-scanner.cc b/upstream/src/aghermann/expdesign/tree-scanner.cc
index 5b7cefb..35203c2 100644
--- a/upstream/src/aghermann/expdesign/tree-scanner.cc
+++ b/upstream/src/aghermann/expdesign/tree-scanner.cc
@@ -69,7 +69,6 @@ add_one( sigfile::CTypedSource&& Fmc,
                         return AGH_EPSEQADD_TOOFAR;
 
                 episodes.emplace_back( move(Fmc), fft_params, swu_params, mc_params);
-                printf( "ps %zu; %zu\n", Fmc.pagesize(), episodes.back().sources.back().pagesize());
                 episodes.sort();
 
         } else { // same as SEpisode() but done on an existing one
diff --git a/upstream/src/aghermann/ui/mw/measurements.cc b/upstream/src/aghermann/ui/mw/measurements.cc
index 36f433c..82d4946 100644
--- a/upstream/src/aghermann/ui/mw/measurements.cc
+++ b/upstream/src/aghermann/ui/mw/measurements.cc
@@ -128,6 +128,7 @@ draw_timeline( cairo_t *cr) const
                         for ( size_t i = 0; i < tmp.size(); ++i )
                                 tmp[i] = (*cprofile)[i].metric;
                         sigproc::smooth( tmp, _p._p.smooth_profile);
+
                         for ( size_t i = 0; i < tmp.size(); ++i )
                                 if ( isfinite(tmp[i]) )
                                         cairo_line_to(
diff --git a/upstream/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
index b95e3d9..fbbb2c5 100644
--- a/upstream/src/aghermann/ui/mw/settings_cb.cc
+++ b/upstream/src/aghermann/ui/mw/settings_cb.cc
@@ -48,7 +48,7 @@ tDesign_switch_page_cb(
                 ED.ED->psd_params.binsize  = ED.FFTBinSizeValues [ED.binsize_item];
 
                 for ( auto& P : {reinterpret_cast<metrics::SPPack*>(&ED.ED->psd_params),
-                                 reinterpret_cast<metrics::SPPack*>(&ED.ED->mc_params),
+                                 reinterpret_cast<metrics::SPPack*>(&ED.ED-> mc_params),
                                  reinterpret_cast<metrics::SPPack*>(&ED.ED->swu_params)} )
                         try { P->check(); }
                         catch (invalid_argument ex) {

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