[med-svn] [aghermann] 10/14: whitespace touch up; remove emacs vars
andrei zavada
hmmr-guest at moszumanska.debian.org
Sat Jan 30 18:16:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 7f947e08df2061f0ffa183492ce3dcdc9288cc53
Author: Andrei Zavada <hmmr at frdg>
Date: Fri Dec 11 01:41:28 2015 +0000
whitespace touch up; remove emacs vars
---
upstream/src/aghermann/artifact-detection/3in1.hh | 6 --
.../aghermann/artifact-detection/forward-decls.hh | 7 --
upstream/src/aghermann/expdesign/dirlevel.hh | 7 --
upstream/src/aghermann/expdesign/forward-decls.hh | 7 --
upstream/src/aghermann/expdesign/loadsave.cc | 8 --
upstream/src/aghermann/expdesign/profile.hh | 2 -
upstream/src/aghermann/expdesign/recording.cc | 8 --
upstream/src/aghermann/expdesign/subject.cc | 10 --
upstream/src/aghermann/globals.cc | 9 --
upstream/src/aghermann/ica/forward-decls.hh | 7 --
upstream/src/aghermann/ica/ica.hh | 8 --
upstream/src/aghermann/main.cc | 7 --
upstream/src/aghermann/model/achermann-siman.cc | 10 --
upstream/src/aghermann/model/achermann-tunable.cc | 8 --
upstream/src/aghermann/model/achermann-tunable.hh | 7 --
upstream/src/aghermann/model/achermann.cc | 102 ++++++++++-----------
upstream/src/aghermann/model/beersma.hh | 15 +--
upstream/src/aghermann/model/borbely.cc | 16 +---
upstream/src/aghermann/model/forward-decls.hh | 7 --
upstream/src/aghermann/model/ultradian-cycle.cc | 8 --
upstream/src/aghermann/patterns/forward-decls.hh | 8 --
upstream/src/aghermann/patterns/patterns.cc | 21 ++---
upstream/src/aghermann/patterns/patterns.hh | 8 --
upstream/src/aghermann/patterns/patterns.ii | 19 ++--
upstream/src/aghermann/print_version.cc | 7 --
upstream/src/aghermann/rk1968/rk1968-profiles.cc | 10 --
upstream/src/aghermann/rk1968/rk1968.hh | 7 --
.../src/aghermann/ui/dirlevel-storable-adapter.hh | 8 --
.../src/aghermann/ui/dirlevel-storable-adapter.ii | 6 --
upstream/src/aghermann/ui/forward-decls.hh | 9 +-
upstream/src/aghermann/ui/globals.cc | 9 --
upstream/src/aghermann/ui/globals.hh | 7 --
upstream/src/aghermann/ui/mf/construct.cc | 8 --
upstream/src/aghermann/ui/mf/mf.cc | 12 ---
upstream/src/aghermann/ui/mf/mf.hh | 9 +-
upstream/src/aghermann/ui/mf/mf_cb.cc | 7 --
upstream/src/aghermann/ui/mf/mf_cb.hh | 9 +-
upstream/src/aghermann/ui/misc.cc | 8 --
upstream/src/aghermann/ui/misc.hh | 7 --
upstream/src/aghermann/ui/mw/admit-one.cc | 9 --
upstream/src/aghermann/ui/mw/admit-one_cb.cc | 8 --
upstream/src/aghermann/ui/mw/construct.cc | 8 --
upstream/src/aghermann/ui/mw/loadsave.cc | 60 ++++++------
upstream/src/aghermann/ui/mw/measurements.cc | 7 --
upstream/src/aghermann/ui/mw/measurements_cb.cc | 7 --
upstream/src/aghermann/ui/mw/mw.cc | 9 --
upstream/src/aghermann/ui/mw/mw.hh | 7 --
upstream/src/aghermann/ui/mw/mw_cb.hh | 8 --
upstream/src/aghermann/ui/mw/populate.cc | 6 +-
upstream/src/aghermann/ui/mw/settings_cb.cc | 7 --
upstream/src/aghermann/ui/mw/simulations.cc | 8 --
upstream/src/aghermann/ui/mw/simulations_cb.cc | 7 --
upstream/src/aghermann/ui/mw/splash.cc | 7 --
upstream/src/aghermann/ui/mw/widgets.hh | 7 --
upstream/src/aghermann/ui/sf/construct.cc | 6 --
upstream/src/aghermann/ui/sf/controls_cb.cc | 7 --
.../src/aghermann/ui/sf/d/artifacts-profiles_cb.cc | 6 --
upstream/src/aghermann/ui/sf/d/artifacts.cc | 8 --
upstream/src/aghermann/ui/sf/d/artifacts.hh | 6 --
upstream/src/aghermann/ui/sf/d/artifacts_cb.cc | 6 --
.../src/aghermann/ui/sf/d/filters-construct.cc | 7 --
upstream/src/aghermann/ui/sf/d/filters.cc | 7 --
upstream/src/aghermann/ui/sf/d/filters.hh | 6 --
upstream/src/aghermann/ui/sf/d/filters_cb.cc | 7 --
upstream/src/aghermann/ui/sf/d/patterns-draw.cc | 8 --
.../src/aghermann/ui/sf/d/patterns-profiles.cc | 7 --
.../src/aghermann/ui/sf/d/patterns-profiles_cb.cc | 9 --
upstream/src/aghermann/ui/sf/d/patterns.cc | 7 --
upstream/src/aghermann/ui/sf/d/patterns.hh | 7 --
upstream/src/aghermann/ui/sf/d/patterns_cb.cc | 9 --
upstream/src/aghermann/ui/sf/d/phasediff.cc | 8 --
upstream/src/aghermann/ui/sf/d/phasediff.hh | 7 --
upstream/src/aghermann/ui/sf/d/phasediff_cb.cc | 8 --
upstream/src/aghermann/ui/sf/d/rk1968-profiles.cc | 8 --
.../src/aghermann/ui/sf/d/rk1968-profiles_cb.cc | 6 --
upstream/src/aghermann/ui/sf/d/rk1968.cc | 9 --
upstream/src/aghermann/ui/sf/d/rk1968.hh | 6 --
upstream/src/aghermann/ui/sf/d/rk1968_cb.cc | 6 --
upstream/src/aghermann/ui/sf/hypnogram.cc | 9 --
upstream/src/aghermann/ui/sf/hypnogram_cb.cc | 7 --
upstream/src/aghermann/ui/sf/ica_cb.cc | 7 --
upstream/src/aghermann/ui/sf/mainmenu_cb.cc | 7 --
upstream/src/aghermann/ui/sf/montage_cb.cc | 2 -
upstream/src/aghermann/ui/sf/sf.hh | 7 --
upstream/src/aghermann/ui/sf/sf_cb.cc | 7 --
upstream/src/aghermann/ui/sf/sf_cb.hh | 8 --
upstream/src/aghermann/ui/sf/widgets.hh | 7 --
upstream/src/aghermann/ui/sm/sm-construct.cc | 7 --
upstream/src/aghermann/ui/sm/sm.hh | 7 --
upstream/src/aghermann/ui/sm/sm_cb.cc | 7 --
upstream/src/aghermann/ui/sm/sm_cb.hh | 8 --
upstream/src/aghermann/ui/ui++.cc | 9 --
upstream/src/aghermann/ui/ui++.hh | 7 --
upstream/src/aghermann/ui/ui-itpp.hh | 7 --
upstream/src/aghermann/ui/ui.cc | 7 --
upstream/src/aghermann/ui/ui.hh | 7 --
upstream/src/common/alg.hh | 7 --
upstream/src/common/config-validate.hh | 7 --
upstream/src/common/containers.hh | 7 --
upstream/src/common/fs.hh | 12 ---
upstream/src/common/lang.hh | 15 +--
upstream/src/common/libcommon.cc | 23 ++---
upstream/src/common/log-facility.cc | 8 --
upstream/src/common/string.hh | 7 --
upstream/src/common/subject_id.hh | 7 --
upstream/src/libmetrics/all.hh | 7 --
upstream/src/libmetrics/bands.hh | 7 --
upstream/src/libmetrics/forward-decls.hh | 8 --
upstream/src/libmetrics/mc-artifacts.cc | 8 --
upstream/src/libmetrics/mc-artifacts.hh | 7 --
upstream/src/libmetrics/mc-artifacts.ii | 8 +-
upstream/src/libmetrics/mc.hh | 21 ++---
upstream/src/libmetrics/page-metrics-base.hh | 7 --
upstream/src/libmetrics/psd.hh | 7 --
upstream/src/libmetrics/swu.cc | 4 -
upstream/src/libmetrics/swu.hh | 11 +--
upstream/src/libsigfile/all.hh | 9 +-
upstream/src/libsigfile/edf.cc | 10 +-
upstream/src/libsigfile/forward-decls.hh | 7 --
upstream/src/libsigfile/page.cc | 7 --
upstream/src/libsigfile/page.hh | 9 --
upstream/src/libsigfile/source-base.cc | 10 --
upstream/src/libsigfile/source-base.hh | 1 -
upstream/src/libsigfile/tsv.hh | 1 -
upstream/src/libsigproc/exstrom.cc | 7 --
upstream/src/libsigproc/exstrom.hh | 23 ++---
upstream/src/libsigproc/ext-filters.cc | 7 --
upstream/src/libsigproc/ext-filters.hh | 11 +--
upstream/src/libsigproc/ext-filters.ii | 4 -
upstream/src/libsigproc/forward-decls.hh | 8 --
upstream/src/libsigproc/sigproc.cc | 12 +--
upstream/src/libsigproc/sigproc.hh | 7 --
upstream/src/libsigproc/sigproc.ii | 21 ++---
upstream/src/libsigproc/winfun.cc | 18 +---
upstream/src/libsigproc/winfun.hh | 8 --
upstream/src/project_strings.h | 7 --
upstream/src/tools/agh-profile-gen.cc | 9 --
upstream/src/tools/edfcat.cc | 17 +---
upstream/src/tools/edfhed-gtk.cc | 50 +++++-----
139 files changed, 187 insertions(+), 1165 deletions(-)
diff --git a/upstream/src/aghermann/artifact-detection/3in1.hh b/upstream/src/aghermann/artifact-detection/3in1.hh
index 8794729..3860d85 100644
--- a/upstream/src/aghermann/artifact-detection/3in1.hh
+++ b/upstream/src/aghermann/artifact-detection/3in1.hh
@@ -142,9 +142,3 @@ detect_artifacts( sigfile::CSource& E,
}}
#endif
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/artifact-detection/forward-decls.hh b/upstream/src/aghermann/artifact-detection/forward-decls.hh
index 13db3e6..d01df51 100644
--- a/upstream/src/aghermann/artifact-detection/forward-decls.hh
+++ b/upstream/src/aghermann/artifact-detection/forward-decls.hh
@@ -22,10 +22,3 @@ class CComprehensiveArtifactDetector;
}} // namespace agh::ad
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/expdesign/dirlevel.hh b/upstream/src/aghermann/expdesign/dirlevel.hh
index e9f8d43..2ef8929 100644
--- a/upstream/src/aghermann/expdesign/dirlevel.hh
+++ b/upstream/src/aghermann/expdesign/dirlevel.hh
@@ -142,10 +142,3 @@ int simple_scandir_filter( const struct dirent*);
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/expdesign/forward-decls.hh b/upstream/src/aghermann/expdesign/forward-decls.hh
index 3f9f702..106dd0f 100644
--- a/upstream/src/aghermann/expdesign/forward-decls.hh
+++ b/upstream/src/aghermann/expdesign/forward-decls.hh
@@ -30,10 +30,3 @@ class CProfile;
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/expdesign/loadsave.cc b/upstream/src/aghermann/expdesign/loadsave.cc
index 2e42b7f..7ef6b6d 100644
--- a/upstream/src/aghermann/expdesign/loadsave.cc
+++ b/upstream/src/aghermann/expdesign/loadsave.cc
@@ -123,11 +123,3 @@ save_settings()
return 0;
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/expdesign/profile.hh b/upstream/src/aghermann/expdesign/profile.hh
index c00f805..f7f2c99 100644
--- a/upstream/src/aghermann/expdesign/profile.hh
+++ b/upstream/src/aghermann/expdesign/profile.hh
@@ -158,8 +158,6 @@ CProfile::nth_episode_end_page( size_t n) const
}
-
-
} // namespace agh
#endif
diff --git a/upstream/src/aghermann/expdesign/recording.cc b/upstream/src/aghermann/expdesign/recording.cc
index 2a759a1..5c2dbe5 100644
--- a/upstream/src/aghermann/expdesign/recording.cc
+++ b/upstream/src/aghermann/expdesign/recording.cc
@@ -338,11 +338,3 @@ create_timeline()
_SWA_100 /= _pages_with_SWA;
}
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/expdesign/subject.cc b/upstream/src/aghermann/expdesign/subject.cc
index d421f21..80b4902 100644
--- a/upstream/src/aghermann/expdesign/subject.cc
+++ b/upstream/src/aghermann/expdesign/subject.cc
@@ -124,13 +124,3 @@ operator[]( const string& e)
// CExpDesign::add_measurement, when
// episode start/end times are known
}
-
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/globals.cc b/upstream/src/aghermann/globals.cc
index 687b5ba..fe43580 100644
--- a/upstream/src/aghermann/globals.cc
+++ b/upstream/src/aghermann/globals.cc
@@ -94,12 +94,3 @@ log( agh::log::TLevel level, const char* issuer, const char* fmt, ...)
default_log_facility -> vmsg( level, issuer, fmt, ap);
va_end (ap);
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ica/forward-decls.hh b/upstream/src/aghermann/ica/forward-decls.hh
index 6f92206..e3c43a1 100644
--- a/upstream/src/aghermann/ica/forward-decls.hh
+++ b/upstream/src/aghermann/ica/forward-decls.hh
@@ -19,10 +19,3 @@ class CFastICA;
}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ica/ica.hh b/upstream/src/aghermann/ica/ica.hh
index 6d4eb35..1e7c064 100644
--- a/upstream/src/aghermann/ica/ica.hh
+++ b/upstream/src/aghermann/ica/ica.hh
@@ -130,14 +130,6 @@ class CFastICA {
_obj;
};
-
}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/main.cc b/upstream/src/aghermann/main.cc
index 2c24253..9526c24 100644
--- a/upstream/src/aghermann/main.cc
+++ b/upstream/src/aghermann/main.cc
@@ -148,10 +148,3 @@ print_usage( const char* argv0)
printf( "Usage: %s [-n] [-l log_file] [exp_root_dir]\n", argv0);
}
} // namespace
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/achermann-siman.cc b/upstream/src/aghermann/model/achermann-siman.cc
index c2a86dd..a805a77 100644
--- a/upstream/src/aghermann/model/achermann-siman.cc
+++ b/upstream/src/aghermann/model/achermann-siman.cc
@@ -160,13 +160,3 @@ watch_simplex_move( void (*printer)(void*))
status |= modrun_tried;
return 0;
}
-
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/achermann-tunable.cc b/upstream/src/aghermann/model/achermann-tunable.cc
index 065b32f..32ef858 100644
--- a/upstream/src/aghermann/model/achermann-tunable.cc
+++ b/upstream/src/aghermann/model/achermann-tunable.cc
@@ -246,11 +246,3 @@ randomise()
if ( d[t] > 0. )
P[t] = l[t] + gsl_rng_uniform( agh::global::rng) * range( (TTunable)t);
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/achermann-tunable.hh b/upstream/src/aghermann/model/achermann-tunable.hh
index 9bd5282..657c063 100644
--- a/upstream/src/aghermann/model/achermann-tunable.hh
+++ b/upstream/src/aghermann/model/achermann-tunable.hh
@@ -185,10 +185,3 @@ struct STunableSetWithState
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/achermann.cc b/upstream/src/aghermann/model/achermann.cc
index ada28ac..a061300 100644
--- a/upstream/src/aghermann/model/achermann.cc
+++ b/upstream/src/aghermann/model/achermann.cc
@@ -22,14 +22,14 @@ void
agh::ach::SControlParamSet::
check() const
{
- if ( siman_params.n_tries < 1 ||
+ if ( siman_params.n_tries < 1 ||
siman_params.iters_fixed_T < 1 ||
- siman_params.step_size <= 0. ||
- siman_params.k <= 0. ||
- siman_params.t_initial <= 0. ||
- siman_params.t_min <= 0. ||
- siman_params.t_min >= siman_params.t_initial ||
- siman_params.mu_t <= 0 )
+ siman_params.step_size <= 0. ||
+ siman_params.k <= 0. ||
+ siman_params.t_initial <= 0. ||
+ siman_params.t_min <= 0. ||
+ siman_params.t_min >= siman_params.t_initial ||
+ siman_params.mu_t <= 0 )
throw invalid_argument("Bad SControlParamSet");
}
@@ -37,18 +37,18 @@ void
agh::ach::SControlParamSet::
reset()
{
- siman_params.n_tries = 20;
- siman_params.iters_fixed_T = 10;
- siman_params.step_size = 3.;
- siman_params.k = 1.0;
- siman_params.t_initial = 200.;
- siman_params.mu_t = 1.003;
- siman_params.t_min = 1.;
-
- DBAmendment1 = true;
- DBAmendment2 = false;
- AZAmendment1 = false;
- AZAmendment2 = false;
+ siman_params.n_tries = 20;
+ siman_params.iters_fixed_T = 10;
+ siman_params.step_size = 3.;
+ siman_params.k = 1.0;
+ siman_params.t_initial = 200.;
+ siman_params.mu_t = 1.003;
+ siman_params.t_min = 1.;
+
+ DBAmendment1 = true;
+ DBAmendment2 = false;
+ AZAmendment1 = false;
+ AZAmendment2 = false;
}
@@ -58,7 +58,7 @@ __attribute__ ((pure))
agh::ach::SControlParamSet::
operator==( const SControlParamSet &rv) const
{
- return memcmp( &siman_params, &rv.siman_params, sizeof(siman_params)) == 0 &&
+ return memcmp( &siman_params, &rv.siman_params, sizeof(siman_params)) == 0 &&
DBAmendment1 == rv.DBAmendment1 &&
DBAmendment2 == rv.DBAmendment2 &&
AZAmendment1 == rv.AZAmendment1 &&
@@ -154,7 +154,7 @@ void
agh::ach::CModelRun::
_restore_scores_and_extend_rem( size_t da, size_t dz)
{
- size_t a = da,
+ size_t a = da,
z = _timeline.size() - dz,
p, pi, di;
@@ -215,49 +215,49 @@ snapshot()
double _fit = 0.;
#define CF_CYCLE_COMMON_DB1 \
- int WT = (_timeline[p].Wake > 0.33); \
- TFloat pS = _timeline[p].S / _tset[TTunable::SU]; \
- TFloat pSWA = \
- _tset[TTunable::rc] * _timeline[p].metric_sim * pS \
- * (1. - _timeline[p].metric_sim / _timeline[p].S) \
- * (1. - _timeline[p].Wake); \
- _timeline[p+1].metric_sim = \
- _timeline[p].metric_sim \
- + pSWA \
+ int WT = (_timeline[p].Wake > 0.33); \
+ TFloat pS = _timeline[p].S / _tset[TTunable::SU]; \
+ TFloat pSWA = \
+ _tset[TTunable::rc] * _timeline[p].metric_sim * pS \
+ * (1. - _timeline[p].metric_sim / _timeline[p].S) \
+ * (1. - _timeline[p].Wake); \
+ _timeline[p+1].metric_sim = \
+ _timeline[p].metric_sim \
+ + pSWA \
- _tset[TTunable::fcR] * (_timeline[p].metric_sim - _SWA_L) * _timeline[p].REM \
- _tset[TTunable::fcW] * (_timeline[p].metric_sim - _SWA_L) * _timeline[p].Wake; \
\
- _timeline[p+1].S = \
- _timeline[p].S + ( WT \
- ? 0 \
+ _timeline[p+1].S = \
+ _timeline[p].S + ( WT \
+ ? 0 \
: (-_which_gc(p) * _timeline[p].metric_sim) ) \
+ (_tset[TTunable::SU] - _timeline[p].S) * _tset[TTunable::rs]; \
\
- if ( _timeline[p].has_swa() ) \
+ if ( _timeline[p].has_swa() ) \
_fit += gsl_pow_2( _timeline[p].metric - _timeline[p].metric_sim); \
- if ( _timeline[p].S < 0 ) \
+ if ( _timeline[p].S < 0 ) \
_fit += 1e9;
#define CF_CYCLE_COMMON_NODB1 \
- int WT = (_timeline[p].Wake > 0.33); \
- double pS = _timeline[p].S / _tset[TTunable::SU]; \
- double pSWA = \
+ int WT = (_timeline[p].Wake > 0.33); \
+ double pS = _timeline[p].S / _tset[TTunable::SU]; \
+ double pSWA = \
_tset[TTunable::rc] * _timeline[p].metric_sim * pS * (1. - _timeline[p].metric_sim / _timeline[p].S); \
- _timeline[p+1].metric_sim = \
- _timeline[p].metric_sim \
- + pSWA \
+ _timeline[p+1].metric_sim = \
+ _timeline[p].metric_sim \
+ + pSWA \
- _tset[TTunable::fcR] * (_timeline[p].metric_sim - _SWA_L) * _timeline[p].REM \
- _tset[TTunable::fcW] * (_timeline[p].metric_sim - _SWA_L) * _timeline[p].Wake; \
\
- _timeline[p+1].S = \
- _timeline[p].S + ( WT \
- ? 0 \
+ _timeline[p+1].S = \
+ _timeline[p].S + ( WT \
+ ? 0 \
: (-_which_gc(p) * _timeline[p].metric_sim) ) \
+ (_tset[TTunable::SU] - _timeline[p].S) * _tset[TTunable::rs]; \
\
- if ( _timeline[p].has_swa() ) \
+ if ( _timeline[p].has_swa() ) \
_fit += gsl_pow_2( _timeline[p].metric - _timeline[p].metric_sim); \
- if ( _timeline[p].S < 0 ) \
+ if ( _timeline[p].S < 0 ) \
_fit += 1e9;
// define end
@@ -291,13 +291,3 @@ snapshot()
return cf = sqrt( _fit/_pages_with_SWA);
}
-
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/beersma.hh b/upstream/src/aghermann/model/beersma.hh
index ab2bdc6..2477164 100644
--- a/upstream/src/aghermann/model/beersma.hh
+++ b/upstream/src/aghermann/model/beersma.hh
@@ -150,10 +150,10 @@ class FUltradianCycle
};
// struct SUltradianCycleWeightedData {
-// size_t n;
-// double *y,
-// *sigma;
-// int pagesize;
+// size_t n;
+// double *y,
+// *sigma;
+// int pagesize;
// };
@@ -171,10 +171,3 @@ analyse_deeper( const SUltradianCycle&,
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/borbely.cc b/upstream/src/aghermann/model/borbely.cc
index b6b5fd8..5113066 100644
--- a/upstream/src/aghermann/model/borbely.cc
+++ b/upstream/src/aghermann/model/borbely.cc
@@ -57,7 +57,7 @@ expb_df( const gsl_vector* x, void* data,
{
auto& D = *(agh::beersma::SClassicFitWeightedData*)data;
- double r = gsl_vector_get( x, 0);
+ double r = gsl_vector_get( x, 0);
for ( size_t i = 0; i < D.n; ++i ) {
/* Jacobian matrix J(i,j) = dfi / dxj, */
@@ -65,7 +65,7 @@ expb_df( const gsl_vector* x, void* data,
/* Yi = A * exp(-lambda * i) + b */
/* and the xj are the parameters (A,lambda,b) */
// except that we have A = 1 here...
- double t = (i * D.pagesize) / 60.,
+ double t = (i * D.pagesize) / 60.,
s = D.sigma[i],
e = exp(-r * t);
// gsl_matrix_set( J, i, 0, e/s);
@@ -97,7 +97,6 @@ classic_fit( agh::CRecording& M,
auto pp = course.size(),
pagesize = M.pagesize();
-
// determine A (SWA_0) and b (SWA_L)
double SWA_0, SWA_L;
{
@@ -177,17 +176,6 @@ classic_fit( agh::CRecording& M,
} while ( iter < P.iterations );
gsl_multifit_covar( S->J, 0.0, covar);
-
-// #define FIT(i) gsl_vector_get( S->x, i)
-// #define ERR(i) sqrt(gsl_matrix_get( covar, i, i))
-// {
-// double chi = gsl_blas_dnrm2(S->f);
-// double dof = pp - 1;
-// double c = GSL_MAX_DBL(1, chi / sqrt(dof));
-
-// APPLOG_DEBUG ("chisq/dof = %g", gsl_pow_2(chi) / dof);
-// APPLOG_DEBUG ("r = %.5f +/- %.5f", FIT(0), c*ERR(0));
-// }
#endif
const double rate = gsl_vector_get( S->x, 0);
diff --git a/upstream/src/aghermann/model/forward-decls.hh b/upstream/src/aghermann/model/forward-decls.hh
index 3597cbc..c9546e7 100644
--- a/upstream/src/aghermann/model/forward-decls.hh
+++ b/upstream/src/aghermann/model/forward-decls.hh
@@ -39,10 +39,3 @@ namespace agh {
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/model/ultradian-cycle.cc b/upstream/src/aghermann/model/ultradian-cycle.cc
index ee330e4..c532f62 100644
--- a/upstream/src/aghermann/model/ultradian-cycle.cc
+++ b/upstream/src/aghermann/model/ultradian-cycle.cc
@@ -214,11 +214,3 @@ analyse_deeper( const SUltradianCycle&,
return move(ret);
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/patterns/forward-decls.hh b/upstream/src/aghermann/patterns/forward-decls.hh
index 546deed..7cc22ed 100644
--- a/upstream/src/aghermann/patterns/forward-decls.hh
+++ b/upstream/src/aghermann/patterns/forward-decls.hh
@@ -23,12 +23,4 @@ template <typename T> struct SPattern;
}
}
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/patterns/patterns.cc b/upstream/src/aghermann/patterns/patterns.cc
index 4adb42e..44ad74f 100644
--- a/upstream/src/aghermann/patterns/patterns.cc
+++ b/upstream/src/aghermann/patterns/patterns.cc
@@ -26,10 +26,16 @@ using namespace agh::pattern;
namespace agh {
namespace pattern {
-template CPatternTool<TFloat>::CPatternTool( const sigproc::SSignalRef<TFloat>&, const TContext&, const SPatternPPack<TFloat>&);
-template int CPatternTool<TFloat>::do_search( const valarray<TFloat>&, const valarray<TFloat>&, const valarray<TFloat>&, const valarray<TFloat>&, size_t);
-template int CPatternTool<TFloat>::do_search( const sigproc::SSignalRef<TFloat>&, size_t);
-template int CPatternTool<TFloat>::do_search( const valarray<TFloat>&, size_t);
+template CPatternTool<TFloat>::CPatternTool(
+ const sigproc::SSignalRef<TFloat>&,
+ const TContext&, const SPatternPPack<TFloat>&);
+template int CPatternTool<TFloat>::do_search(
+ const valarray<TFloat>&, const valarray<TFloat>&,
+ const valarray<TFloat>&, const valarray<TFloat>&, size_t);
+template int CPatternTool<TFloat>::do_search(
+ const sigproc::SSignalRef<TFloat>&, size_t);
+template int CPatternTool<TFloat>::do_search(
+ const valarray<TFloat>&, size_t);
@@ -235,10 +241,3 @@ SPattern (const string& name_, TExpDirLevel level_, CExpDesign& ED_, const SExpD
}
} // namespace agh::pattern
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/patterns/patterns.hh b/upstream/src/aghermann/patterns/patterns.hh
index 590bf27..aca56ef 100644
--- a/upstream/src/aghermann/patterns/patterns.hh
+++ b/upstream/src/aghermann/patterns/patterns.hh
@@ -285,12 +285,4 @@ class CPatternTool
}
} // namespace agh::pattern
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/patterns/patterns.ii b/upstream/src/aghermann/patterns/patterns.ii
index eac2a20..37d3542 100644
--- a/upstream/src/aghermann/patterns/patterns.ii
+++ b/upstream/src/aghermann/patterns/patterns.ii
@@ -9,10 +9,16 @@
* License: GPL
*/
-extern template CPatternTool<TFloat>::CPatternTool( const sigproc::SSignalRef<TFloat>&, const TContext&, const SPatternPPack&);
-extern template int CPatternTool<TFloat>::do_search( const valarray<TFloat>&, const valarray<TFloat>&, const valarray<TFloat>&, const valarray<TFloat>&, size_t);
-extern template int CPatternTool<TFloat>::do_search( const sigproc::SSignalRef<TFloat>&, size_t);
-extern template int CPatternTool<TFloat>::do_search( const valarray<TFloat>&, size_t);
+extern template CPatternTool<TFloat>::CPatternTool(
+ const sigproc::SSignalRef<TFloat>&,
+ const TContext&, const SPatternPPack&);
+extern template int CPatternTool<TFloat>::do_search(
+ const valarray<TFloat>&, const valarray<TFloat>&,
+ const valarray<TFloat>&, const valarray<TFloat>&, size_t);
+extern template int CPatternTool<TFloat>::do_search(
+ const sigproc::SSignalRef<TFloat>&, size_t);
+extern template int CPatternTool<TFloat>::do_search(
+ const valarray<TFloat>&, size_t);
template <typename T>
@@ -118,10 +124,5 @@ do_search( const valarray<T>& signal,
inc);
}
-
// Local Variables:
// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/print_version.cc b/upstream/src/aghermann/print_version.cc
index b23c201..5573ddc 100644
--- a/upstream/src/aghermann/print_version.cc
+++ b/upstream/src/aghermann/print_version.cc
@@ -21,10 +21,3 @@ print_version()
printf( PACKAGE_STRING " built " __DATE__ " " __TIME__ " by " BUILT_BY "\n");
#endif
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/rk1968/rk1968-profiles.cc b/upstream/src/aghermann/rk1968/rk1968-profiles.cc
index b17deba..939a86e 100644
--- a/upstream/src/aghermann/rk1968/rk1968-profiles.cc
+++ b/upstream/src/aghermann/rk1968/rk1968-profiles.cc
@@ -21,13 +21,3 @@
using namespace std;
using namespace agh::rk1968;
-
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/rk1968/rk1968.hh b/upstream/src/aghermann/rk1968/rk1968.hh
index 955bea9..d4d4fe0 100644
--- a/upstream/src/aghermann/rk1968/rk1968.hh
+++ b/upstream/src/aghermann/rk1968/rk1968.hh
@@ -162,10 +162,3 @@ emg_steady_tone( const sigproc::SSignalRef<T>& V, size_t steady_secs, double max
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh b/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
index 4ed50ae..efe0097 100644
--- a/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
+++ b/upstream/src/aghermann/ui/dirlevel-storable-adapter.hh
@@ -105,12 +105,4 @@ class SDirlevelStorableAdapter {
#include "dirlevel-storable-adapter.ii"
-
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// End:
diff --git a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
index 817cec3..e7be6a7 100644
--- a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
+++ b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii
@@ -345,13 +345,7 @@ bXProfileRevert_clicked_cb()
set_profile_manage_buttons_visibility();
}
-
}}
-
// Local Variables:
// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/forward-decls.hh b/upstream/src/aghermann/ui/forward-decls.hh
index 7ab4151..70d0f56 100644
--- a/upstream/src/aghermann/ui/forward-decls.hh
+++ b/upstream/src/aghermann/ui/forward-decls.hh
@@ -22,13 +22,6 @@ class SScoringFacility;
class SModelrunFacility;
}
-} // namespace agh::ui
+}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/globals.cc b/upstream/src/aghermann/ui/globals.cc
index c829339..ada0f06 100644
--- a/upstream/src/aghermann/ui/globals.cc
+++ b/upstream/src/aghermann/ui/globals.cc
@@ -78,12 +78,3 @@ prepare_for_expdesign()
return 0;
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/globals.hh b/upstream/src/aghermann/ui/globals.hh
index 20e4665..f4ecaaf 100644
--- a/upstream/src/aghermann/ui/globals.hh
+++ b/upstream/src/aghermann/ui/globals.hh
@@ -70,10 +70,3 @@ int prepare_for_expdesign();
} // namespace agh::ui::global
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mf/construct.cc b/upstream/src/aghermann/ui/mf/construct.cc
index dd6f983..bf7b9d1 100644
--- a/upstream/src/aghermann/ui/mf/construct.cc
+++ b/upstream/src/aghermann/ui/mf/construct.cc
@@ -111,11 +111,3 @@ construct_widgets()
return 0;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/mf/mf.cc b/upstream/src/aghermann/ui/mf/mf.cc
index 0e26b97..0db8769 100644
--- a/upstream/src/aghermann/ui/mf/mf.cc
+++ b/upstream/src/aghermann/ui/mf/mf.cc
@@ -389,9 +389,6 @@ draw_ticks( cairo_t *cr,
-
-
-
void
SModelrunFacility::
update_infobar()
@@ -410,12 +407,3 @@ update_infobar()
lMFCostFunction,
snprintf_buf( "CF = <b>%6g</b>\n", cf));
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mf/mf.hh b/upstream/src/aghermann/ui/mf/mf.hh
index 403c0f3..32335c6 100644
--- a/upstream/src/aghermann/ui/mf/mf.hh
+++ b/upstream/src/aghermann/ui/mf/mf.hh
@@ -119,11 +119,4 @@ struct SModelrunFacility {
}
} // namespace agh::ui
-#endif // _AGH_UI_MODELRUN_FACILITY_H
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
+#endif
diff --git a/upstream/src/aghermann/ui/mf/mf_cb.cc b/upstream/src/aghermann/ui/mf/mf_cb.cc
index 116d958..cc327c7 100644
--- a/upstream/src/aghermann/ui/mf/mf_cb.cc
+++ b/upstream/src/aghermann/ui/mf/mf_cb.cc
@@ -427,10 +427,3 @@ wModelrunFacility_delete_event_cb(
}
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mf/mf_cb.hh b/upstream/src/aghermann/ui/mf/mf_cb.hh
index 7180917..ddbd636 100644
--- a/upstream/src/aghermann/ui/mf/mf_cb.hh
+++ b/upstream/src/aghermann/ui/mf/mf_cb.hh
@@ -46,11 +46,4 @@ gboolean wModelrunFacility_delete_event_cb( GtkWidget*, GdkEvent*, gpointer);
} // extern "C"
-#endif // _AGH_UI_MODELRUN_FACILITY_CB_H
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
+#endif
diff --git a/upstream/src/aghermann/ui/misc.cc b/upstream/src/aghermann/ui/misc.cc
index 9124163..6812a45 100644
--- a/upstream/src/aghermann/ui/misc.cc
+++ b/upstream/src/aghermann/ui/misc.cc
@@ -90,11 +90,3 @@ snprintf_buf_ts_s( const double s_)
snprintf_buf( "%.2gs", s_);
return global::buf;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/misc.hh b/upstream/src/aghermann/ui/misc.hh
index 3b88a13..71c0ed1 100644
--- a/upstream/src/aghermann/ui/misc.hh
+++ b/upstream/src/aghermann/ui/misc.hh
@@ -51,10 +51,3 @@ const char* snprintf_buf_ts_s( double s);
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/admit-one.cc b/upstream/src/aghermann/ui/mw/admit-one.cc
index 7cd905c..1a3868a 100644
--- a/upstream/src/aghermann/ui/mw/admit-one.cc
+++ b/upstream/src/aghermann/ui/mw/admit-one.cc
@@ -199,12 +199,3 @@ dnd_maybe_admit_one( const char* fname)
return 0;
}
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/mw/admit-one_cb.cc b/upstream/src/aghermann/ui/mw/admit-one_cb.cc
index cb6107f..3b6abe8 100644
--- a/upstream/src/aghermann/ui/mw/admit-one_cb.cc
+++ b/upstream/src/aghermann/ui/mw/admit-one_cb.cc
@@ -134,11 +134,3 @@ cMeasurements_drag_drop_cb(
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/mw/construct.cc b/upstream/src/aghermann/ui/mw/construct.cc
index 1a01249..92059c0 100644
--- a/upstream/src/aghermann/ui/mw/construct.cc
+++ b/upstream/src/aghermann/ui/mw/construct.cc
@@ -738,11 +738,3 @@ set_controls_for_empty_experiment( bool indeed, const bool flush)
if ( flush )
gtk_flush();
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/loadsave.cc b/upstream/src/aghermann/ui/mw/loadsave.cc
index a286698..81eff36 100644
--- a/upstream/src/aghermann/ui/mw/loadsave.cc
+++ b/upstream/src/aghermann/ui/mw/loadsave.cc
@@ -30,27 +30,27 @@ saving_colors()
return move(
forward_list<pair<const char*, SExpDesignUI::TColour>>
({
- {"MWNight", SExpDesignUI::TColour::mw_night},
- {"MWDay", SExpDesignUI::TColour::mw_day},
- {"MWTicks", SExpDesignUI::TColour::mw_ticks},
- {"MWLabels", SExpDesignUI::TColour::mw_labels},
- {"MWProfile", SExpDesignUI::TColour::mw_profile},
-
- {"ScoreNONE", SExpDesignUI::TColour::score_none},
- {"ScorNeREM1", SExpDesignUI::TColour::score_nrem1},
- {"ScoreNREM2", SExpDesignUI::TColour::score_nrem2},
- {"ScoreNREM3", SExpDesignUI::TColour::score_nrem3},
- {"ScoreNREM4", SExpDesignUI::TColour::score_nrem4},
- {"ScoreREM", SExpDesignUI::TColour::score_rem},
- {"ScoreWake", SExpDesignUI::TColour::score_wake},
-
- {"SFProfilePSD", SExpDesignUI::TColour::sf_profile_psd},
- {"SFProfileSWU", SExpDesignUI::TColour::sf_profile_swu},
- {"SFProfileMC", SExpDesignUI::TColour::sf_profile_mc},
-
- {"SFPhasicSpindle", SExpDesignUI::TColour::sf_phasic_spindle},
- {"SFPhasicKComplex", SExpDesignUI::TColour::sf_phasic_Kcomplex},
- {"SFPhasicEyeBlink", SExpDesignUI::TColour::sf_phasic_eyeblink},
+ {"MWNight", SExpDesignUI::TColour::mw_night},
+ {"MWDay", SExpDesignUI::TColour::mw_day},
+ {"MWTicks", SExpDesignUI::TColour::mw_ticks},
+ {"MWLabels", SExpDesignUI::TColour::mw_labels},
+ {"MWProfile", SExpDesignUI::TColour::mw_profile},
+
+ {"ScoreNONE", SExpDesignUI::TColour::score_none},
+ {"ScorNeREM1", SExpDesignUI::TColour::score_nrem1},
+ {"ScoreNREM2", SExpDesignUI::TColour::score_nrem2},
+ {"ScoreNREM3", SExpDesignUI::TColour::score_nrem3},
+ {"ScoreNREM4", SExpDesignUI::TColour::score_nrem4},
+ {"ScoreREM", SExpDesignUI::TColour::score_rem},
+ {"ScoreWake", SExpDesignUI::TColour::score_wake},
+
+ {"SFProfilePSD", SExpDesignUI::TColour::sf_profile_psd},
+ {"SFProfileSWU", SExpDesignUI::TColour::sf_profile_swu},
+ {"SFProfileMC", SExpDesignUI::TColour::sf_profile_mc},
+
+ {"SFPhasicSpindle", SExpDesignUI::TColour::sf_phasic_spindle},
+ {"SFPhasicKComplex", SExpDesignUI::TColour::sf_phasic_Kcomplex},
+ {"SFPhasicEyeBlink", SExpDesignUI::TColour::sf_phasic_eyeblink},
{"SFEMG", SExpDesignUI::TColour::sf_emg},
{"SFHypnogram", SExpDesignUI::TColour::sf_hypnogram},
@@ -62,11 +62,11 @@ saving_colors()
{"SFLabels", SExpDesignUI::TColour::sf_labels},
{"SFCursor", SExpDesignUI::TColour::sf_cursor},
- {"BandDelta", SExpDesignUI::TColour::band_delta},
- {"BandTheta", SExpDesignUI::TColour::band_theta},
- {"BandAlpha", SExpDesignUI::TColour::band_alpha},
- {"BandBeta", SExpDesignUI::TColour::band_beta},
- {"BandGamma", SExpDesignUI::TColour::band_gamma},
+ {"BandDelta", SExpDesignUI::TColour::band_delta},
+ {"BandTheta", SExpDesignUI::TColour::band_theta},
+ {"BandAlpha", SExpDesignUI::TColour::band_alpha},
+ {"BandBeta", SExpDesignUI::TColour::band_beta},
+ {"BandGamma", SExpDesignUI::TColour::band_gamma},
{"MFSWA", SExpDesignUI::TColour::mf_swa},
{"MFSWASim", SExpDesignUI::TColour::mf_swa_sim},
@@ -173,11 +173,3 @@ save_settings()
return 0;
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/measurements.cc b/upstream/src/aghermann/ui/mw/measurements.cc
index 9317dc8..bd66d39 100644
--- a/upstream/src/aghermann/ui/mw/measurements.cc
+++ b/upstream/src/aghermann/ui/mw/measurements.cc
@@ -329,10 +329,3 @@ modify_profile_scales( const GdkScrollDirection d)
profile_scale_swu *= fac;
profile_scale_mc *= fac;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/measurements_cb.cc b/upstream/src/aghermann/ui/mw/measurements_cb.cc
index 19fea62..5fcb56b 100644
--- a/upstream/src/aghermann/ui/mw/measurements_cb.cc
+++ b/upstream/src/aghermann/ui/mw/measurements_cb.cc
@@ -297,10 +297,3 @@ iSubjectTimelineResetMontage_activate_cb(
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/mw.cc b/upstream/src/aghermann/ui/mw/mw.cc
index b821d64..efadf73 100644
--- a/upstream/src/aghermann/ui/mw/mw.cc
+++ b/upstream/src/aghermann/ui/mw/mw.cc
@@ -532,12 +532,3 @@ sb_main_progress_indicator( const string& current,
break;
}
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/mw.hh b/upstream/src/aghermann/ui/mw/mw.hh
index 7927191..723f4a2 100644
--- a/upstream/src/aghermann/ui/mw/mw.hh
+++ b/upstream/src/aghermann/ui/mw/mw.hh
@@ -388,10 +388,3 @@ SExpDesignUI::AghDi() const
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/mw_cb.hh b/upstream/src/aghermann/ui/mw/mw_cb.hh
index 2ec66c3..b9ba656 100644
--- a/upstream/src/aghermann/ui/mw/mw_cb.hh
+++ b/upstream/src/aghermann/ui/mw/mw_cb.hh
@@ -114,11 +114,3 @@ void bMainCloseThatSF_clicked_cb( GtkButton*, gpointer);
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/mw/populate.cc b/upstream/src/aghermann/ui/mw/populate.cc
index f47b73f..03dea12 100644
--- a/upstream/src/aghermann/ui/mw/populate.cc
+++ b/upstream/src/aghermann/ui/mw/populate.cc
@@ -413,7 +413,7 @@ populate_1()
APPLOG_INFO ("populate_1(): session \"%s\", channel \"%s\"", AghD(), AghT());
- time_t earliest_start = (time_t)-1,
+ time_t earliest_start = (time_t)-1,
latest_end = (time_t)-1;
// first pass: (1) create SSubjectPresentation's
// (2) determine common timeline
@@ -435,8 +435,8 @@ populate_1()
j.admission_date = ee.front().start_time();
} else
- fprintf( stderr, "SExpDesignUI::populate_1(): session \"%s\", channel \"%s\" for subject \"%s\" is empty\n",
- AghD(), AghT(), J.id.c_str());
+ APPLOG_WARN ("SExpDesignUI::populate_1(): session \"%s\", channel \"%s\" for subject \"%s\" is empty\n",
+ AghD(), AghT(), J.id.c_str());
}
}
}
diff --git a/upstream/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
index 4ea202b..17b0c22 100644
--- a/upstream/src/aghermann/ui/mw/settings_cb.cc
+++ b/upstream/src/aghermann/ui/mw/settings_cb.cc
@@ -291,10 +291,3 @@ bColourX_color_set_cb(
}
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/simulations.cc b/upstream/src/aghermann/ui/mw/simulations.cc
index 67db89c..de25387 100644
--- a/upstream/src/aghermann/ui/mw/simulations.cc
+++ b/upstream/src/aghermann/ui/mw/simulations.cc
@@ -150,11 +150,3 @@ cleanup_2()
ED->prune_untried_modruns();
//populate( false);
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/simulations_cb.cc b/upstream/src/aghermann/ui/mw/simulations_cb.cc
index 4a269ce..3d4de07 100644
--- a/upstream/src/aghermann/ui/mw/simulations_cb.cc
+++ b/upstream/src/aghermann/ui/mw/simulations_cb.cc
@@ -222,10 +222,3 @@ iSimulationsReportGenerate_activate_cb(
// }
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/splash.cc b/upstream/src/aghermann/ui/mw/splash.cc
index c38a0cc..943ca9e 100644
--- a/upstream/src/aghermann/ui/mw/splash.cc
+++ b/upstream/src/aghermann/ui/mw/splash.cc
@@ -181,10 +181,3 @@ try_download()
return 0;
}
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/mw/widgets.hh b/upstream/src/aghermann/ui/mw/widgets.hh
index 6308d0e..c59e755 100644
--- a/upstream/src/aghermann/ui/mw/widgets.hh
+++ b/upstream/src/aghermann/ui/mw/widgets.hh
@@ -418,10 +418,3 @@ struct SExpDesignUIWidgets {
} // namespace agh::ui
#endif // _AGHUI_EXPDESIGN_WIDGETS_H
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/construct.cc b/upstream/src/aghermann/ui/sf/construct.cc
index fe785a6..3d329ec 100644
--- a/upstream/src/aghermann/ui/sf/construct.cc
+++ b/upstream/src/aghermann/ui/sf/construct.cc
@@ -352,9 +352,3 @@ SScoringFacilityWidgets::
gtk_widget_destroy( (GtkWidget*)wSF);
g_object_unref( (GObject*)builder);
}
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/controls_cb.cc b/upstream/src/aghermann/ui/sf/controls_cb.cc
index 37af65a..ab52832 100644
--- a/upstream/src/aghermann/ui/sf/controls_cb.cc
+++ b/upstream/src/aghermann/ui/sf/controls_cb.cc
@@ -187,10 +187,3 @@ bSFDrawCrosshair_toggled_cb(
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/artifacts-profiles_cb.cc
index 0c606cd..54d1b6b 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts-profiles_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts-profiles_cb.cc
@@ -89,9 +89,3 @@ eSFAD_any_profile_origin_toggled_cb(
} // extern "C"
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts.cc b/upstream/src/aghermann/ui/sf/d/artifacts.cc
index 9079c5d..b318999 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts.cc
@@ -186,11 +186,3 @@ SScoringFacility::SArtifactsDialog::
g_object_unref( (GObject*)mSFADProfiles);
g_object_unref( (GObject*)builder);
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts.hh b/upstream/src/aghermann/ui/sf/d/artifacts.hh
index 639d60b..77f3bd9 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts.hh
+++ b/upstream/src/aghermann/ui/sf/d/artifacts.hh
@@ -179,9 +179,3 @@ void bSFADDismiss_clicked_cb( GtkButton*, gpointer);
}
#endif
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc b/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
index eeb2a7e..419cfb8 100644
--- a/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/artifacts_cb.cc
@@ -323,9 +323,3 @@ bSFADPreview_toggled_cb(
}
}
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/filters-construct.cc b/upstream/src/aghermann/ui/sf/d/filters-construct.cc
index 2c69ce4..cafd105 100644
--- a/upstream/src/aghermann/ui/sf/d/filters-construct.cc
+++ b/upstream/src/aghermann/ui/sf/d/filters-construct.cc
@@ -51,10 +51,3 @@ SFiltersDialogWidgets::
gtk_widget_destroy( (GtkWidget*)wSFFilters);
g_object_unref( (GObject*)builder);
}
-
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/filters.cc b/upstream/src/aghermann/ui/sf/d/filters.cc
index f894ae4..565d1e7 100644
--- a/upstream/src/aghermann/ui/sf/d/filters.cc
+++ b/upstream/src/aghermann/ui/sf/d/filters.cc
@@ -35,10 +35,3 @@ SFiltersDialog (SScoringFacility& p_)
W_V.reg( eSFFilterHighPassOrder, (int*)&P.high_pass_order);
W_V.reg( eSFFilterNotchFilter, (int*)&P.notch_filter);
}
-
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/filters.hh b/upstream/src/aghermann/ui/sf/d/filters.hh
index be4650a..f06af2d 100644
--- a/upstream/src/aghermann/ui/sf/d/filters.hh
+++ b/upstream/src/aghermann/ui/sf/d/filters.hh
@@ -76,9 +76,3 @@ void eSFFilterLowPassCutoff_value_changed_cb( GtkSpinButton*, gpointer);
}
#endif // AGH_AGHERMANN_UI_SF_D_FILTERS_H_
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/filters_cb.cc b/upstream/src/aghermann/ui/sf/d/filters_cb.cc
index 1934996..e3104b7 100644
--- a/upstream/src/aghermann/ui/sf/d/filters_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/filters_cb.cc
@@ -44,10 +44,3 @@ eSFFilterLowPassCutoff_value_changed_cb(
} // extern "C"
-
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns-draw.cc b/upstream/src/aghermann/ui/sf/d/patterns-draw.cc
index 5240aaf..c206dc7 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns-draw.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns-draw.cc
@@ -246,11 +246,3 @@ draw_field( cairo_t *cr)
}
#undef KEKE
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc b/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
index fef0caf..d0d18de 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns-profiles.cc
@@ -89,10 +89,3 @@ import_from_selection( SScoringFacility::SChannel& field)
return 0;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
index 03e5b62..e7e84b9 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns-profiles_cb.cc
@@ -113,12 +113,3 @@ bSFFDProfileRevert_clicked_cb(
}
} // extern "C"
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns.cc b/upstream/src/aghermann/ui/sf/d/patterns.cc
index 68f4073..a70478f 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns.cc
@@ -412,10 +412,3 @@ update_field_check_menu_items()
suppress_redraw = false;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns.hh b/upstream/src/aghermann/ui/sf/d/patterns.hh
index 4c269dc..92a5c44 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns.hh
+++ b/upstream/src/aghermann/ui/sf/d/patterns.hh
@@ -204,10 +204,3 @@ void iSFFD_any_field_profile_type_toggled_cb( GtkRadioMenuItem*, gpointer);
}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/patterns_cb.cc b/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
index ccddf3b..03eabf9 100644
--- a/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/patterns_cb.cc
@@ -516,12 +516,3 @@ wSFFD_configure_event_cb(
}
} // extern "C"
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/phasediff.cc b/upstream/src/aghermann/ui/sf/d/phasediff.cc
index 8173feb..5e8fdbf 100644
--- a/upstream/src/aghermann/ui/sf/d/phasediff.cc
+++ b/upstream/src/aghermann/ui/sf/d/phasediff.cc
@@ -242,11 +242,3 @@ draw( cairo_t* cr, const int wd, const int ht)
cairo_stroke( cr);
}
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/phasediff.hh b/upstream/src/aghermann/ui/sf/d/phasediff.hh
index caa09ea..b0480f0 100644
--- a/upstream/src/aghermann/ui/sf/d/phasediff.hh
+++ b/upstream/src/aghermann/ui/sf/d/phasediff.hh
@@ -105,10 +105,3 @@ void wSFPD_hide_cb( GtkWidget*, gpointer);
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc b/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc
index 16e76fc..f5696cb 100644
--- a/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/phasediff_cb.cc
@@ -198,11 +198,3 @@ wSFPD_hide_cb(
}
} // extern "C"
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968-profiles.cc b/upstream/src/aghermann/ui/sf/d/rk1968-profiles.cc
index e3a8e28..bb8f40f 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968-profiles.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968-profiles.cc
@@ -18,11 +18,3 @@
using namespace std;
using namespace agh::ui;
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
index d56d9b9..000f0d5 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968-profiles_cb.cc
@@ -84,9 +84,3 @@ eSFRK_any_profile_origin_toggled_cb(
} // extern "C"
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.cc b/upstream/src/aghermann/ui/sf/d/rk1968.cc
index 691bffd..5c10991 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.cc
@@ -109,12 +109,3 @@ SScoringFacility::SRK1968Dialog::
g_object_unref( (GObject*)mSFRKProfiles);
g_object_unref( (GObject*)builder);
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968.hh b/upstream/src/aghermann/ui/sf/d/rk1968.hh
index ad890e5..4247d81 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968.hh
+++ b/upstream/src/aghermann/ui/sf/d/rk1968.hh
@@ -113,9 +113,3 @@ void eSFRKProfileSaveName_changed_cb(GtkEditable*, gpointer);
}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc b/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
index 9cfd39e..33d9adc 100644
--- a/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
+++ b/upstream/src/aghermann/ui/sf/d/rk1968_cb.cc
@@ -183,9 +183,3 @@ bSFRKDismiss_clicked_cb(
} // extern "C"
-
-// Local Variables:
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/hypnogram.cc b/upstream/src/aghermann/ui/sf/hypnogram.cc
index 3d68071..886343a 100644
--- a/upstream/src/aghermann/ui/sf/hypnogram.cc
+++ b/upstream/src/aghermann/ui/sf/hypnogram.cc
@@ -201,12 +201,3 @@ do_clear_hypnogram()
calculate_scored_percent();
queue_redraw_all();
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/hypnogram_cb.cc b/upstream/src/aghermann/ui/sf/hypnogram_cb.cc
index ee16920..df9c443 100644
--- a/upstream/src/aghermann/ui/sf/hypnogram_cb.cc
+++ b/upstream/src/aghermann/ui/sf/hypnogram_cb.cc
@@ -144,10 +144,3 @@ iSFScoreClear_activate_cb(
}
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/ica_cb.cc b/upstream/src/aghermann/ui/sf/ica_cb.cc
index 5d5a28e..5599998 100644
--- a/upstream/src/aghermann/ui/sf/ica_cb.cc
+++ b/upstream/src/aghermann/ui/sf/ica_cb.cc
@@ -313,10 +313,3 @@ bSFICACancel_clicked_cb(
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
index 320bc93..c196d0d 100644
--- a/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
+++ b/upstream/src/aghermann/ui/sf/mainmenu_cb.cc
@@ -320,10 +320,3 @@ wSF_key_press_event_cb( GtkWidget*, const GdkEventKey *event, const gpointer use
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/montage_cb.cc b/upstream/src/aghermann/ui/sf/montage_cb.cc
index 2908771..68b071a 100644
--- a/upstream/src/aghermann/ui/sf/montage_cb.cc
+++ b/upstream/src/aghermann/ui/sf/montage_cb.cc
@@ -523,6 +523,4 @@ daSFMontage_scroll_event_cb(
}
-
-
} // extern "C"
diff --git a/upstream/src/aghermann/ui/sf/sf.hh b/upstream/src/aghermann/ui/sf/sf.hh
index ec5957f..c49e82f 100644
--- a/upstream/src/aghermann/ui/sf/sf.hh
+++ b/upstream/src/aghermann/ui/sf/sf.hh
@@ -446,10 +446,3 @@ channel_y0( const T& h) const
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/sf_cb.cc b/upstream/src/aghermann/ui/sf/sf_cb.cc
index ce8ce42..0c359ba 100644
--- a/upstream/src/aghermann/ui/sf/sf_cb.cc
+++ b/upstream/src/aghermann/ui/sf/sf_cb.cc
@@ -33,10 +33,3 @@ wSF_delete_event_cb(
}
} // extern "C"
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/sf_cb.hh b/upstream/src/aghermann/ui/sf/sf_cb.hh
index 77b1d2a..bc6d6aa 100644
--- a/upstream/src/aghermann/ui/sf/sf_cb.hh
+++ b/upstream/src/aghermann/ui/sf/sf_cb.hh
@@ -153,12 +153,4 @@ gboolean wSF_key_press_event_cb( GtkWidget*, GdkEventKey*, gpointer);
} // extern "C"
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sf/widgets.hh b/upstream/src/aghermann/ui/sf/widgets.hh
index c364467..c0d3f5c 100644
--- a/upstream/src/aghermann/ui/sf/widgets.hh
+++ b/upstream/src/aghermann/ui/sf/widgets.hh
@@ -209,10 +209,3 @@ struct SScoringFacilityWidgets {
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sm/sm-construct.cc b/upstream/src/aghermann/ui/sm/sm-construct.cc
index 62041a7..90047e9 100644
--- a/upstream/src/aghermann/ui/sm/sm-construct.cc
+++ b/upstream/src/aghermann/ui/sm/sm-construct.cc
@@ -104,10 +104,3 @@ construct_widgets()
return 0;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sm/sm.hh b/upstream/src/aghermann/ui/sm/sm.hh
index cc6f230..4b4b92e 100644
--- a/upstream/src/aghermann/ui/sm/sm.hh
+++ b/upstream/src/aghermann/ui/sm/sm.hh
@@ -104,10 +104,3 @@ struct SSessionChooser {
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sm/sm_cb.cc b/upstream/src/aghermann/ui/sm/sm_cb.cc
index ebe9107..5f05747 100644
--- a/upstream/src/aghermann/ui/sm/sm_cb.cc
+++ b/upstream/src/aghermann/ui/sm/sm_cb.cc
@@ -211,10 +211,3 @@ bSessionChooserRemove_clicked_cb(
}
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/sm/sm_cb.hh b/upstream/src/aghermann/ui/sm/sm_cb.hh
index 8334d41..ff3f3b3 100644
--- a/upstream/src/aghermann/ui/sm/sm_cb.hh
+++ b/upstream/src/aghermann/ui/sm/sm_cb.hh
@@ -34,12 +34,4 @@ void bSessionChooserRemove_clicked_cb( GtkButton*, gpointer);
} // extern "C"
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/ui++.cc b/upstream/src/aghermann/ui/ui++.cc
index 7d04415..2e059f0 100644
--- a/upstream/src/aghermann/ui/ui++.cc
+++ b/upstream/src/aghermann/ui/ui++.cc
@@ -52,12 +52,3 @@ SUIVar_<GtkListStore, list<string>>::down() const
}} // namespace agh::ui
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
-
diff --git a/upstream/src/aghermann/ui/ui++.hh b/upstream/src/aghermann/ui/ui++.hh
index e6f258f..6827ed8 100644
--- a/upstream/src/aghermann/ui/ui++.hh
+++ b/upstream/src/aghermann/ui/ui++.hh
@@ -317,10 +317,3 @@ class SUIVarCollection {
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/ui-itpp.hh b/upstream/src/aghermann/ui/ui-itpp.hh
index 90fa1be..944fb8a 100644
--- a/upstream/src/aghermann/ui/ui-itpp.hh
+++ b/upstream/src/aghermann/ui/ui-itpp.hh
@@ -52,10 +52,3 @@ cairo_draw_signal( cairo_t *cr,
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/ui.cc b/upstream/src/aghermann/ui/ui.cc
index 461dc32..3489e92 100644
--- a/upstream/src/aghermann/ui/ui.cc
+++ b/upstream/src/aghermann/ui/ui.cc
@@ -225,10 +225,3 @@ set_cursor_busy( bool busy, GtkWidget *wid)
gdk_window_set_cursor( gtk_widget_get_window( wid), busy ? cursor_busy : cursor_normal);
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/aghermann/ui/ui.hh b/upstream/src/aghermann/ui/ui.hh
index 8e986c9..6da80ca 100644
--- a/upstream/src/aghermann/ui/ui.hh
+++ b/upstream/src/aghermann/ui/ui.hh
@@ -98,10 +98,3 @@ void set_cursor_busy( bool busy, GtkWidget *wid);
} // namespace agh::ui
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/alg.hh b/upstream/src/common/alg.hh
index 1a91f5d..f0cb29b 100644
--- a/upstream/src/common/alg.hh
+++ b/upstream/src/common/alg.hh
@@ -188,10 +188,3 @@ double sensible_scale_reduction_factor( double display_scale,
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/config-validate.hh b/upstream/src/common/config-validate.hh
index 5779ce4..9cc9419 100644
--- a/upstream/src/common/config-validate.hh
+++ b/upstream/src/common/config-validate.hh
@@ -273,10 +273,3 @@ class CConfigKeys {
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/containers.hh b/upstream/src/common/containers.hh
index 1620e62..9078651 100644
--- a/upstream/src/common/containers.hh
+++ b/upstream/src/common/containers.hh
@@ -58,10 +58,3 @@ member( const K& x, const map<K, V>& m)
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/fs.hh b/upstream/src/common/fs.hh
index 394db72..ef291b3 100644
--- a/upstream/src/common/fs.hh
+++ b/upstream/src/common/fs.hh
@@ -73,24 +73,12 @@ mkdir_with_parents( const string& dir)
-
-
-
// this is another global
int supported_sigfile_counter( const char *fname, const struct stat*, int flag, struct FTW *ftw);
extern size_t total_supported_sigfiles;
-
-
} // namespace fs
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/lang.hh b/upstream/src/common/lang.hh
index ce239f3..34e04b6 100644
--- a/upstream/src/common/lang.hh
+++ b/upstream/src/common/lang.hh
@@ -45,13 +45,13 @@ inline int dbl_cmp( double x, double y) // optional precision maybe?
// g++ bits
-#define MAKE_UNIQUE_CHARP(p) \
+#define MAKE_UNIQUE_CHARP(p) \
unique_ptr<void,void(*)(void*)> p##_pp(p,free);
-#define DELETE_DEFAULT_METHODS(T) \
- T () = delete; \
- T (const T&) = delete; \
+#define DELETE_DEFAULT_METHODS(T) \
+ T () = delete; \
+ T (const T&) = delete; \
void operator=( const T&) = delete;
@@ -78,10 +78,3 @@ inline int dbl_cmp( double x, double y) // optional precision maybe?
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/libcommon.cc b/upstream/src/common/libcommon.cc
index 94672ea..cd8d896 100644
--- a/upstream/src/common/libcommon.cc
+++ b/upstream/src/common/libcommon.cc
@@ -193,18 +193,18 @@ string
agh::str::
dhms( double seconds, int dd)
{
- bool positive = seconds >= 0.;
+ bool positive = seconds >= 0.;
if ( not positive )
seconds = -seconds;
- int s = (int)seconds % 60,
+ int s = (int)seconds % 60,
m = (int)seconds/60 % 60,
h = (int)seconds/60/60 % (60*60),
d = (int)seconds/60/60/24 % (60*60*24);
- double f = seconds - floor(seconds);
+ double f = seconds - floor(seconds);
using agh::str::sasprintf;
- string f_ = ( dd == 0 )
+ string f_ = ( dd == 0 )
? ""
: sasprintf( ".%0*d", dd, (int)(f*pow(10, dd)));
return ( d > 0 )
@@ -336,7 +336,7 @@ make_fname_base( const string& fname_, const string& suffices, const TMakeFnameO
// found to be of use elsewhere
-size_t agh::fs::total_supported_sigfiles;
+size_t agh::fs::total_supported_sigfiles;
int
agh::fs::
@@ -364,8 +364,8 @@ agh::alg::
sensible_scale_reduction_factor( double display_scale,
double constraint_max, double constraint_min)
{
- double f = 1.;
- bool last_was_two = false;
+ double f = 1.;
+ bool last_was_two = false;
while ( display_scale * f > constraint_max ) {
f /= last_was_two ? 5. : 2.;
last_was_two = !last_was_two;
@@ -376,12 +376,3 @@ sensible_scale_reduction_factor( double display_scale,
}
return f;
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/log-facility.cc b/upstream/src/common/log-facility.cc
index d8c7f7e..169a802 100644
--- a/upstream/src/common/log-facility.cc
+++ b/upstream/src/common/log-facility.cc
@@ -150,11 +150,3 @@ log( agh::log::TLevel level, const char* issuer, const char* fmt, ...)
va_end (ap);
}
}
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/string.hh b/upstream/src/common/string.hh
index bcd7645..419082e 100644
--- a/upstream/src/common/string.hh
+++ b/upstream/src/common/string.hh
@@ -105,10 +105,3 @@ string dhms_colon( double seconds, int decimal_digits = 0) __attribute__ ((pure)
}
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/common/subject_id.hh b/upstream/src/common/subject_id.hh
index 1bd1dd4..17f3b53 100644
--- a/upstream/src/common/subject_id.hh
+++ b/upstream/src/common/subject_id.hh
@@ -102,10 +102,3 @@ struct SSubjectId {
} // namespace agh
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/all.hh b/upstream/src/libmetrics/all.hh
index e2e2eb3..5dd7d16 100644
--- a/upstream/src/libmetrics/all.hh
+++ b/upstream/src/libmetrics/all.hh
@@ -18,10 +18,3 @@
#include "swu.hh"
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/bands.hh b/upstream/src/libmetrics/bands.hh
index 9c01fa1..2e7617a 100644
--- a/upstream/src/libmetrics/bands.hh
+++ b/upstream/src/libmetrics/bands.hh
@@ -34,10 +34,3 @@ enum TBand {
} // namespace metrics
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/forward-decls.hh b/upstream/src/libmetrics/forward-decls.hh
index bbee699..720d0b8 100644
--- a/upstream/src/libmetrics/forward-decls.hh
+++ b/upstream/src/libmetrics/forward-decls.hh
@@ -37,14 +37,6 @@ class CProfile;
namespace phasic {
}
-
} // namespace metrics
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/mc-artifacts.cc b/upstream/src/libmetrics/mc-artifacts.cc
index 7b38770..6e472d2 100644
--- a/upstream/src/libmetrics/mc-artifacts.cc
+++ b/upstream/src/libmetrics/mc-artifacts.cc
@@ -58,11 +58,3 @@ estimate_E( const valarray<float>& S,
} // namespace mc
} // namespace metrics
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/mc-artifacts.hh b/upstream/src/libmetrics/mc-artifacts.hh
index 958cf00..a812854 100644
--- a/upstream/src/libmetrics/mc-artifacts.hh
+++ b/upstream/src/libmetrics/mc-artifacts.hh
@@ -112,10 +112,3 @@ estimate_E( const valarray<T>& sssu_diff,
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/mc-artifacts.ii b/upstream/src/libmetrics/mc-artifacts.ii
index b5d205b..9e598fb 100644
--- a/upstream/src/libmetrics/mc-artifacts.ii
+++ b/upstream/src/libmetrics/mc-artifacts.ii
@@ -11,7 +11,9 @@
*/
-extern template vector<size_t> detect_artifacts( const valarray<TFloat>&, size_t, const SArtifactDetectionPPack&);
+extern template vector<size_t> detect_artifacts(
+ const valarray<TFloat>&, size_t,
+ const SArtifactDetectionPPack&);
template <typename T>
vector<size_t> // don't estimate, use pi*B*x^2 (E) as provided
@@ -54,7 +56,3 @@ detect_artifacts( const valarray<T>& signal, size_t sr,
// Local Variables:
// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/mc.hh b/upstream/src/libmetrics/mc.hh
index 2b30dea..544152f 100644
--- a/upstream/src/libmetrics/mc.hh
+++ b/upstream/src/libmetrics/mc.hh
@@ -29,17 +29,17 @@ namespace mc {
struct SPPack
: virtual public metrics::SPPack {
- double scope,
+ double scope,
f0fc,
//f0, // = 1.,
//fc, // = 1.8;
bandwidth, // = 1.5;
iir_backpolate, // = 0.5; // 0.0 < Backpolate < 1.0 on s: standard 0.5
mc_gain; // = 10.0; // Gain (DigiRange/PhysiRange) of MicroContinuity
- size_t smooth_side;
- double freq_from,
+ size_t smooth_side;
+ double freq_from,
freq_inc;
- size_t n_bins;
+ size_t n_bins;
SPPack ()
{
@@ -84,7 +84,7 @@ struct SPPack
bool
same_as( const SPPack& rv) const
{
- return metrics::SPPack::same_as(rv) &&
+ return metrics::SPPack::same_as(rv) &&
scope == rv.scope &&
iir_backpolate == rv.iir_backpolate &&
mc_gain == rv.mc_gain &&
@@ -151,7 +151,7 @@ class CProfile
valarray<TFloat>
course( double binf) const
{
- size_t bin = agh::alg::value_within(
+ size_t bin = agh::alg::value_within(
(int)((binf - freq_from) / freq_inc),
0, (int)bins()-1);
return move(metrics::CProfile::course(bin));
@@ -210,7 +210,7 @@ do_sssu_reduction( const valarray<T>& S,
f0, fc,
bandwidth);
- size_t scope_samples = scope * samplerate,
+ size_t scope_samples = scope * samplerate,
inc_samples = inc * samplerate,
lpages = S.size() / inc_samples;
valarray<T>
@@ -244,10 +244,3 @@ do_sssu_reduction( const valarray<T>& S,
} // namespace metrics
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/page-metrics-base.hh b/upstream/src/libmetrics/page-metrics-base.hh
index 5d9f90d..df0840c 100644
--- a/upstream/src/libmetrics/page-metrics-base.hh
+++ b/upstream/src/libmetrics/page-metrics-base.hh
@@ -211,10 +211,3 @@ class CProfile
} // namespace metrics
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/psd.hh b/upstream/src/libmetrics/psd.hh
index ff3febd..955f550 100644
--- a/upstream/src/libmetrics/psd.hh
+++ b/upstream/src/libmetrics/psd.hh
@@ -173,10 +173,3 @@ class CProfile
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libmetrics/swu.cc b/upstream/src/libmetrics/swu.cc
index 82f3791..9f832ff 100644
--- a/upstream/src/libmetrics/swu.cc
+++ b/upstream/src/libmetrics/swu.cc
@@ -123,10 +123,6 @@ go_compute()
-
-
-
-
int
swu::CProfile::
export_tsv( const string& fname) const
diff --git a/upstream/src/libmetrics/swu.hh b/upstream/src/libmetrics/swu.hh
index 2528f20..ed7e3e1 100644
--- a/upstream/src/libmetrics/swu.hh
+++ b/upstream/src/libmetrics/swu.hh
@@ -33,7 +33,7 @@ namespace swu {
struct SPPack
: virtual public metrics::SPPack {
- double min_upswing_duration;
+ double min_upswing_duration;
SPPack ()
{
@@ -82,7 +82,7 @@ class CProfile
valarray<TFloat> course( double) const
{
- size_t bin = 0; // (size_t)(binf - freq_from / Pp.freq_inc);
+ size_t bin = 0; // (size_t)(binf - freq_from / Pp.freq_inc);
return metrics::CProfile::course(bin);
}
@@ -107,10 +107,3 @@ class CProfile
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/all.hh b/upstream/src/libsigfile/all.hh
index 6a678ee..c7de224 100644
--- a/upstream/src/libsigfile/all.hh
+++ b/upstream/src/libsigfile/all.hh
@@ -5,7 +5,7 @@
*
* Initial version: 2013-07-07
*
- * Purpose:
+ * Purpose: include headers for all EEG source types
*
* License: GPL
*/
@@ -17,10 +17,3 @@
#include "tsv.hh"
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/edf.cc b/upstream/src/libsigfile/edf.cc
index 48f3a57..ab01141 100644
--- a/upstream/src/libsigfile/edf.cc
+++ b/upstream/src/libsigfile/edf.cc
@@ -234,10 +234,10 @@ CEDFFile (const string& fname_, const TSubtype subtype_, const int flags_,
set_comment( fname_);
set_start_time( time(NULL));
- strncpy( header.header_length, pad( to_string(header_length), 8).c_str(), 8);
- strncpy( header.data_record_size, pad( to_string(data_record_size), 8).c_str(), 8);
- strncpy( header.n_data_records, pad( to_string(n_data_records), 8).c_str(), 8);
- strncpy( header.n_channels, pad( to_string(channels_.size()), 4).c_str(), 4);
+ strncpy( header.header_length, pad( to_string(header_length), 8).c_str(), 8);
+ strncpy( header.data_record_size, pad( to_string(data_record_size), 8).c_str(), 8);
+ strncpy( header.n_data_records, pad( to_string(n_data_records), 8).c_str(), 8);
+ strncpy( header.n_channels, pad( to_string(channels_.size()), 4).c_str(), 4);
_total_samples_per_record = 0;
size_t hi = 0;
@@ -446,7 +446,7 @@ int
CEDFFile::
_parse_header()
{
- size_t n_channels;
+ size_t n_channels;
try {
_fld_pos = 0;
_get_next_field( header.version_number, 8);
diff --git a/upstream/src/libsigfile/forward-decls.hh b/upstream/src/libsigfile/forward-decls.hh
index 6a18134..7575252 100644
--- a/upstream/src/libsigfile/forward-decls.hh
+++ b/upstream/src/libsigfile/forward-decls.hh
@@ -35,10 +35,3 @@ class CEDFFile;
} // namespace sigfile
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/page.cc b/upstream/src/libsigfile/page.cc
index 15d9f1c..a7d4528 100644
--- a/upstream/src/libsigfile/page.cc
+++ b/upstream/src/libsigfile/page.cc
@@ -193,10 +193,3 @@ load_canonical( const string& fname,
return f.eof() ? 0 : 1;
}
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/page.hh b/upstream/src/libsigfile/page.hh
index 67ce0ef..56a2776 100644
--- a/upstream/src/libsigfile/page.hh
+++ b/upstream/src/libsigfile/page.hh
@@ -248,15 +248,6 @@ class CHypnogram
const TCustomScoreCodes&);
};
-
}
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/source-base.cc b/upstream/src/libsigfile/source-base.cc
index 7a5b398..02f1be1 100644
--- a/upstream/src/libsigfile/source-base.cc
+++ b/upstream/src/libsigfile/source-base.cc
@@ -562,13 +562,3 @@ explain_status( const int status)
return recv.empty() ? "" : agh::str::join(recv, "\n") + "\n";
}
-
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigfile/source-base.hh b/upstream/src/libsigfile/source-base.hh
index b3bcfa2..cdf6c5c 100644
--- a/upstream/src/libsigfile/source-base.hh
+++ b/upstream/src/libsigfile/source-base.hh
@@ -470,7 +470,6 @@ class CSource
};
-
} // namespace sigfile
#endif
diff --git a/upstream/src/libsigfile/tsv.hh b/upstream/src/libsigfile/tsv.hh
index f2fa860..21e9d2e 100644
--- a/upstream/src/libsigfile/tsv.hh
+++ b/upstream/src/libsigfile/tsv.hh
@@ -359,5 +359,4 @@ class CTSVFile
} // namespace sigfile
-
#endif
diff --git a/upstream/src/libsigproc/exstrom.cc b/upstream/src/libsigproc/exstrom.cc
index 2939726..d317b71 100644
--- a/upstream/src/libsigproc/exstrom.cc
+++ b/upstream/src/libsigproc/exstrom.cc
@@ -24,10 +24,3 @@ template valarray<TFloat> exstrom::low_pass( const valarray<TFloat>&, size_t, fl
template valarray<TFloat> exstrom::high_pass( const valarray<TFloat>&, size_t, float, unsigned, bool);
template valarray<TFloat> exstrom::band_pass( const valarray<TFloat>&, size_t, float, float, unsigned, bool);
template valarray<TFloat> exstrom::band_stop( const valarray<TFloat>&, size_t, float, float, unsigned, bool);
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/exstrom.hh b/upstream/src/libsigproc/exstrom.hh
index 8d2d7d8..4de19a3 100644
--- a/upstream/src/libsigproc/exstrom.hh
+++ b/upstream/src/libsigproc/exstrom.hh
@@ -192,7 +192,7 @@ template <typename T>
valarray<T>
dcof_bwlp( unsigned n, T fcf)
{
- T theta, // M_PI * fcf / 2.0
+ T theta, // M_PI * fcf / 2.0
st, // sine of theta
ct, // cosine of theta
parg, // pole angle
@@ -545,7 +545,7 @@ low_pass( const valarray<T>& in,
float cutoff, unsigned order, bool scale)
{
// printf( "low_pass( %zu, %g, %u, %d)\n", samplerate, cutoff, order, scale);
- size_t i, j;
+ size_t i, j;
T fcf = 2. * cutoff/samplerate;
valarray<T>
@@ -589,7 +589,7 @@ high_pass( const valarray<T>& in,
size_t samplerate,
float cutoff, unsigned order, bool scale)
{
- size_t i, j;
+ size_t i, j;
T fcf = 2. * cutoff/samplerate;
valarray<T>
@@ -616,7 +616,7 @@ high_pass( const valarray<T>& in,
unsigned
nc = ccof.size(),
nd = dcof.size();
- size_t in_size = in.size(),
+ size_t in_size = in.size(),
out_size = in_size + nc;
valarray<T> out (out_size);
@@ -644,9 +644,9 @@ band_pass( const valarray<T>& in,
float lo_cutoff, float hi_cutoff,
unsigned order, bool scale)
{
- size_t i, j;
+ size_t i, j;
- T f1f = 2. * lo_cutoff/samplerate,
+ T f1f = 2. * lo_cutoff/samplerate,
f2f = 2. * hi_cutoff/samplerate;
valarray<T>
dcof = dcof_bwbp( order, f1f, f2f); /* the d coefficients */
@@ -699,7 +699,7 @@ band_stop( const valarray<T>& in,
float lo_cutoff, float hi_cutoff,
unsigned order, bool scale)
{
- size_t i, j;
+ size_t i, j;
T f1f = 2. * lo_cutoff/samplerate,
f2f = 2. * hi_cutoff/samplerate;
@@ -728,7 +728,7 @@ band_stop( const valarray<T>& in,
unsigned
nc = ccof.size(),
nd = dcof.size();
- size_t in_size = in.size(),
+ size_t in_size = in.size(),
out_size = in_size + nc;
valarray<T> out (out_size);
@@ -764,10 +764,3 @@ extern template valarray<TFloat> band_stop( const valarray<TFloat>&, size_t, flo
} // namespace exstrom
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/ext-filters.cc b/upstream/src/libsigproc/ext-filters.cc
index ccfc119..d711d25 100644
--- a/upstream/src/libsigproc/ext-filters.cc
+++ b/upstream/src/libsigproc/ext-filters.cc
@@ -20,10 +20,3 @@ using namespace std;
template valarray<float> sigproc::CFilterIIR<float>::apply( const valarray<float>&, bool);
template valarray<double> sigproc::CFilterIIR<double>::apply( const valarray<double>&, bool);
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/ext-filters.hh b/upstream/src/libsigproc/ext-filters.hh
index 8b7492a..f7dfd0f 100644
--- a/upstream/src/libsigproc/ext-filters.hh
+++ b/upstream/src/libsigproc/ext-filters.hh
@@ -87,7 +87,7 @@ class CFilterIIR
}
- bool anticipate;
+ bool anticipate;
valarray<T>
filter_state_p,
filter_state_z,
@@ -127,7 +127,7 @@ class CFilterSE
{
CFilterIIR<T>::calculate_iir_coefficients();
- T ts = 1.0 / CFilterIIR<T>::samplerate,
+ T ts = 1.0 / CFilterIIR<T>::samplerate,
fprewarp, r, s, t;
fprewarp = tan( f0 * M_PI * ts) / (M_PI * ts);
@@ -210,10 +210,3 @@ class CFilterDUE
} // namespace sigproc
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/ext-filters.ii b/upstream/src/libsigproc/ext-filters.ii
index 2df8659..18ee33f 100644
--- a/upstream/src/libsigproc/ext-filters.ii
+++ b/upstream/src/libsigproc/ext-filters.ii
@@ -76,7 +76,3 @@ apply( const valarray<T>& in, bool use_first_sample_to_reset)
// Local Variables:
// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/forward-decls.hh b/upstream/src/libsigproc/forward-decls.hh
index 5e067f3..2a202cd 100644
--- a/upstream/src/libsigproc/forward-decls.hh
+++ b/upstream/src/libsigproc/forward-decls.hh
@@ -23,12 +23,4 @@ template <typename T> struct SCachedBandPassCourse;
} // namespace sigproc
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/sigproc.cc b/upstream/src/libsigproc/sigproc.cc
index 692aa1d..c97f044 100644
--- a/upstream/src/libsigproc/sigproc.cc
+++ b/upstream/src/libsigproc/sigproc.cc
@@ -38,7 +38,7 @@ resample_f( const valarray<float>& signal,
throw runtime_error ("bad args for resample");
valarray<float>
- resampled (to_size);
+ resampled (to_size);
SRC_DATA S;
S.data_in = const_cast<float*>(&signal[start]);
S.input_frames = end - start;
@@ -51,6 +51,7 @@ resample_f( const valarray<float>& signal,
return resampled;
}
+
valarray<double>
sigproc::
resample( const valarray<double>& signal,
@@ -71,12 +72,3 @@ resample( const valarray<double>& signal,
return ret;
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/sigproc.hh b/upstream/src/libsigproc/sigproc.hh
index 6fe4e2f..f55c408 100644
--- a/upstream/src/libsigproc/sigproc.hh
+++ b/upstream/src/libsigproc/sigproc.hh
@@ -357,10 +357,3 @@ phase_diff( const SSignalRef<T>& sig1,
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/sigproc.ii b/upstream/src/libsigproc/sigproc.ii
index baba2cf..209e2ec 100644
--- a/upstream/src/libsigproc/sigproc.ii
+++ b/upstream/src/libsigproc/sigproc.ii
@@ -86,7 +86,7 @@ interpolate( const vector<size_t>& xi,
gsl_spline_init( spline, &x_known[0], &y_known[0], xi.size());
- double t;
+ double t;
auto xknown0 = x_known[0],
xknown9 = x_known[x_known.size()-1];
valarray<T>
@@ -115,8 +115,8 @@ envelope( const SSignalRef<T>& in,
vector<size_t> *mini_p, // return vector of extremum indices
vector<size_t> *maxi_p)
{
- auto& S = in.signal;
- ssize_t n_samples = S.size() & (ssize_t)~1,
+ auto& S = in.signal;
+ ssize_t n_samples = S.size() & (ssize_t)~1,
dh2 = dh_ * in.samplerate / 2;
vector<size_t>
@@ -203,9 +203,9 @@ dzcdf( const SSignalRef<T>& in,
valarray<T> y (in.signal.size());
// calculate the bloody zcdf
- double window = 4*dt; // half a second, good enough
- double t, tdiff;
- size_t I = 0, J;
+ double window = 4*dt; // half a second, good enough
+ double t, tdiff;
+ size_t I = 0, J;
for ( size_t i = 0; i < out_size; ++i ) {
t = i*dt;
xi[i] = t * in.samplerate;
@@ -269,8 +269,8 @@ phase_diff( const SSignalRef<T>& sig1,
sig2p = exstrom::band_pass( valarray<T> (&sig2.signal[sa], sz - sa), sig2.samplerate, fa, fz, order, true);
// slide one against the other a little
- double diff = INFINITY, old_diff, diff_min = INFINITY;
- int dist, dist_min = 0;
+ double diff = INFINITY, old_diff, diff_min = INFINITY;
+ int dist, dist_min = 0;
// go east
dist = 0;
do {
@@ -289,10 +289,5 @@ phase_diff( const SSignalRef<T>& sig1,
return (double)dist_min / sig1.samplerate;
}
-
// Local Variables:
// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/winfun.cc b/upstream/src/libsigproc/winfun.cc
index 3fba7ce..9f0da50 100644
--- a/upstream/src/libsigproc/winfun.cc
+++ b/upstream/src/libsigproc/winfun.cc
@@ -129,19 +129,11 @@ TFloat (*sigproc::winf[])(size_t, size_t) = {
const char*
sigproc::welch_window_type_names[sigproc::TWinType::TWinType_total] = {
"Bartlett",
- "Blackman",
- "Blackman-Harris",
+ "Blackman",
+ "Blackman-Harris",
"Hamming",
- "Hanning",
- "Parzen",
+ "Hanning",
+ "Parzen",
"Square",
- "Welch"
+ "Welch"
};
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libsigproc/winfun.hh b/upstream/src/libsigproc/winfun.hh
index 885f63d..8a09941 100644
--- a/upstream/src/libsigproc/winfun.hh
+++ b/upstream/src/libsigproc/winfun.hh
@@ -41,12 +41,4 @@ extern TFloat (*winf[])(size_t, size_t);
} // namespace sigproc
-
#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/project_strings.h b/upstream/src/project_strings.h
index 0ede050..c92524e 100644
--- a/upstream/src/project_strings.h
+++ b/upstream/src/project_strings.h
@@ -22,10 +22,3 @@
#define CONF_FILE ".aghermann.conf"
#endif
-
-// Local Variables:
-// Mode: c
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/tools/agh-profile-gen.cc b/upstream/src/tools/agh-profile-gen.cc
index 44ba23c..882929f 100644
--- a/upstream/src/tools/agh-profile-gen.cc
+++ b/upstream/src/tools/agh-profile-gen.cc
@@ -223,12 +223,3 @@ main( int argc, char **argv)
return 1;
}
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/tools/edfcat.cc b/upstream/src/tools/edfcat.cc
index d33f453..61327c7 100644
--- a/upstream/src/tools/edfcat.cc
+++ b/upstream/src/tools/edfcat.cc
@@ -43,7 +43,7 @@ struct SOperation {
Prune, Merge,
Generate
};
- TKind operation;
+ TKind operation;
struct SObject : public string {
list<size_t>
@@ -52,7 +52,7 @@ struct SOperation {
timepoints_g;
list<int>
timepoints_d;
- size_t samplerate,
+ size_t samplerate,
record_size;
void figure_timepoints( const list<string>&) throw (invalid_argument);
void figure_channels( const list<string>&) throw (invalid_argument);
@@ -340,7 +340,7 @@ exec_convert( const SOperation::SObject& obj)
make_channel_headers_for_CEDFFile( Hh.size(), "channel%zu", obj.samplerate),
obj.record_size,
ceilf(duration / obj.record_size),
- nullptr);
+ nullptr);
for ( size_t f = 0; f < Hh.size(); ++f ) {
F[f].set_physical_range( grand_min, grand_max);
F.put_signal( f, valarray<TFloat> {Hh[f][slice (0, total_samples, 1)]});
@@ -384,7 +384,7 @@ exec_prune( const SOperation::SObject& obj)
selected_channels,
F.data_record_size,
F.n_data_records,
- nullptr);
+ nullptr);
G.set_patient_id( F.patient_id());
string tmp = F.recording_id();
@@ -466,12 +466,3 @@ main( int argc, const char **argv)
return 0;
}
-
-
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/tools/edfhed-gtk.cc b/upstream/src/tools/edfhed-gtk.cc
index 5da30d7..e79f0db 100644
--- a/upstream/src/tools/edfhed-gtk.cc
+++ b/upstream/src/tools/edfhed-gtk.cc
@@ -146,7 +146,7 @@ main( int argc, char **argv)
fname,
sigfile::CSource::no_ancillary_files |
sigfile::CEDFFile::no_field_consistency_check,
- nullptr);
+ nullptr);
channel_no = 0;
Fp = &F;
@@ -383,33 +383,33 @@ ui_init()
}
gtk_builder_connect_signals( builder, NULL);
-#define AGH_GBGETTRY(A) \
+#define AGH_GBGETTRY(A) \
do { if (!(A = (GtkEntry*)(gtk_builder_get_object( builder, #A)))) \
- throw runtime_error ("Missing widget " #A); \
- } while (0);
+ throw runtime_error ("Missing widget " #A); \
+ } while (0);
AGH_GBGETOBJ (wMain);
- AGH_GBGETOBJ (lLabel);
- // begad, glade indeed has these widgets named like so: "e[PatientID]"!
- AGH_GBGETTRY (e[PatientID]);
- AGH_GBGETTRY (e[RecordingID]);
- AGH_GBGETTRY (e[RecordingDate]);
- AGH_GBGETTRY (e[RecordingTime]);
- AGH_GBGETTRY (e[Reserved]);
- AGH_GBGETTRY (e[ChannelLabel]);
- AGH_GBGETTRY (e[ChannelPhysicalDim]);
- AGH_GBGETTRY (e[ChannelPhysicalMin]);
- AGH_GBGETTRY (e[ChannelPhysicalMax]);
- AGH_GBGETTRY (e[ChannelDigitalMin]);
- AGH_GBGETTRY (e[ChannelDigitalMax]);
- AGH_GBGETTRY (e[ChannelTransducerType]);
- AGH_GBGETTRY (e[ChannelFilteringInfo]);
- AGH_GBGETTRY (e[ChannelReserved]);
- AGH_GBGETTRY (e[ChannelSamplesPerRecord]);
- AGH_GBGETOBJ (lChannelsNum);
- AGH_GBGETOBJ (bNext);
- AGH_GBGETOBJ (bPrevious);
- AGH_GBGETOBJ (bWrite);
+ AGH_GBGETOBJ (lLabel);
+ // begad, glade indeed has these widgets named like so: "e[PatientID]"!
+ AGH_GBGETTRY (e[PatientID]);
+ AGH_GBGETTRY (e[RecordingID]);
+ AGH_GBGETTRY (e[RecordingDate]);
+ AGH_GBGETTRY (e[RecordingTime]);
+ AGH_GBGETTRY (e[Reserved]);
+ AGH_GBGETTRY (e[ChannelLabel]);
+ AGH_GBGETTRY (e[ChannelPhysicalDim]);
+ AGH_GBGETTRY (e[ChannelPhysicalMin]);
+ AGH_GBGETTRY (e[ChannelPhysicalMax]);
+ AGH_GBGETTRY (e[ChannelDigitalMin]);
+ AGH_GBGETTRY (e[ChannelDigitalMax]);
+ AGH_GBGETTRY (e[ChannelTransducerType]);
+ AGH_GBGETTRY (e[ChannelFilteringInfo]);
+ AGH_GBGETTRY (e[ChannelReserved]);
+ AGH_GBGETTRY (e[ChannelSamplesPerRecord]);
+ AGH_GBGETOBJ (lChannelsNum);
+ AGH_GBGETOBJ (bNext);
+ AGH_GBGETOBJ (bPrevious);
+ AGH_GBGETOBJ (bWrite);
for ( int i = 0; i < _n_entries; ++i ) {
#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list