From: hskwk <hosokawa.kenchi@gmail.com>
Date: Wed, 15 Jul 2015 14:57:54 +0000 (+0900)
Subject: test
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=0d6f30dda998b99119681bf9015e1f34be9a4855;p=psychlops%2Fcpp.git

test
---

diff --git a/psychlops/extension/standard/fft/psychlops_FFTW_bridge.cpp b/psychlops/extension/standard/fft/psychlops_FFTW_bridge.cpp
index 4502569..910a293 100644
--- a/psychlops/extension/standard/fft/psychlops_FFTW_bridge.cpp
+++ b/psychlops/extension/standard/fft/psychlops_FFTW_bridge.cpp
@@ -22,6 +22,127 @@ namespace Psychlops {
 
 
 
+	FFT1::FFT1()
+	{
+		construct_default();
+	}
+	FFT1::FFT1(int wid)
+	{
+		construct_default();
+		set(wid);
+	}
+	FFT1::FFT1(const Matrix &source)
+	{
+		construct_default();
+		set(source);
+	}
+	FFT1::~FFT1()
+	{
+		release();
+	}
+	void FFT1::construct_default()
+	{
+		width_=0;
+		img_spc=0; frq_spc=0;
+	}
+	void FFT1::release()
+	{
+		if(img_spc!=0) { free(img_spc); img_spc = 0; }
+		if(frq_spc!=0) { free(frq_spc); frq_spc = 0; }
+		width_=0;
+	}
+	void FFT1::set(int wid)
+	{
+		if(img_spc==0 || frq_spc==0 || (width_ != wid) ) {
+			release();
+			img_spc = (fftw_complex*)malloc(sizeof(fftw_complex) * wid);
+			frq_spc = (fftw_complex*)malloc(sizeof(fftw_complex) * wid);
+		}
+		width_  = wid;
+		x_zero = wid + 1;
+		left = (wid)/2;
+	}
+	void FFT1::set(const Matrix &source)
+	{
+		if(source.getRows()==1) {
+			set(source.getCols());
+			for(int x=0; x<width_; x++) {
+				img_spc[x][REAL] = source(1, x+1);
+				img_spc[x][IMAGINARY] = 0.0;
+			}
+		}
+	}
+
+	double FFT1::getDC()
+	{
+		return sqrt(frq_spc[0][REAL]*frq_spc[0][REAL]+frq_spc[0][IMAGINARY]*frq_spc[0][IMAGINARY]);
+	}
+	double FFT1::setDC(double l)
+	{
+		frq_spc[0][REAL] = l;
+		frq_spc[0][IMAGINARY] = 0;
+		return l;
+	}
+
+
+	void FFT1::fft()
+	{
+		fftw_plan plan = fftw_plan_dft_1d(width_, img_spc, frq_spc, FFTW_FORWARD, FFTW_ESTIMATE);
+		fftw_execute(plan);
+		normalizeFFT();
+	}
+	void FFT1::ifft()
+	{
+		fftw_plan plan = fftw_plan_dft_1d(width_, frq_spc, img_spc, FFTW_BACKWARD, FFTW_ESTIMATE);
+		fftw_execute(plan);
+	}
+	void FFT1::normalizeFFT()
+	{
+		double num = width_;
+		for (int i=0; i<num; i++) {
+			frq_spc[i][REAL] /= num;
+			frq_spc[i][IMAGINARY] /= num;
+		}
+	}
+	void FFT1::getImage(Matrix &target)
+	{
+		double rl, im;
+		int h, v;
+		if( (target.getCols()!=width_)) {
+			target.release();
+			target.set(1, width_);
+		}
+		for (int x=0; x<width_; x++) {
+			rl = img_spc[x][REAL];
+			im = img_spc[x][IMAGINARY];
+			target(1, x+1) = sqrt(rl*rl+im*im);
+		}
+	}
+	void FFT1::getSpectrum(Matrix &target, double gamma)
+	{
+		const int right = width_%2==0 ? left : left+1;
+		double rl, im;
+		Color col;
+		if( (target.getCols()!=width_) ) {
+			target.release();
+			target.set(1, width_);
+		}
+		int h, v = 1;
+		for (int x=0; x<right; x++) {
+			h = x+left + 1;
+			rl = frq_spc[x][REAL];
+			im = frq_spc[x][IMAGINARY];
+			target(v, h) = pow( sqrt(rl*rl+im*im), gamma );
+		}
+		for (int x=right; x<width_; x++) {
+			h = x-right + 1;
+			rl = frq_spc[x][REAL];
+			im = frq_spc[x][IMAGINARY];
+			target(v, h) = pow( sqrt(rl*rl+im*im), gamma );
+		}
+	}
+
+
 
 	FFT2::FFT2()
 	{
diff --git a/psychlops/extension/standard/fft/psychlops_FFTW_bridge.h b/psychlops/extension/standard/fft/psychlops_FFTW_bridge.h
index 4bb3145..c939303 100644
--- a/psychlops/extension/standard/fft/psychlops_FFTW_bridge.h
+++ b/psychlops/extension/standard/fft/psychlops_FFTW_bridge.h
@@ -20,6 +20,40 @@ namespace Psychlops {
 	double cumulativeLog2NormalDistibution(double log_x, double octave_mu, double octave_sigma);
 
 
+	class FFT1 {
+	protected:
+		int width_;
+		int left, x_zero;
+		fftw_complex *img_spc;
+		fftw_complex *frq_spc;
+		void construct_default();
+	public:
+
+		// Initialize
+		FFT1();
+		FFT1(int width);
+		FFT1(const Matrix &source);
+		~FFT1();
+		void release();
+		void set(int wid);
+		void set(const Matrix &source);
+
+		// Accesser to elements
+		double getDC();
+		double setDC(double l);
+
+		// Core FFT Execution
+		void fft();
+		void ifft();
+		void normalizeFFT();
+
+		void getImage(Matrix &absolute);
+		void getSpectrum(Matrix &absolute, double gamma = 1.0);
+		//void getImage(Matrix &reali, Matrix &imagi);
+		//void getSpectrum(Matrix &reali, Matrix &imagi);
+
+	};
+
 	class FFT2 {
 	protected:
 		int width_, height_;
diff --git a/win32gl/test/Psychlops_win32cblibtest.cbp b/win32gl/test/Psychlops_win32cblibtest.cbp
index 06276d9..78cab64 100644
--- a/win32gl/test/Psychlops_win32cblibtest.cbp
+++ b/win32gl/test/Psychlops_win32cblibtest.cbp
@@ -180,19 +180,19 @@
 			<Option compile="0" />
 			<Option link="0" />
 		</Unit>
-		<Unit filename="basickFlickerTest.cpp" />
-		<Unit filename="bugfix.cpp">
+		<Unit filename="basickFlickerTest.cpp">
 			<Option compile="0" />
 			<Option link="0" />
 		</Unit>
-		<Unit filename="compilenew.cpp">
+		<Unit filename="bugfix.cpp">
 			<Option compile="0" />
 			<Option link="0" />
 		</Unit>
-		<Unit filename="fftfirm.cpp">
+		<Unit filename="compilenew.cpp">
 			<Option compile="0" />
 			<Option link="0" />
 		</Unit>
+		<Unit filename="fftfirm.cpp" />
 		<Unit filename="inputTest.cpp">
 			<Option compile="0" />
 			<Option link="0" />
diff --git a/win32gl/test/fftfirm.cpp b/win32gl/test/fftfirm.cpp
index 4c03f04..943b951 100644
--- a/win32gl/test/fftfirm.cpp
+++ b/win32gl/test/fftfirm.cpp
@@ -1,6 +1,45 @@
  #include <psychlops.h>
  using namespace Psychlops;
 
+
+void psychlops_main() {
+	Canvas cnvs(1024, 768, Canvas::window);
+
+	FFT1 fftworkspace;
+	Matrix source_mat, filtered_mat, mat;
+	source_mat.load("voltage_spec_vaio_ie.csv");
+	source_mat.transpose();
+
+	//fftworkspace.set(64,64);
+	//fftworkspace.makeNoise();
+	fftworkspace.set(source_mat);
+	fftworkspace.fft();
+	fftworkspace.getSpectrum(filtered_mat, 1.0);
+
+	int q = filtered_mat.getCols() / 4;
+	Interval col;
+	mat = filtered_mat(1, q*2+3<=col<=q*3);
+	mat.transpose();
+	mat.save("voltage_spec.csv");
+
+	double mean = 0.0;
+	for(int i=0; i<source_mat.getCols(); i++) {
+		mean += source_mat(1, i+1);
+	}
+	mean /= source_mat.getCols();
+	int counter = 0;
+	for(int i=1; i<source_mat.getCols()-3; i++) {
+		if(    source_mat(1, i+1)<mean
+			&& source_mat(1, i+2)<mean
+			&& source_mat(1, i+3)>mean
+			&& source_mat(1, i+4)>mean
+		) { counter++; }
+	}
+	std::cout << counter << std::endl;
+}
+
+
+/*
 const int S = 128;
 
  void psychlops_main() {
@@ -42,3 +81,4 @@ const int S = 128;
 
  }
 
+*/