From 91130bc31ab7163870b104407781db50a6f84980 Mon Sep 17 00:00:00 2001 From: WANG Date: Thu, 12 Sep 2013 17:28:39 +0200 Subject: [PATCH 1/1] Adding 3 example Makefiles to track list. --- examples/2d_fft/Makefile | 10 ++++++++++ examples/2d_fft/fft2d.sh | 2 -- examples/2d_fft/output1.csv | 32 -------------------------------- examples/fft/Makefile | 13 +++++++++++++ examples/fft/fft.dsp | 4 ++-- examples/fft/fft.sh | 1 - examples/licenseplate/test.m | 7 +++++++ examples/sinwave/Makefile | 7 +++++++ examples/sinwave/output1.wav | Bin 131114 -> 0 bytes 9 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 examples/2d_fft/Makefile delete mode 100644 examples/2d_fft/fft2d.sh delete mode 100644 examples/2d_fft/output1.csv create mode 100644 examples/fft/Makefile delete mode 100644 examples/fft/fft.sh create mode 100644 examples/licenseplate/test.m create mode 100644 examples/sinwave/Makefile delete mode 100644 examples/sinwave/output1.wav diff --git a/examples/2d_fft/Makefile b/examples/2d_fft/Makefile new file mode 100644 index 0000000..163b306 --- /dev/null +++ b/examples/2d_fft/Makefile @@ -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 index fe18645..0000000 --- a/examples/2d_fft/fft2d.sh +++ /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 index 9112295..0000000 --- a/examples/2d_fft/output1.csv +++ /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 index 0000000..fa1e89d --- /dev/null +++ b/examples/fft/Makefile @@ -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* diff --git a/examples/fft/fft.dsp b/examples/fft/fft.dsp index 90f97a1..aec903f 100644 --- a/examples/fft/fft.dsp +++ b/examples/fft/fft.dsp @@ -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); -//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); diff --git a/examples/fft/fft.sh b/examples/fft/fft.sh deleted file mode 100644 index 8bec578..0000000 --- a/examples/fft/fft.sh +++ /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 index 0000000..63ba9da --- /dev/null +++ b/examples/licenseplate/test.m @@ -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 index 0000000..4a495a4 --- /dev/null +++ b/examples/sinwave/Makefile @@ -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 index 5a728e2cca463cca0edf2c8809f3d1fd42fa0231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131114 zcmeI*`CmBvp)o_rT4N?nNE-jd{Pud>AMelSalYsKd4AsSg|qGKhDo|fT&-PfR|SR| z=tv|I>6f2Pu|$%zSo-B39f`MRsORS{>6d>@bvuS@Ptdk4T$H{dVU0s*S=7GRF5z-) zdsK0#dVqpZx22WuAXr=@bL7!&h1Z9^p#a|EwMqI7e8fF@>boP?83$qs%y$R%U7Qwev_ucx&>Sdw>9{_cWje{_`@;j%)R+Ae@TXzz zopTRLWczyTEZtnJ91^E5mWU4&%8l9Sud`f5xwXJomoUhow>Vs37DxOTs{&*G&HHIw^}j?(kiFnu@f>Ft|-7iN{7R}IKaOtnc2 zi!&GFM1MtH(vh_4UGMT=m3d$8e^=FX?0s{uH-nwcYNko&hl{zdJ;$gCAxo+RFin=87DYKpN*wOdNF z@(-*#dhL?i?YhP%|LXS~{!OmQ_^By#U6#&WHD=w7@J}%+p-dPfGl)>Ft6wEuHrr8s zn#{D`Y!7U!^ zv+J?=>*u3)PSKsCxy0PZF~}%*r-xui6cb2xHhF;>c*XVs!d0Bo_}BK_{6$3qWjiCV@G|Olr_8D zwXe6=+K3HCF-}60&?s|>ToC-pSLtr-WMSQCo;9?nPgsZR%aZ$bS4W+ASD@HEaBIWH ze(~2uU9nZ}skGlL?x@c*EYUn?Uz7Mp(BCSxD+9ttF0s;^<>~TzWk_H}SZVZNp-r%i zeGzFG(%t{^@*N8<&Bz$L+%R0*rqkfH?}Lb63r;!|73OGUWNu1{m&i551M=GmQ7KW| z^Y)%R6nQ4|M#b-Y{;HL>_dEXGQOgWF4d?TovVfjp6QZBSb_zmlaMa5XjWr)UJ}jJL zGiChX;r4y?x?0|hd^EJu>{P+e_xF6xa7ormm@1cw?sA8OvgF8ZYjPJAH=k;*l+@QW zcXaW@@x<}O@x<|t;~mF4j#DM4N=}uWD*2A%JC5%-Zcey4;pT*!6YeUxtK_bd=>XFK zrUT65n8z`XV;;u@oC!D+aLftj1apEpL3yFPP+qu7TqUj&SBYdsG9#JU9bk8W-2t|B z*w$fNhix79`FVgc!&m%pLyh`#a$*Ux