From 6c6f573494fb49703c2cc7bff3dcddfd2d67b07d Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Tue, 11 Sep 2018 22:24:26 +0100
Subject: [PATCH] NRT HPSS Correct object name in error message

---
 src/fdHPSS/fdHPSS.cpp |   2 +-
 src/fdHPSS/tests.scd  | 145 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 src/fdHPSS/tests.scd

diff --git a/src/fdHPSS/fdHPSS.cpp b/src/fdHPSS/fdHPSS.cpp
index a201ee5..c2a1814 100644
--- a/src/fdHPSS/fdHPSS.cpp
+++ b/src/fdHPSS/fdHPSS.cpp
@@ -53,7 +53,7 @@ namespace fluid {
         std::tie(parametersOk,whatHappened,processModel) = processor.sanityCheck();
         if(!parametersOk)
         {
-          Print("fdNMF: %s \n", whatHappened.c_str());
+          Print("fdHPSS: %s \n", whatHappened.c_str());
           return false;
         }
         //Now, we can proceed
diff --git a/src/fdHPSS/tests.scd b/src/fdHPSS/tests.scd
new file mode 100644
index 0000000..996be66
--- /dev/null
+++ b/src/fdHPSS/tests.scd
@@ -0,0 +1,145 @@
+s.reboot
+////////////////////////////
+// test for efficiency
+
+(
+b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav");
+c = Buffer.new(s);
+x = Buffer.new(s);
+y = Buffer.new(s);
+~fft_size = 1024;
+~frame_size = 512;
+~hop_size = 256;
+~which_rank = 0;
+)
+
+(
+// without sources
+Routine{
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum,0,-1,0,-1,nil,x.bufnum,0,y.bufnum,0,5,100,0,~frame_size,~hop_size,~fft_size);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+}.play
+);
+
+// with sources only
+(
+Routine{
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum, 0,-1,0,-1,c.bufnum,nil,0,nil,0,5,100,0,~frame_size,~hop_size,~fft_size);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+}.play
+)
+
+// with everything
+(
+Routine{
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum, 0,-1,0,-1,c.bufnum,x.bufnum,0,y.bufnum,0,5,100,0,~frame_size,~hop_size,~fft_size);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+}.play
+)
+
+
+//look at the dictionaries and activations
+c.plot;x.plot; y.plot;
+//null test of the sum of sources
+{(PlayBuf.ar(5,c.bufnum,doneAction:2).sum)+(-1*PlayBuf.ar(1,b.bufnum,doneAction:2))}.play
+
+// play around
+{Splay.ar(PlayBuf.ar(5,c.bufnum,doneAction:2))}.play
+
+//play a single source
+{PlayBuf.ar(5,c.bufnum,doneAction:2)[~which_rank].dup}.play
+
+//play noise through a filter
+(
+{
+	var chain;
+	chain = FFT(LocalBuf(~fft_size), WhiteNoise.ar());
+
+	chain = chain.pvcollect(~fft_size, {|mag, phase, index|
+		[mag * BufRd.kr(5,x.bufnum,DC.kr(index),0,1)[~which_rank]];
+	});
+
+	IFFT(chain);
+}.play
+)
+
+//play noise through an activation
+{WhiteNoise.ar(BufRd.kr(5,y.bufnum,Phasor.ar(1,1/~hop_size,0,(b.numFrames / ~hop_size + 1)),0,1)[~which_rank])*0.5}.play
+
+//play noise through both activation and filter
+(
+{
+	var chain;
+	chain = FFT(LocalBuf(~fft_size), WhiteNoise.ar(BufRd.kr(5,y.bufnum,Phasor.ar(1,1/~hop_size,0,(b.numFrames / ~hop_size + 1)),0,1)[~which_rank]*12),0.5,1);
+
+	chain = chain.pvcollect(~fft_size, {|mag, phase, index|
+		[mag * BufRd.kr(5,x.bufnum,DC.kr(index),0,1)[~which_rank]];
+	});
+
+	[0,IFFT(chain)];
+}.play
+)
+
+// test with stereo input
+Buffer.freeAll(s)
+
+(
+b = Buffer.read(s,"/Users/pa/Desktop/verystereo.wav");
+c = Buffer.new(s);
+x = Buffer.new(s);
+y = Buffer.new(s);
+~fft_size = 1024;
+~frame_size = 512;
+~hop_size = 256;
+)
+
+b.play
+
+(
+Routine{
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum,0,-1,0,-1,c.bufnum,x.bufnum,0,y.bufnum,0,5,100,0,~frame_size,~hop_size,~fft_size);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+}.play
+)
+
+//test a single rank
+{PlayBuf.ar(10,c.bufnum,doneAction:2)[9].dup}.play
+
+// play them all across in a sort of upmixed stereo...
+{Splay.ar(PlayBuf.ar(10,c.bufnum,doneAction:2))}.play
+
+//test process on a segment
+Buffer.freeAll(s)
+
+(
+b = Buffer.read(s,"/Users/pa/Desktop/verystereo.wav");
+c = Buffer.new(s);
+d = Buffer.new(s);
+)
+
+b.play
+
+(
+Routine{
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum,44100,44100,0,1,c.bufnum,rank:2);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+	t = Main.elapsedTime;
+	FDNMF.process(s,b.bufnum,8810,44100,1,1,d.bufnum,rank:2);
+	s.sync;
+	(Main.elapsedTime - t).postln;
+}.play
+)
+c.query
+c.play
+d.query
+d.play