[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 3ab41af390dd380dec8a642464b829088a37ca97
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue May 28 16:08:01 2013 +0300

    score nrem3 based looking at all relevant channels

diff --git a/src/aghermann/rk1968/rk1968.cc b/src/aghermann/rk1968/rk1968.cc
index 19279af..3f8424e 100644
--- a/src/aghermann/rk1968/rk1968.cc
+++ b/src/aghermann/rk1968/rk1968.cc
@@ -48,15 +48,14 @@ score( agh::CSubject::SEpisode& E)
 
 	auto& firstsource = E.sources.front();
 	for ( size_t p = 0; p < firstsource.pages(); ++p ) {
-		// list<valarray<double>> spectra;
-		// for ( auto H = HH.begin(); H != HH.end(); ++H )
-		// 	spectra.emplace_back( (*H)->power_spectrum(p));
-
-		auto	D = courses_delta.begin(),
-			T = courses_theta.begin();
-		for ( ; D != courses_delta.end(); ++D, ++T )
-			if ( (*D)[p] > (*T)[p] * 1.5 )
-				firstsource[p].mark( sigfile::SPage::TScore::nrem3);
+		auto	Di = courses_delta.begin(),
+			Ti = courses_theta.begin();
+		int decision = 0;
+		for ( ; Di != courses_delta.end(); ++Di, ++Ti )
+			decision +=
+				( (*Di)[p] > (*Ti)[p] * 1.5 );
+		if ( decision > 0 )
+			firstsource[p].mark( sigfile::SPage::TScore::nrem3);
 	}
 	return 0;
 }

-- 
Sleep experiment manager