Adding 3 example Makefiles to track list.
authorWANG <wang@wang-OptiPlex-780.(none)>
Thu, 12 Sep 2013 15:28:39 +0000 (17:28 +0200)
committerWANG <wang@wang-OptiPlex-780.(none)>
Thu, 12 Sep 2013 15:28:39 +0000 (17:28 +0200)
examples/2d_fft/Makefile [new file with mode: 0644]
examples/2d_fft/fft2d.sh [deleted file]
examples/2d_fft/output1.csv [deleted file]
examples/fft/Makefile [new file with mode: 0644]
examples/fft/fft.dsp
examples/fft/fft.sh [deleted file]
examples/licenseplate/test.m [new file with mode: 0644]
examples/sinwave/Makefile [new file with mode: 0644]
examples/sinwave/output1.wav [deleted file]

diff --git a/examples/2d_fft/Makefile b/examples/2d_fft/Makefile
new file mode 100644 (file)
index 0000000..163b306
--- /dev/null
@@ -0,0 +1,10 @@
+SRC = fft2d.dsp
+INPUT = hcosine-32.csv
+
+all: clean fft2d
+
+fft2d: $(SRC) $(INPUT)
+       faustine -d $(SRC) -i $(INPUT) --oformat csv
+
+clean::
+       rm -f gmon.out output*
diff --git a/examples/2d_fft/fft2d.sh b/examples/2d_fft/fft2d.sh
deleted file mode 100644 (file)
index fe18645..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-faustine -d fft2d.dsp -i hcosine-32.csv --oformat csv
-
diff --git a/examples/2d_fft/output1.csv b/examples/2d_fft/output1.csv
deleted file mode 100644 (file)
index 9112295..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-130560.,0.,0.,0.,0.,0.,0.,0.,64804.9222822,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,64804.9222822,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
-0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.,0.
\ No newline at end of file
diff --git a/examples/fft/Makefile b/examples/fft/Makefile
new file mode 100644 (file)
index 0000000..fa1e89d
--- /dev/null
@@ -0,0 +1,13 @@
+SRC = fft.dsp
+INPUT1 = sin_1378Hz_0.005_ampli_128samples.wav
+INPUT2 = sin_2067Hz_0.005_ampli_128samples.wav
+INPUT3 = sin_16536Hz_0.005_ampli_128samples.wav
+INPUT4 = sin_22000Hz_0.005_ampli_128samples.wav
+
+all: clean fft
+
+fft: $(SRC) $(INPUT1) $(INPUT2) $(INPUT3) $(INPUT4)
+       faustine -d $(SRC) -i $(INPUT1) -i $(INPUT2) -i $(INPUT3) -i $(INPUT4)
+
+clean::
+       rm -f gmon.out output*
index 90f97a1..aec903f 100644 (file)
@@ -7,8 +7,8 @@ import ("complex.lib");
 //fft_test(n,m) = _ : overlap(n,m) : fft(n) : stops(n/2), pcplx_moduls(n/2) : nconcat(n/2);
 fft_test(n,m) = vectorize(n) : fft(n) : pcplx_moduls(n) : nconcat(n);
 
 //fft_test(n,m) = _ : overlap(n,m) : fft(n) : stops(n/2), pcplx_moduls(n/2) : nconcat(n/2);
 fft_test(n,m) = vectorize(n) : fft(n) : pcplx_moduls(n) : nconcat(n);
 
-//process = +, _ : + : fft_test(128,128);
-process = fft_test(128,128) : serialize;
+process = +, + : + : fft_test(128,128) : serialize;
+//process = fft_test(128,128) : serialize;
 //process = (0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7) <: shuffle(8);
 
 
 //process = (0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7) <: shuffle(8);
 
 
diff --git a/examples/fft/fft.sh b/examples/fft/fft.sh
deleted file mode 100644 (file)
index 8bec578..0000000
+++ /dev/null
@@ -1 +0,0 @@
-faustine -d fft.dsp -i sin_22000Hz_0.005_ampli_128samples.wav
diff --git a/examples/licenseplate/test.m b/examples/licenseplate/test.m
new file mode 100644 (file)
index 0000000..63ba9da
--- /dev/null
@@ -0,0 +1,7 @@
+a = imread('/home/wang/dev/Faustine/examples/licenseplate/licence_small.png' );
+b = csvread('/home/wang/dev/Faustine/examples/licenseplate/output1.csv' );
+imwrite(uint8(b), 'output1.png');
+
+#figure(2);
+#c = csvread('/home/wang/dev/Faustine/examples/licenseplate/output2.csv' );
+#imwrite(c, 'output2.png');
diff --git a/examples/sinwave/Makefile b/examples/sinwave/Makefile
new file mode 100644 (file)
index 0000000..4a495a4
--- /dev/null
@@ -0,0 +1,7 @@
+all: clean sin
+
+sin: sin.dsp
+       faustine -d $<
+
+clean::
+       rm -f gmon.out output*
diff --git a/examples/sinwave/output1.wav b/examples/sinwave/output1.wav
deleted file mode 100644 (file)
index 5a728e2..0000000
Binary files a/examples/sinwave/output1.wav and /dev/null differ