This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch master in repository aghermann.
commit a0e739da989fae30dc85f1bd338d4739240ba1e7 Author: Andrei Zavada <[email protected]> Date: Fri Sep 27 00:22:02 2013 +0300 whitespace, code comments --- .../src/aghermann/ui/dirlevel-storable-adapter.ii | 4 ++-- upstream/src/libmetrics/mc-artifacts.cc | 2 ++ upstream/src/libmetrics/page-metrics-base.hh | 20 ++++++++++---------- upstream/src/libmetrics/psd.hh | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii index 5e0f731..f7d1f47 100644 --- a/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii +++ b/upstream/src/aghermann/ui/dirlevel-storable-adapter.ii @@ -143,8 +143,8 @@ set_profile_manage_buttons_visibility() bool have_active = current_profile != profiles.end(), is_transient = have_active && current_profile->level == agh::TExpDirLevel::transient, is_modified = have_active && not (*current_profile == Pp2); - printf( "active %d %s %d\n", have_active, have_active ? agh::exp_dir_level_s(current_profile->level) : "-", have_active ? not (*current_profile == Pp2) : -1); - printf( "%s\n-vs-\n%s\n", have_active ? current_profile->serialize().c_str() : "??", Pp2.serialize().c_str()); + // printf( "active %d %s %d\n", have_active, have_active ? agh::exp_dir_level_s(current_profile->level) : "-", have_active ? not (*current_profile == Pp2) : -1); + // printf( "%s\n-vs-\n%s\n", have_active ? current_profile->serialize().c_str() : "??", Pp2.serialize().c_str()); gtk_widget_set_visible( (GtkWidget*)bXProfileSave, have_active); gtk_widget_set_visible( (GtkWidget*)bXProfileRevert, have_active and not is_transient and is_modified); gtk_widget_set_visible( (GtkWidget*)bXProfileDiscard, have_active and not is_transient); diff --git a/upstream/src/libmetrics/mc-artifacts.cc b/upstream/src/libmetrics/mc-artifacts.cc index 75eaed7..48d549f 100644 --- a/upstream/src/libmetrics/mc-artifacts.cc +++ b/upstream/src/libmetrics/mc-artifacts.cc @@ -55,9 +55,11 @@ estimate_E( const valarray<float>& S, return estimate_E( agh::alg::to_vad(S), bins, dmin, dmax); } + } // namespace mc } // namespace metrics + // Local Variables: // Mode: c++ // indent-tabs-mode: 8 diff --git a/upstream/src/libmetrics/page-metrics-base.hh b/upstream/src/libmetrics/page-metrics-base.hh index 8d71ae8..7b4c6b3 100644 --- a/upstream/src/libmetrics/page-metrics-base.hh +++ b/upstream/src/libmetrics/page-metrics-base.hh @@ -84,24 +84,24 @@ class CProfile { double pagesize, double step, size_t bins); CProfile (const CProfile&) = default; public: - SPPack Pp; + SPPack Pp; virtual const char* metric_name() const = 0; const sigfile::CSource& - source() const + source() const { return _using_F(); } int - sig_no() const + sig_no() const { return _using_sig_no; } bool - have_data() const + have_data() const { return _status & TFlags::computed; } size_t - bins() const + bins() const { return _bins; } size_t steps() const; // overlapping pages @@ -126,16 +126,16 @@ class CProfile { // power course // full (note the returned array size is length * n_bins) valarray<TFloat> - course() const + course() const { return _data; } // in a bin valarray<TFloat> - course( size_t m) const + course( size_t m) const { return _data[ slice(m, steps(), _bins) ]; } valarray<TFloat> - spectrum( size_t p) const + spectrum( size_t p) const { return _data[ slice(p * _bins, _bins, 1) ]; } @@ -164,11 +164,11 @@ class CProfile { computed = (1<<0), computable = (1<<1) }; - int _status; + int _status; valarray<TFloat> // arrays in a given bin extracted by slices _data; // it is always double because it is saved/loaded in this form - size_t _bins; + size_t _bins; agh::hash_t _signature_when_mirrored; diff --git a/upstream/src/libmetrics/psd.hh b/upstream/src/libmetrics/psd.hh index 90612d3..dbeb08d 100644 --- a/upstream/src/libmetrics/psd.hh +++ b/upstream/src/libmetrics/psd.hh @@ -65,7 +65,7 @@ plan_type( int f) struct SPPack : public metrics::SPPack { - double binsize; + double binsize; static sigproc::TWinType welch_window_type; static TFFTWPlanType -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
