[med-svn] [SCM] aghermann branch, master, updated. 9c95ea59282c4fc6ef7eb192072500f9d0659fc3

[Andrei Zavada]

The following commit has been merged in the master branch:
commit e4ae889a28a116a7793666b15e6979bfd39b0970
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri Jan 4 10:34:54 2013 +0200

    groundwork for phasic event detection

diff --git a/src/libsigfile/source-slowwave.cc b/src/libsigfile/source-slowwave.cc
deleted file mode 100644
index 4c515a4..0000000
--- a/src/libsigfile/source-slowwave.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// ;-*-C++-*-
-/*
- *       File name:  libdigfile/source-slowwave.cc
- *         Project:  Aghermann
- *          Author:  Andrei Zavada <johnhommer at gmail.com>
- * Initial version:  2011-09-25
- *
- *         Purpose:  Slow Wave inspector (whatever that might mean)
- *
- *         License:  GPL
- */
-
-
-#include "../libsigfile/page.hh"
-#include "../libsigfile/source.hh"
-
-using namespace std;
-
-int
-__attribute__ ((const))
-agh::CEDFFile::SSignal::
-assess_slowwaves() const
-{
-	
-	return 0;
-}
-
-
-// eof
diff --git a/src/libsigfile/source.hh b/src/libsigfile/source.hh
index 58a326c..5b375df 100644
--- a/src/libsigfile/source.hh
+++ b/src/libsigfile/source.hh
@@ -286,6 +286,17 @@ class CSource
 };
 
 
+template <typename T = int>
+struct SNamedChannel {
+	CSource& source;
+	T sig_no;
+	SNamedChannel (CSource& source_, T sig_no_)
+	      : source (source_),
+		sig_no (sig_no_)
+		{}
+	SNamedChannel (const SNamedChannel&) = default;
+};
+
 
 
 } // namespace sigfile
diff --git a/src/metrics/Makefile.am b/src/metrics/Makefile.am
index df45792..2af483e 100644
--- a/src/metrics/Makefile.am
+++ b/src/metrics/Makefile.am
@@ -17,7 +17,9 @@ liba_a_SOURCES := \
 	mc.hh \
 	mc-artifacts.cc \
 	mc-artifacts.hh \
-	mc-artifacts.ii
+	mc-artifacts.ii \
+	phasic-events.ii \
+	phasic-events.hh
 
 if DO_PCH
 BUILT_SOURCES := \
@@ -26,7 +28,8 @@ BUILT_SOURCES := \
 	psd.hh.gch \
 	swu.hh.gch \
 	mc.hh.gch \
-	mc-artifacts.hh.gch
+	mc-artifacts.hh.gch \
+	phasic-events.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
 CLEANFILES = \
diff --git a/src/metrics/forward-decls.hh b/src/metrics/forward-decls.hh
index 739de8b..10e0f14 100644
--- a/src/metrics/forward-decls.hh
+++ b/src/metrics/forward-decls.hh
@@ -35,6 +35,9 @@ class CProfile;
 }
 
 
+namespace phasic {
+}
+
 
 } // namespace metrics
 
diff --git a/src/metrics/phasic-events.hh b/src/metrics/phasic-events.hh
new file mode 100644
index 0000000..f71e0ab
--- /dev/null
+++ b/src/metrics/phasic-events.hh
@@ -0,0 +1,49 @@
+// ;-*-C++-*-
+/*
+ *       File name:  metrics/phasic-events.hh
+ *         Project:  Aghermann
+ *          Author:  Andrei Zavada <johnhommer at gmail.com>
+ *
+ * Initial version:  2013-01-03
+ *
+ *         Purpose:  CPhasicEventEstimator and related stuff
+ *
+ *         License:  GPL
+ */
+
+#ifndef _METRICS_PHASIC_EVENTS_H
+#define _METRICS_PHASIC_EVENTS_H
+
+#include <list>
+
+#include "common/alg.hh"
+#include "libsigfile/source.hh"
+#include "forward-decls.hh"
+
+#if HAVE_CONFIG_H && !defined(VERSION)
+#  include "config.h"
+#endif
+
+using namespace std;
+
+namespace metrics {
+namespace phasic {
+
+template <typename T>
+list<agh::alg::SSpan<double>>
+detect_spindles( const sigfile::SNamedChannel<T>&);
+
+template <typename T>
+list<agh::alg::SSpan<double>>
+detect_Kcomplexes( const sigfile::SNamedChannel<T>&);
+
+
+#include "phasic-events.ii"
+
+} // namespace phasic
+} // namespace metrics
+
+
+#endif // _METRICS_PHASIC_EVENTS_H
+
+// eof
diff --git a/src/metrics/phasic-events.ii b/src/metrics/phasic-events.ii
new file mode 100644
index 0000000..8cc3c7c
--- /dev/null
+++ b/src/metrics/phasic-events.ii
@@ -0,0 +1,34 @@
+// ;-*-C++-*-
+/*
+ *       File name:  metrics/phasic-events.ii
+ *         Project:  Aghermann
+ *          Author:  Andrei Zavada <johnhommer at gmail.com>
+ * Initial version:  2013-01-04
+ *
+ *         Purpose:  phasic event detection
+ *
+ *         License:  GPL
+ */
+
+
+using namespace std;
+
+template <typename T>
+list<agh::alg::SSpan<double>>
+detect_spindles( const sigfile::SNamedChannel<T>&)
+{
+	list<agh::alg::SSpan<double>> ret;
+	
+	return ret;
+}
+
+template <typename T>
+list<agh::alg::SSpan<double>>
+detect_Kcomplexes( const sigfile::SNamedChannel<T>&)
+{
+	list<agh::alg::SSpan<double>> ret;
+	
+	return ret;
+}
+
+// eof

-- 
Sleep experiment manager