[med-svn] [aghermann] 19/85: whitespace, rotting commented code removal

[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 fda35efc62ee4ba42f685b6a2fb42b3e843f5705
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Sep 12 02:28:40 2013 +0300

    whitespace, rotting commented code removal
---
 upstream/src/aghermann/expdesign/expdesign.hh  |   29 ++++++++----------------
 upstream/src/aghermann/ui/mw/simulations_cb.cc |    8 +++----
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/upstream/src/aghermann/expdesign/expdesign.hh b/upstream/src/aghermann/expdesign/expdesign.hh
index 7c0c354..ecc3324 100644
--- a/upstream/src/aghermann/expdesign/expdesign.hh
+++ b/upstream/src/aghermann/expdesign/expdesign.hh
@@ -222,7 +222,7 @@ class CExpDesign {
         for_all_modruns( const TModelRunOpFun&, const TModelRunReportFun&, const TModelRunFilterFun&);
 
       // inventory
-        size_t        num_threads;
+        size_t  num_threads;
         metrics::psd::SPPack
                 fft_params;
         metrics::swu::SPPack
@@ -231,7 +231,7 @@ class CExpDesign {
                 mc_params;
         sigproc::TWinType // such a fussy
                 af_dampen_window_type;
-        double        af_dampen_factor;
+        double  af_dampen_factor;
 
         static double
                 freq_bands[metrics::TBand::TBand_total][2];
@@ -241,7 +241,7 @@ class CExpDesign {
         ach::STunableSet<ach::TTRole::d>        tstep;
         ach::STunableSet<ach::TTRole::l>        tlo;
         ach::STunableSet<ach::TTRole::u>        thi;
-        ach::STunableSetWithState                tunables0;
+        ach::STunableSetWithState               tunables0;
 
         ach::SControlParamSet
                 ctl_params0;
@@ -253,7 +253,7 @@ class CExpDesign {
         int load_settings();
         int save_settings();
 
-        string        last_used_version;
+        string  last_used_version;
         int purge_cached_profiles();
 
     private:
@@ -263,17 +263,17 @@ class CExpDesign {
                 load_fail = 2, // irrelevant
         };
 
-        int        _status;
-        string        _session_dir;
+        int     _status;
+        string  _session_dir;
         list<pair<string, TLogEntryStyle>>
                 _error_log;
 
-        sid_t        _id_pool;
+        sid_t   _id_pool;
       // load/save
         forward_list<confval::SValidator<double>>        config_keys_g;
-        forward_list<confval::SValidator<int>>                config_keys_d;
+        forward_list<confval::SValidator<int>>           config_keys_d;
         forward_list<confval::SValidator<size_t>>        config_keys_z;
-        forward_list<confval::SValidator<bool>>                config_keys_b;
+        forward_list<confval::SValidator<bool>>          config_keys_b;
         forward_list<confval::SValidator<string>>        config_keys_s;
 };
 
@@ -326,17 +326,6 @@ const char* CExpDesign::group_of( const T& jid)
         throw invalid_argument("no such subject");
 }
 
-// template <class T>
-// bool have_subject( T jid) const
-//         {
-//                 for ( auto& I : groups )
-//                         if ( find( I.second.begin(), I.second.end(), jid) != I.second.end() )
-//                                 return true;
-//                 return false;
-//         }
-
-
-
 
 } // namespace agh
 
diff --git a/upstream/src/aghermann/ui/mw/simulations_cb.cc b/upstream/src/aghermann/ui/mw/simulations_cb.cc
index 82309ea..709021e 100644
--- a/upstream/src/aghermann/ui/mw/simulations_cb.cc
+++ b/upstream/src/aghermann/ui/mw/simulations_cb.cc
@@ -84,18 +84,18 @@ iSimulationsRunBatch_activate_cb(
                         use_subjects = agh::str::tokens_trimmed( gtk_entry_get_text( ED.eBatchSetupSubjects), ";"),
                         use_sessions = agh::str::tokens_trimmed( gtk_entry_get_text( ED.eBatchSetupSessions), ";"),
                         use_channels = agh::str::tokens_trimmed( gtk_entry_get_text( ED.eBatchSetupChannels), ";");
-                double        freq_from  = gtk_spin_button_get_value( ED.eBatchSetupRangeFrom),
+                double  freq_from  = gtk_spin_button_get_value( ED.eBatchSetupRangeFrom),
                         freq_width = gtk_spin_button_get_value( ED.eBatchSetupRangeWidth),
                         freq_inc   = gtk_spin_button_get_value( ED.eBatchSetupRangeInc);
-                size_t        freq_steps = gtk_spin_button_get_value( ED.eBatchSetupRangeSteps);
+                size_t  freq_steps = gtk_spin_button_get_value( ED.eBatchSetupRangeSteps);
 
                 for ( auto& J : use_subjects )
                         for ( auto& D : use_sessions )
                                 for ( auto& H : use_channels ) {
                                         switch ( ED.display_profile_type ) {
                                         case metrics::TType::psd:
-                                        {        auto        this_freq_from = freq_from,
-                                                        this_freq_upto = freq_from + freq_width;
+                                        {       auto   this_freq_from = freq_from,
+                                                       this_freq_upto = freq_from + freq_width;
                                                 for ( size_t step = 0; step < freq_steps;
                                                       ++step, this_freq_from += freq_inc, this_freq_upto += freq_inc ) {
                                                         ED.ED->setup_modrun( J.c_str(), D.c_str(), H.c_str(),

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