[med-svn] [aghermann] 20/60: whitespace, comments
andrei zavada
hmmr-guest at alioth.debian.org
Mon Nov 4 23:49:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 34d60ace9a3ad3dd19b7a95140c4c288c839197f
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Oct 13 21:00:30 2013 +0300
whitespace, comments
---
upstream/src/aghermann/expdesign/expdesign.cc | 62 ++++++++++++-------------
upstream/src/aghermann/ui/sf/sf.cc | 2 +-
upstream/src/aghermann/ui/sf/sf.hh | 1 -
upstream/src/libmetrics/mc-artifacts.cc | 2 +-
4 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/upstream/src/aghermann/expdesign/expdesign.cc b/upstream/src/aghermann/expdesign/expdesign.cc
index e0d5cd7..cc034a8 100644
--- a/upstream/src/aghermann/expdesign/expdesign.cc
+++ b/upstream/src/aghermann/expdesign/expdesign.cc
@@ -46,44 +46,44 @@ using agh::confval::SValidator;
agh::CExpDesign::
CExpDesign (const string& session_dir_,
TMsmtCollectProgressIndicatorFun progress_fun)
- : num_threads (0),
- af_dampen_window_type (sigproc::TWinType::welch),
- af_dampen_factor (.95),
- tunables0 (tstep, tlo, thi), // only references here, don't worry
+ : num_threads (0),
+ af_dampen_window_type (sigproc::TWinType::welch),
+ af_dampen_factor (.95),
+ tunables0 (tstep, tlo, thi), // only references here, don't worry
strict_subject_id_checks (false),
- _id_pool (0)
+ _id_pool (0)
{
config
- ("ctl_param.step_size", &ctl_params0.siman_params.step_size)
- ("ctl_param.boltzmann_k", &ctl_params0.siman_params.k, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
- ("ctl_param.t_initial", &ctl_params0.siman_params.t_initial, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
- ("ctl_param.damping_mu", &ctl_params0.siman_params.mu_t, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
- ("ctl_param.t_min", &ctl_params0.siman_params.t_min, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
- ("profile.req_scored_pc", &profile_common_params0.req_percent_scored, SValidator<double>::SVFRangeIn( 80., 100.))
- ("fft_param.pagesize", &fft_params.pagesize, SValidator<double>::SVFRangeIn( 4., 120.))
- ("fft_param.binsize", &fft_params.binsize, SValidator<double>::SVFRangeIn( .125, 1.))
- ("artifacts.dampen_factor", &af_dampen_factor, SValidator<double>::SVFRangeIn( 0., 1.))
- ("mc_param.mc_gain", &mc_params.mc_gain, SValidator<double>::SVFRangeIn( 0., 100.))
- ("mc_param.f0fc", &mc_params.f0fc, SValidator<double>::SVFRangeEx( 0., 80.))
- ("mc_param.bandwidth", &mc_params.bandwidth, SValidator<double>::SVFRangeIn( 0.125, 2.))
- ("mc_param.iir_backpolate", &mc_params.iir_backpolate, SValidator<double>::SVFRangeIn( 0., 1.))
- ("swu_param.min_upswing_duration", &swu_params.min_upswing_duration, SValidator<double>::SVFRangeIn( 0.01, 1.))
- ("fft_param.welch_window_type", (int*)&fft_params.welch_window_type, SValidator<int>::SVFRangeIn( 0, (int)sigproc::TWinType_total - 1))
- ("fft_param.plan_type", (int*)&fft_params.plan_type, SValidator<int>::SVFRangeIn( 0, (int)metrics::psd::TFFTWPlanType_total - 1))
- ("artifacts.dampen_window_type", (int*)&af_dampen_window_type, SValidator<int>::SVFRangeIn( 0, (int)sigproc::TWinType_total - 1))
- ("ctl_param.iters_fixed_t", &ctl_params0.siman_params.iters_fixed_T, SValidator<int>::SVFRangeIn( 1, 1000000))
- ("ctl_param.n_tries", &ctl_params0.siman_params.n_tries, SValidator<int>::SVFRangeIn( 1, 10000))
+ ("ctl_param.step_size", &ctl_params0.siman_params.step_size)
+ ("ctl_param.boltzmann_k", &ctl_params0.siman_params.k, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
+ ("ctl_param.t_initial", &ctl_params0.siman_params.t_initial, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
+ ("ctl_param.damping_mu", &ctl_params0.siman_params.mu_t, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
+ ("ctl_param.t_min", &ctl_params0.siman_params.t_min, SValidator<double>::SVFRangeEx( DBL_MIN, 1e9))
+ ("profile.req_scored_pc", &profile_common_params0.req_percent_scored, SValidator<double>::SVFRangeIn( 80., 100.))
+ ("fft_param.pagesize", &fft_params.pagesize, SValidator<double>::SVFRangeIn( 4., 120.))
+ ("fft_param.binsize", &fft_params.binsize, SValidator<double>::SVFRangeIn( .125, 1.))
+ ("artifacts.dampen_factor", &af_dampen_factor, SValidator<double>::SVFRangeIn( 0., 1.))
+ ("mc_param.mc_gain", &mc_params.mc_gain, SValidator<double>::SVFRangeIn( 0., 100.))
+ ("mc_param.f0fc", &mc_params.f0fc, SValidator<double>::SVFRangeEx( 0., 80.))
+ ("mc_param.bandwidth", &mc_params.bandwidth, SValidator<double>::SVFRangeIn( 0.125, 2.))
+ ("mc_param.iir_backpolate", &mc_params.iir_backpolate, SValidator<double>::SVFRangeIn( 0., 1.))
+ ("swu_param.min_upswing_duration", &swu_params.min_upswing_duration, SValidator<double>::SVFRangeIn( 0.01, 1.))
+ ("fft_param.welch_window_type", (int*) &fft_params.welch_window_type, SValidator<int>::SVFRangeIn( 0, (int)sigproc::TWinType_total - 1))
+ ("fft_param.plan_type", (int*) &fft_params.plan_type, SValidator<int>::SVFRangeIn( 0, (int)metrics::psd::TFFTWPlanType_total - 1))
+ ("artifacts.dampen_window_type", (int*) &af_dampen_window_type, SValidator<int>::SVFRangeIn( 0, (int)sigproc::TWinType_total - 1))
+ ("ctl_param.iters_fixed_t", &ctl_params0.siman_params.iters_fixed_T, SValidator<int>::SVFRangeIn( 1, 1000000))
+ ("ctl_param.n_tries", &ctl_params0.siman_params.n_tries, SValidator<int>::SVFRangeIn( 1, 10000))
("smp.num_threads", &num_threads, SValidator<size_t>::SVFRangeIn( 0, 20))
("mc_params.n_bins", &mc_params.n_bins, SValidator<size_t>::SVFRangeIn( 1, 100))
("profile.swa_laden_pages_before_SWA_0", &profile_common_params0.swa_laden_pages_before_SWA_0, SValidator<size_t>::SVFRangeIn( 1, 100))
("mc_param.smooth_side", &mc_params.smooth_side, SValidator<size_t>::SVFRangeIn( 0, 5))
- ("ctl_param.DBAmendment1", &ctl_params0.DBAmendment1)
- ("ctl_param.DBAmendment2", &ctl_params0.DBAmendment2)
- ("ctl_param.AZAmendment1", &ctl_params0.AZAmendment1)
- ("ctl_param.AZAmendment2", &ctl_params0.AZAmendment2)
- ("profile.score_unscored_as_wake", &profile_common_params0.score_unscored_as_wake)
- ("StrictSubjectIdChecks", &strict_subject_id_checks)
- ("LastUsedVersion", &last_used_version);
+ ("ctl_param.DBAmendment1", &ctl_params0.DBAmendment1)
+ ("ctl_param.DBAmendment2", &ctl_params0.DBAmendment2)
+ ("ctl_param.AZAmendment1", &ctl_params0.AZAmendment1)
+ ("ctl_param.AZAmendment2", &ctl_params0.AZAmendment2)
+ ("profile.score_unscored_as_wake", &profile_common_params0.score_unscored_as_wake)
+ ("StrictSubjectIdChecks", &strict_subject_id_checks)
+ ("LastUsedVersion", &last_used_version);
char *tmp = canonicalize_file_name(session_dir_.c_str());
if ( !tmp ) // does not exist
diff --git a/upstream/src/aghermann/ui/sf/sf.cc b/upstream/src/aghermann/ui/sf/sf.cc
index 67ce3d9..3ce5e9c 100644
--- a/upstream/src/aghermann/ui/sf/sf.cc
+++ b/upstream/src/aghermann/ui/sf/sf.cc
@@ -849,7 +849,7 @@ void
SScoringFacility::
update_main_menu_items()
{
- bool all_draw_original[2] = {true, true},
+ bool all_draw_original[2] = {true, true},
all_draw_filtered[2] = {true, true},
all_draw_fast [2] = {true, true},
all_draw_zeroline[2] = {true, true};
diff --git a/upstream/src/aghermann/ui/sf/sf.hh b/upstream/src/aghermann/ui/sf/sf.hh
index 152744c..ece8e02 100644
--- a/upstream/src/aghermann/ui/sf/sf.hh
+++ b/upstream/src/aghermann/ui/sf/sf.hh
@@ -27,7 +27,6 @@
#include "aghermann/ica/forward-decls.hh"
#include "aghermann/ui/globals.hh"
#include "aghermann/ui/ui++.hh"
-//#include "aghermann/ui/mw/mw.hh"
#include "widgets.hh"
diff --git a/upstream/src/libmetrics/mc-artifacts.cc b/upstream/src/libmetrics/mc-artifacts.cc
index 48d549f..7b38770 100644
--- a/upstream/src/libmetrics/mc-artifacts.cc
+++ b/upstream/src/libmetrics/mc-artifacts.cc
@@ -62,7 +62,7 @@ estimate_E( const valarray<float>& S,
// Local Variables:
// Mode: c++
-// indent-tabs-mode: 8
+// indent-tabs-mode: nil
// tab-width: 8
// c-basic-offset: 8
// End:
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list