[med-svn] [SCM] aghermann branch, master, updated. 4bf90d43694a53ef57dc59a403069d6460032c46

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 4bf90d43694a53ef57dc59a403069d6460032c46
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu May 16 02:14:28 2013 +0300

    on to 1.0; mkdir rk1968

diff --git a/configure.ac b/configure.ac
index c20a5cc..30c431e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [0.9.0.2], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [1.0_rc], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
@@ -201,6 +201,7 @@ AC_OUTPUT([
 	src/ica/Makefile
 	src/common/Makefile
 	src/expdesign/Makefile
+	src/rk1968/Makefile
 	src/model/Makefile
 	src/ui/Makefile
 	src/ui/sm/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index d943376..cb2d08e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS := \
 	common sigproc ica libsigfile \
 	metrics \
 	expdesign \
-	patterns model \
+	patterns \
+	rk1968 model \
 	ui \
 	tools
 
@@ -26,6 +27,7 @@ aghermann_LDADD := \
 	ui/mf/liba.a \
 	ui/liba.a \
 	model/liba.a \
+	rk1968/liba.a \
 	patterns/liba.a \
 	metrics/liba.a \
 	libsigfile/liba.a \
diff --git a/src/expdesign/primaries.hh b/src/expdesign/primaries.hh
index 735eced..63ae0b5 100644
--- a/src/expdesign/primaries.hh
+++ b/src/expdesign/primaries.hh
@@ -550,13 +550,6 @@ const char* CExpDesign::group_of( const T& jid)
 
 
 
-
-namespace beersma {
-int
-assisted_score( agh::CSubject::SEpisode&);
-} // namespace beersma
-
-
 } // namespace agh
 
 #endif
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index 7e86bed..1e18f18 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -12,7 +12,6 @@ liba_a_SOURCES := \
 	achermann-siman.cc \
 	ultradian-cycle.cc \
 	borbely.cc \
-	assisted-score.cc \
 	beersma.hh \
 	forward-decls.hh
 
diff --git a/src/patterns/Makefile.am b/src/rk1968/Makefile.am
similarity index 72%
copy from src/patterns/Makefile.am
copy to src/rk1968/Makefile.am
index e4fef5f..946aead 100644
--- a/src/patterns/Makefile.am
+++ b/src/rk1968/Makefile.am
@@ -5,16 +5,13 @@ AM_CXXFLAGS := \
 noinst_LIBRARIES := liba.a
 
 liba_a_SOURCES := \
-	patterns.cc patterns.hh patterns.ii
+	rk1968.cc
 
 if DO_PCH
 BUILT_SOURCES := \
-	patterns.hh.gch
+	rk1968.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
 CLEANFILES := \
 	$(BUILT_SOURCES)
 endif
-
-EXTRA_DIST := \
-	patterns.ii
diff --git a/src/model/assisted-score.cc b/src/rk1968/rk1968.cc
similarity index 86%
rename from src/model/assisted-score.cc
rename to src/rk1968/rk1968.cc
index 12bdf7f..40d3be3 100644
--- a/src/model/assisted-score.cc
+++ b/src/rk1968/rk1968.cc
@@ -1,5 +1,5 @@
 /*
- *       File name:  model/assisted-score.cc
+ *       File name:  rk1968/rk1968.cc
  *         Project:  Aghermann
  *          Author:  Andrei Zavada <johnhommer at gmail.com>
  * Initial version:  2010-11-09
@@ -11,19 +11,18 @@
 
 
 #include <forward_list>
-#include <valarray>
 
 #include "libsigfile/page.hh"
 #include "libsigfile/source.hh"
-#include "expdesign/primaries.hh"
-#include "beersma.hh"
+#include "expdesign/recording.hh"
+#include "rk1968.hh"
 
 
 using namespace std;
 
 int
-agh::beersma::
-assisted_score( agh::CSubject::SEpisode& E)
+agh::rk1968::
+score( agh::CSubject::SEpisode& E)
 {
 	forward_list<agh::CRecording*> HH;
 	for ( auto &R : E.recordings )
diff --git a/src/rk1968/rk1968.hh b/src/rk1968/rk1968.hh
new file mode 100644
index 0000000..d2e1e59
--- /dev/null
+++ b/src/rk1968/rk1968.hh
@@ -0,0 +1,30 @@
+/*
+ *       File name:  rk1968/rk1968.hh
+ *         Project:  Aghermann
+ *          Author:  Andrei Zavada <johnhommer at gmail.com>
+ * Initial version:  2013-05-16
+ *
+ *         Purpose:  assisted score
+ *
+ *         License:  GPL
+ */
+
+#ifndef _AGH_RK1968_H
+#define _AGH_RK1968_H
+
+#include "expdesign/primaries.hh"
+
+namespace agh {
+namespace rk1968 {
+
+int score( agh::CSubject::SEpisode&);
+
+} // namespace rk1968
+} // namespace agh
+
+#endif // _AGH_RK1968_H
+
+// Local Variables:
+// Mode: c++
+// indent-tabs-mode: 8
+// End:
diff --git a/src/ui/sf/hypnogram_cb.cc b/src/ui/sf/hypnogram_cb.cc
index ddb1b26..ad97019 100644
--- a/src/ui/sf/hypnogram_cb.cc
+++ b/src/ui/sf/hypnogram_cb.cc
@@ -11,7 +11,7 @@
 
 #include <fstream>
 
-#include "model/beersma.hh"
+#include "rk1968/rk1968.hh"
 #include "ui/globals.hh"
 #include "sf.hh"
 
@@ -107,7 +107,7 @@ iSFScoreAssist_activate_cb(
 {
 	auto& SF = *(SScoringFacility*)userdata;
 
-	if ( agh::beersma::assisted_score( SF.sepisode()) == 0 ) {
+	if ( agh::rk1968::score( SF.sepisode()) == 0 ) {
 		SF.get_hypnogram();
 		SF.calculate_scored_percent();
 		//SF.repaint_score_stats();

-- 
Sleep experiment manager