Cleanup factory

diff --git a/.gitignore b/.gitignore
index 35657b9f1a7c2b03bd3d8b543766503c65b97df5..b8b300f2f3bae3c25fbf409d007e37b559258dd6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@
 *.lot
 fig/factory/*/*.pgm
 fig/factory/*/*.png
+fig/factory/Makefile
 
 

diff --git a/fig/factory/Makefile b/fig/factory/Makefile
deleted file mode 100644 (file)
index 3494697..0000000
--- a/fig/factory/Makefile
+++ /dev/null
@@ -1,317 +0,0 @@
-lena_eye/n_q30.pgm: lena_eye.pgm
-       mkdir -p lena_eye
-       python noise.py -t normal -m 0 -s 30 lena_eye.pgm lena_eye/n_q30.pgm
-
-lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm: lena_eye/n_q30.pgm sobel
-       ./sobel -n 16 -p 2 -r 5 -s 3 -b 8000 -g 60 lena_eye/n_q30.pgm lena_eye/r_p2_n16_b8000_g60_r5_s3_structure.pgm lena_eye/r_p2_n16_b8000_g60_r5_s3_edge.pgm lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm
-
-lena_eye/m_r_p2_n16_b8000_g60_r5_s3.pgm: lena_eye/n_q30.pgm lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm
-       ./methodnoise lena_eye/n_q30.pgm lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm lena_eye/m_r_p2_n16_b8000_g60_r5_s3.pgm 127 30
-
-lena_eye: lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm lena_eye/m_r_p2_n16_b8000_g60_r5_s3.pgm
-
-lena/n_q100.pgm: lena.pgm
-       mkdir -p lena
-       python noise.py -t normal -m 0 -s 100 lena.pgm lena/n_q100.pgm
-
-lena/r_p2_n16_b1000_g250_r3_s3.pgm: lena/n_q100.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 1000 -g 250 lena/n_q100.pgm lena/r_p2_n16_b1000_g250_r3_s3_structure.pgm lena/r_p2_n16_b1000_g250_r3_s3_edge.pgm lena/r_p2_n16_b1000_g250_r3_s3.pgm
-
-lena/m_r_p2_n16_b1000_g250_r3_s3.pgm: lena/n_q100.pgm lena/r_p2_n16_b1000_g250_r3_s3.pgm
-       ./methodnoise lena/n_q100.pgm lena/r_p2_n16_b1000_g250_r3_s3.pgm lena/m_r_p2_n16_b1000_g250_r3_s3.pgm 127 30
-
-lena/r_p2_n16_b8000_g250_r3_s3.pgm: lena/n_q100.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 8000 -g 250 lena/n_q100.pgm lena/r_p2_n16_b8000_g250_r3_s3_structure.pgm lena/r_p2_n16_b8000_g250_r3_s3_edge.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm
-
-lena/m_r_p2_n16_b8000_g250_r3_s3.pgm: lena/n_q100.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm
-       ./methodnoise lena/n_q100.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm lena/m_r_p2_n16_b8000_g250_r3_s3.pgm 127 30
-
-lena: lena/r_p2_n16_b1000_g250_r3_s3.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm lena/m_r_p2_n16_b1000_g250_r3_s3.pgm lena/m_r_p2_n16_b8000_g250_r3_s3.pgm
-
-circle/n_q0.pgm: circle.pgm
-       mkdir -p circle
-       python noise.py -t normal -m 0 -s 0 circle.pgm circle/n_q0.pgm
-
-circle/r_p2_n8_b50000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 8 -p 2 -r 1 -s 1 -b 50000 -g 100 circle/n_q0.pgm circle/r_p2_n8_b50000_g100_r1_s1_structure.pgm circle/r_p2_n8_b50000_g100_r1_s1_edge.pgm circle/r_p2_n8_b50000_g100_r1_s1.pgm
-
-circle/m_r_p2_n8_b50000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n8_b50000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n8_b50000_g100_r1_s1.pgm circle/m_r_p2_n8_b50000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 8 -p 2 -r 1 -s 1 -b 50000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1_structure.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1_edge.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n8_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b50000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n8_b100000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 8 -p 2 -r 1 -s 1 -b 100000 -g 100 circle/n_q0.pgm circle/r_p2_n8_b100000_g100_r1_s1_structure.pgm circle/r_p2_n8_b100000_g100_r1_s1_edge.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm
-
-circle/m_r_p2_n8_b100000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm circle/m_r_p2_n8_b100000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 8 -p 2 -r 1 -s 1 -b 100000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1_structure.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1_edge.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n8_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b100000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n16_b50000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 16 -p 2 -r 1 -s 1 -b 50000 -g 100 circle/n_q0.pgm circle/r_p2_n16_b50000_g100_r1_s1_structure.pgm circle/r_p2_n16_b50000_g100_r1_s1_edge.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm
-
-circle/m_r_p2_n16_b50000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm circle/m_r_p2_n16_b50000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 16 -p 2 -r 1 -s 1 -b 50000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1_structure.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1_edge.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n16_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b50000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n16_b100000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 16 -p 2 -r 1 -s 1 -b 100000 -g 100 circle/n_q0.pgm circle/r_p2_n16_b100000_g100_r1_s1_structure.pgm circle/r_p2_n16_b100000_g100_r1_s1_edge.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm
-
-circle/m_r_p2_n16_b100000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm circle/m_r_p2_n16_b100000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 16 -p 2 -r 1 -s 1 -b 100000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1_structure.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1_edge.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n16_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b100000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n32_b50000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 32 -p 2 -r 1 -s 1 -b 50000 -g 100 circle/n_q0.pgm circle/r_p2_n32_b50000_g100_r1_s1_structure.pgm circle/r_p2_n32_b50000_g100_r1_s1_edge.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm
-
-circle/m_r_p2_n32_b50000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm circle/m_r_p2_n32_b50000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 32 -p 2 -r 1 -s 1 -b 50000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1_structure.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1_edge.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n32_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b50000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n32_b100000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 32 -p 2 -r 1 -s 1 -b 100000 -g 100 circle/n_q0.pgm circle/r_p2_n32_b100000_g100_r1_s1_structure.pgm circle/r_p2_n32_b100000_g100_r1_s1_edge.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm
-
-circle/m_r_p2_n32_b100000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm circle/m_r_p2_n32_b100000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 32 -p 2 -r 1 -s 1 -b 100000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1_structure.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1_edge.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n32_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b100000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n72_b50000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 72 -p 2 -r 1 -s 1 -b 50000 -g 100 circle/n_q0.pgm circle/r_p2_n72_b50000_g100_r1_s1_structure.pgm circle/r_p2_n72_b50000_g100_r1_s1_edge.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm
-
-circle/m_r_p2_n72_b50000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm circle/m_r_p2_n72_b50000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 72 -p 2 -r 1 -s 1 -b 50000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1_structure.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1_edge.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n72_b50000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b50000_g10000000000_r1_s1.pgm 127 30
-
-circle/r_p2_n72_b100000_g100_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 72 -p 2 -r 1 -s 1 -b 100000 -g 100 circle/n_q0.pgm circle/r_p2_n72_b100000_g100_r1_s1_structure.pgm circle/r_p2_n72_b100000_g100_r1_s1_edge.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm
-
-circle/m_r_p2_n72_b100000_g100_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm circle/m_r_p2_n72_b100000_g100_r1_s1.pgm 127 30
-
-circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm sobel
-       ./sobel -n 72 -p 2 -r 1 -s 1 -b 100000 -g 10000000000 circle/n_q0.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1_structure.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1_edge.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm
-
-circle/m_r_p2_n72_b100000_g10000000000_r1_s1.pgm: circle/n_q0.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm
-       ./methodnoise circle/n_q0.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b100000_g10000000000_r1_s1.pgm 127 30
-
-circle: circle/r_p2_n8_b50000_g100_r1_s1.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b50000_g100_r1_s1.pgm circle/m_r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b100000_g100_r1_s1.pgm circle/m_r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b50000_g100_r1_s1.pgm circle/m_r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b100000_g100_r1_s1.pgm circle/m_r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b50000_g100_r1_s1.pgm circle/m_r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b100000_g100_r1_s1.pgm circle/m_r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b50000_g100_r1_s1.pgm circle/m_r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b100000_g100_r1_s1.pgm circle/m_r_p2_n72_b100000_g10000000000_r1_s1.pgm
-
-finger/n_q300.pgm: finger.pgm
-       mkdir -p finger
-       python noise.py -t normal -m 0 -s 300 finger.pgm finger/n_q300.pgm
-
-finger/r_p2_n72_b2000_g100_r3_s3.pgm: finger/n_q300.pgm sobel
-       ./sobel -n 72 -p 2 -r 3 -s 3 -b 2000 -g 100 finger/n_q300.pgm finger/r_p2_n72_b2000_g100_r3_s3_structure.pgm finger/r_p2_n72_b2000_g100_r3_s3_edge.pgm finger/r_p2_n72_b2000_g100_r3_s3.pgm
-
-finger/m_r_p2_n72_b2000_g100_r3_s3.pgm: finger/n_q300.pgm finger/r_p2_n72_b2000_g100_r3_s3.pgm
-       ./methodnoise finger/n_q300.pgm finger/r_p2_n72_b2000_g100_r3_s3.pgm finger/m_r_p2_n72_b2000_g100_r3_s3.pgm 127 30
-
-finger/r_p2_n72_b8000_g100_r3_s3.pgm: finger/n_q300.pgm sobel
-       ./sobel -n 72 -p 2 -r 3 -s 3 -b 8000 -g 100 finger/n_q300.pgm finger/r_p2_n72_b8000_g100_r3_s3_structure.pgm finger/r_p2_n72_b8000_g100_r3_s3_edge.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm
-
-finger/m_r_p2_n72_b8000_g100_r3_s3.pgm: finger/n_q300.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm
-       ./methodnoise finger/n_q300.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm finger/m_r_p2_n72_b8000_g100_r3_s3.pgm 127 30
-
-finger: finger/r_p2_n72_b2000_g100_r3_s3.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm finger/m_r_p2_n72_b2000_g100_r3_s3.pgm finger/m_r_p2_n72_b8000_g100_r3_s3.pgm
-
-lena_gamma_seq/n_q70.pgm: lena.pgm
-       mkdir -p lena_gamma_seq
-       python noise.py -t normal -m 0 -s 70 lena.pgm lena_gamma_seq/n_q70.pgm
-
-lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 1 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g1_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 2 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g2_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 3 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g3_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g3_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 4 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g4_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 5 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g5_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g5_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 6 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g6_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g6_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 7 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g7_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g7_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 8 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g8_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g8_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 9 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g9_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g9_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 10 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g10_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g10_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 20 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g20_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g20_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 30 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g30_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g30_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 40 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g40_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g40_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 50 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g50_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g50_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 60 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g60_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g60_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 70 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g70_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g70_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 80 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g80_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g80_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 100 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g100_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g100_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 150 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g150_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g150_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 200 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g200_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g200_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 300 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g300_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g300_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 400 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g400_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g400_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 500 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g500_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g500_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 1000 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g1000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1000_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 2000 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g2000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2000_r3_s3.pgm 127 30
-
-lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm sobel
-       ./sobel -n 16 -p 2 -r 3 -s 3 -b 6000 -g 4000 lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3_structure.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3_edge.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm
-
-lena_gamma_seq/m_r_p2_n16_b6000_g4000_r3_s3.pgm: lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm
-       ./methodnoise lena_gamma_seq/n_q70.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4000_r3_s3.pgm 127 30
-
-lena_gamma_seq: lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4000_r3_s3.pgm
-
-all: lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm lena_eye/m_r_p2_n16_b8000_g60_r5_s3.pgm lena/r_p2_n16_b1000_g250_r3_s3.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm lena/m_r_p2_n16_b1000_g250_r3_s3.pgm lena/m_r_p2_n16_b8000_g250_r3_s3.pgm circle/r_p2_n8_b50000_g100_r1_s1.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b50000_g100_r1_s1.pgm circle/m_r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b100000_g100_r1_s1.pgm circle/m_r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b50000_g100_r1_s1.pgm circle/m_r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b100000_g100_r1_s1.pgm circle/m_r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b50000_g100_r1_s1.pgm circle/m_r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b100000_g100_r1_s1.pgm circle/m_r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b50000_g100_r1_s1.pgm circle/m_r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b100000_g100_r1_s1.pgm circle/m_r_p2_n72_b100000_g10000000000_r1_s1.pgm finger/r_p2_n72_b2000_g100_r3_s3.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm finger/m_r_p2_n72_b2000_g100_r3_s3.pgm finger/m_r_p2_n72_b8000_g100_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4000_r3_s3.pgm
-
-clean:
-       rm lena_eye/r_p2_n16_b8000_g60_r5_s3.pgm lena_eye/m_r_p2_n16_b8000_g60_r5_s3.pgm lena/r_p2_n16_b1000_g250_r3_s3.pgm lena/r_p2_n16_b8000_g250_r3_s3.pgm lena/m_r_p2_n16_b1000_g250_r3_s3.pgm lena/m_r_p2_n16_b8000_g250_r3_s3.pgm circle/r_p2_n8_b50000_g100_r1_s1.pgm circle/r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/r_p2_n8_b100000_g100_r1_s1.pgm circle/r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/r_p2_n16_b50000_g100_r1_s1.pgm circle/r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/r_p2_n16_b100000_g100_r1_s1.pgm circle/r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/r_p2_n32_b50000_g100_r1_s1.pgm circle/r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/r_p2_n32_b100000_g100_r1_s1.pgm circle/r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/r_p2_n72_b50000_g100_r1_s1.pgm circle/r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/r_p2_n72_b100000_g100_r1_s1.pgm circle/r_p2_n72_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b50000_g100_r1_s1.pgm circle/m_r_p2_n8_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n8_b100000_g100_r1_s1.pgm circle/m_r_p2_n8_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b50000_g100_r1_s1.pgm circle/m_r_p2_n16_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n16_b100000_g100_r1_s1.pgm circle/m_r_p2_n16_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b50000_g100_r1_s1.pgm circle/m_r_p2_n32_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n32_b100000_g100_r1_s1.pgm circle/m_r_p2_n32_b100000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b50000_g100_r1_s1.pgm circle/m_r_p2_n72_b50000_g10000000000_r1_s1.pgm circle/m_r_p2_n72_b100000_g100_r1_s1.pgm circle/m_r_p2_n72_b100000_g10000000000_r1_s1.pgm finger/r_p2_n72_b2000_g100_r3_s3.pgm finger/r_p2_n72_b8000_g100_r3_s3.pgm finger/m_r_p2_n72_b2000_g100_r3_s3.pgm finger/m_r_p2_n72_b8000_g100_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/r_p2_n16_b6000_g4000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g3_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g5_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g6_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g7_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g8_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g9_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g10_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g20_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g30_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g40_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g50_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g60_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g70_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g80_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g100_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g150_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g200_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g300_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g400_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g500_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g1000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g2000_r3_s3.pgm lena_gamma_seq/m_r_p2_n16_b6000_g4000_r3_s3.pgm */*_structure.pgm */*_edge.pgm */*_s*.pgm
-

diff --git a/fig/factory/finger/finger_q300.pgm b/fig/factory/finger/finger_q300.pgm
deleted file mode 100644 (file)
index 921bdd5..0000000
Binary files a/fig/factory/finger/finger_q300.pgm and /dev/null differ

diff --git a/fig/factory/finger/n_q300.pgm b/fig/factory/finger/n_q300.pgm
deleted file mode 100644 (file)
index 8c2ac2b..0000000
Binary files a/fig/factory/finger/n_q300.pgm and /dev/null differ

diff --git a/fig/factory/pmake.py b/fig/factory/pmake.py
index 554f6bd4b950813fe1243c414c5508ed0ce2f875..7492891fede572e099a6deb8d0bb4f39c898bdac 100644 (file)
--- a/fig/factory/pmake.py
+++ b/fig/factory/pmake.py
@@ -1,4 +1,5 @@
 import itertools
+import os
 
 binary = "sobel"
 
@@ -19,20 +20,20 @@ files = {
             'q': [300],
             'p': [2],
             's': [3],
-            'r': [3],
-            'n': [72],
-            'b': [2000, 8000],
-            'g': [100]
+            'r': [10],
+            'n': [32],
+            'b': [9000],
+            'g': [150, 1000000000000]
             },
 
-        'circle': {
+        'circle_deform': {
             'orig': 'circle.pgm',
             'q': [0],
             'p': [2],
             's': [1],
             'r': [1],
-            'n': [8, 16, 32, 72],
-            'b': [50000, 100000],
+            'n': [8, 16, 32, 48, 72],
+            'b': [100000],
             'g': [100, 10000000000]
             },
 
@@ -96,6 +97,9 @@ def methodRule(directory, nf, rf, mid, mult):
     print st
     return mf
 
+def toPNG(li):
+    return map(lambda x: os.path.splitext(x)[0] + ".png", li)
+
 def nameRule(name, li):
     print "{}: ".format(name) + ' '.join(li)
 
@@ -103,6 +107,10 @@ def cleanRule(li):
     print "clean:"
     print "\trm " + ' '.join(li) + " */*_structure.pgm" + " */*_edge.pgm" + " */*_s*.pgm"
 
+def pngRule():
+    print "%.png: %.pgm"
+    print "\tconvert $< $@"
+
 def main():
     alle = []
     for f in files.keys():
@@ -130,13 +138,14 @@ def main():
         alle.extend(rfiles)
         alle.extend(mfiles)
 
-        nameRule(f, rfiles + mfiles)
+        nameRule(f, toPNG(rfiles + mfiles + map(lambda x: x[1], nfiles)))
         print
 
 
-    nameRule("all", alle)
+    pngRule()
+    nameRule("all", toPNG(alle))
     print
-    cleanRule(alle)
+    cleanRule(alle + toPNG(alle))
     print
 
 if __name__ == "__main__":