The following commit has been merged in the master branch:
commit d31e3081ba74cafb1953448aa6d5a9c8efbc945e
Author: andrei zavada <[email protected]>
Date: Wed May 8 08:12:47 2013 +0000
make it 0.9.0.2 w/ speculative fix for CSource::get_region_* signatures
diff --git a/ChangeLog b/ChangeLog
index 6e0834a..9c469f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+v.0.9.0.2 (2013-05-07)
+ * Properly fix CEDFFile::get_signal_*.
v.0.9.0.1 (2013-05-02)
* Fix arg conversions in calls to CEDFFile::get_signal_*.
* Remove unused code that requires g++-4.7.
diff --git a/configure.ac b/configure.ac
index 7a6d4f7..c20a5cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <[email protected]>])
-AC_INIT([Aghermann], [0.9.0.1], [[email protected]])
+AC_INIT([Aghermann], [0.9.0.2], [[email protected]])
AC_CONFIG_SRCDIR([src/main.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ(2.61)
diff --git a/data/mw-dialogs.glade b/data/mw-dialogs.glade
index 3323a80..f3e8b94 100644
--- a/data/mw-dialogs.glade
+++ b/data/mw-dialogs.glade
@@ -424,7 +424,10 @@ With bug reports, either send yours to <a
href="mailto:aghermann-users@lists.
<property name="yalign">0</property>
<property name="xpad">10</property>
<property name="ypad">10</property>
- <property name="label"><big><b>v.
0.9.0.1</b></big> (2013-05-02)
+ <property name="label"><big><b>v.
0.9.0.2</b></big> (2013-05-07)
+<span font="monospace">
+ * Properly fix CEDFFile::get_signal_*.
+<big><b>v. 0.9.0.1</b></big> (2013-05-02)
<span font="monospace">
* Fix arg conversions in calls to CEDFFile::get_signal_*.
<big><b>v. 0.9.0</b></big> (2013-05-01)
diff --git a/debian/changelog b/debian/changelog
index 7ac1dbf..b0d4628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-aghermann (0.9.0.1-1) unstable; urgency=low
+aghermann (0.9.0.2-1) unstable; urgency=low
* New upstream version.
- -- Andrei Zavada <[email protected]> Thu, 02 May 2013 21:09:16 +0200
+ -- Andrei Zavada <[email protected]> Tue, 07 May 2013 00:15:15 +0200
aghermann (0.8.1-1) experimental; urgency=low
diff --git a/src/libsigfile/edf-io.cc b/src/libsigfile/edf-io.cc
index 80e3b95..db9023e 100644
--- a/src/libsigfile/edf-io.cc
+++ b/src/libsigfile/edf-io.cc
@@ -16,8 +16,8 @@ using sigfile::CEDFFile;
valarray<TFloat>
CEDFFile::
-get_region_original( const int h,
- const size_t sa, const size_t sz) const
+get_region_original_smpl( const int h,
+ const size_t sa, const size_t sz) const
{
if ( unlikely (_status & (TStatus::bad_header | TStatus::bad_version)) )
throw invalid_argument("CEDFFile::get_region_original(): broken
source");
@@ -60,11 +60,11 @@ get_region_original( const int h,
valarray<TFloat>
CEDFFile::
-get_region_filtered( const int h,
- const size_t smpla, const size_t smplz) const
+get_region_filtered_smpl( const int h,
+ const size_t smpla, const size_t smplz) const
{
valarray<TFloat> recp =
- get_region_original( h, smpla, smplz);
+ get_region_original_smpl( h, smpla, smplz);
if ( recp.size() == 0 )
return valarray<TFloat> (0);
// and zeromean
@@ -154,9 +154,9 @@ get_region_filtered( const int h,
int
CEDFFile::
-put_region( const int h,
- const valarray<TFloat>& src,
- const size_t offset) const
+put_region_smpl( const int h,
+ const valarray<TFloat>& src,
+ const size_t offset) const
{
if ( unlikely (_status & (TStatus::bad_header | TStatus::bad_version)) )
throw invalid_argument("CEDFFile::put_region_(): broken
source");
@@ -203,14 +203,6 @@ put_region( const int h,
-int
-CEDFFile::
-put_signal( const int h,
- const valarray<TFloat>& src) const
-{
- return put_region( h, src, (size_t)0);
-}
-
int
CEDFFile::
diff --git a/src/libsigfile/edf.hh b/src/libsigfile/edf.hh
index 6c1e0de..60925f1 100644
--- a/src/libsigfile/edf.hh
+++ b/src/libsigfile/edf.hh
@@ -194,47 +194,31 @@ class CEDFFile
// signal data extractors
valarray<TFloat>
- get_region_original( int h, size_t smpla, size_t smplz) const;
- valarray<TFloat>
- get_region_original( const int h,
- const float timea, const float timez) const
- {
- size_t sr = samplerate(h);
- return get_region_original(
- h, (size_t)(timea * sr), (size_t)(timez * sr));
- }
+ get_region_original_smpl( int, size_t, size_t) const;
valarray<TFloat>
- get_signal_original( const int h) const
- { return get_region_original(
+ get_signal_original( const int h) const // there is a
CSource::get_signal_original already, but this one is a little better
+ { return get_region_original_smpl(
h, 0, n_data_records *
(*this)[h].samples_per_record); }
valarray<TFloat>
- get_region_filtered( int h,
- size_t smpla, size_t smplz) const;
+ get_region_filtered_smpl( int, size_t, size_t) const;
valarray<TFloat>
- get_region_filtered( const int h,
- float timea, float timez) const
- {
- size_t sr = samplerate(h);
- return get_region_filtered(
- h, (size_t)(timea * sr), (size_t)(timez * sr));
- }
- valarray<TFloat>
get_signal_filtered( const int h) const
- { return get_region_filtered(
+ { return get_region_filtered_smpl(
h, 0, n_data_records *
(*this)[h].samples_per_record); }
// put signal
int
- put_region( int h, const valarray<TFloat>& src, size_t offset) const;
+ put_region_smpl( int, const valarray<TFloat>&, size_t) const;
int
- put_region( const int h, const valarray<TFloat>& src, float offset)
const
- { return put_region( h, src, (size_t)(offset * samplerate(h)));
}
+ put_region_sec( const int h, const valarray<TFloat>& src, const float
offset) const
+ { return put_region_smpl( h, src, (size_t)(offset *
samplerate(h))); }
int
- put_signal( int h, const valarray<TFloat>& src) const;
+ put_signal( const int h, const valarray<TFloat>& src) const
+ { return put_region_smpl( h, src, 0); }
// signal data info
pair<TFloat, TFloat>
diff --git a/src/libsigfile/source-base.hh b/src/libsigfile/source-base.hh
index d1bdc2a..f913f6a 100644
--- a/src/libsigfile/source-base.hh
+++ b/src/libsigfile/source-base.hh
@@ -288,63 +288,65 @@ class CSource {
// get samples
// original
virtual valarray<TFloat>
- get_region_original( int, size_t, size_t) const = 0;
+ get_region_original_smpl( int, size_t, size_t) const = 0;
valarray<TFloat>
- get_region_original( const int h,
- const float seconds_off_start,
- const float seconds_off_end) const
+ get_region_original_sec( const int h,
+ const float seconds_off_start,
+ const float seconds_off_end) const
{
size_t sr = samplerate(h);
- return get_region_original(
+ return get_region_original_smpl(
h,
seconds_off_start * sr,
- seconds_off_end * sr);
+ seconds_off_end * sr);
}
- valarray<TFloat>
+ virtual valarray<TFloat> // let derived classes provide optimised
methods
get_signal_original( const int h) const
{
- return get_region_original(
+ return get_region_original_smpl(
h,
- (float)0.0, recording_time() * samplerate(h));
+ 0.0f, recording_time() * samplerate(h));
}
// filtered
virtual valarray<TFloat>
- get_region_filtered( int h, size_t, size_t) const = 0;
+ get_region_filtered_smpl( int, size_t, size_t) const = 0;
valarray<TFloat>
- get_region_filtered( const int h,
- const float seconds_off_start,
- const float seconds_off_end) const
+ get_region_filtered_sec( const int h,
+ const float seconds_off_start,
+ const float seconds_off_end) const
{
size_t sr = samplerate(h);
- return get_region_filtered(
+ return get_region_filtered_smpl(
h,
seconds_off_start * sr,
seconds_off_end * sr);
}
- valarray<TFloat>
+ virtual valarray<TFloat>
get_signal_filtered( const int h) const
{
- return get_region_filtered(
+ return get_region_filtered_sec(
h,
0.0f, recording_time() * samplerate(h));
}
// put samples
virtual int
- put_region( int h,
- const valarray<TFloat>& src,
- size_t offset) const = 0;
+ put_region_smpl( int, const valarray<TFloat>&, size_t) const = 0;
+
+ int
+ put_region_sec( const int h, const valarray<TFloat>& src, const float
offset) const
+ { return put_region_smpl( h, src, offset * samplerate(h)); }
int
- put_signal( int h,
+ put_signal( const int h,
const valarray<TFloat>& src)
{
- return put_region( h, src, 0);
+ return put_region_smpl( h, src, 0);
}
// signal data info
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
