Effort to make png-s automatically

diff --git a/fig/factory/pmake.py b/fig/factory/pmake.py
index ee90d7c9be3e67c9593358dea95e3202585333b9..f13456bca9d2ffa13cf48576b8f63497aa19f7f4 100644 (file)
--- a/fig/factory/pmake.py
+++ b/fig/factory/pmake.py
@@ -17,14 +17,16 @@ files = {
 
         'finger': {
             'orig': 'finger.pgm',
-            'q': [300],
+            'q': [200],
             'p': [2],
             's': [3],
             'r': [10, 20],
             'n': [32],
-            'b': [5000, 9000],
-            'g': [80, 150, 1000000000000]
+            'b': [15000, 21450],
+            'g': [150, 1000000000000]
             },
+        #time ./sobel -p 2 -n 32 -r 10 -s 3 -b 15000 -g 100000000000
+        #time ./sobel -p 2 -n 32 -r 10 -s 3 -b 21450 -g 150
 
         'lines': {
             'orig': 'lines.png',
@@ -44,7 +46,7 @@ files = {
             's': [1],
             'r': [1],
             'n': [8, 16, 32, 48, 72],
-            'b': [100000],
+            'b': [200000],
             'g': [100, 10000000000]
             },
 
@@ -55,7 +57,7 @@ files = {
             's': [1],
             'r': [1],
             'n': [8, 16, 32, 48, 72],
-            'b': [100000],
+            'b': [200000],
             'g': [100, 10000000000]
             },
 
@@ -66,7 +68,7 @@ files = {
             's': [1],
             'r': [1],
             'n': [4, 8, 72],
-            'b': [100000, 120000, 140000],
+            'b': [200000],
             'g': [100, 10000000000]
             },
 
@@ -113,7 +115,7 @@ files = {
             's': [5],
             'r': [10],
             'n': [16, 72],
-            'b': [2000],
+            'b': [4000],
             'g': [80]
             },
 
@@ -159,7 +161,8 @@ def restoreRule(directory, nf, p, n, b, g, r, s):
     st += "{}: {} {}\n".format(rf, nf, binary)
     st += "\t./{} -n {} -p {} -r {} -s {} -b {} -g {} {} {} {} {} {} {}".format(binary, n, p, r, s, b, g, nf, blur, edge, struct, color, rf)
     print st
-    return rf
+    made = [blur, edge, struct, color, rf]
+    return (rf, made)
 
 def methodRule(directory, nf, rf, mid, mult):
     nrf = rf.split('/')[1]
@@ -203,7 +206,7 @@ def main():
             for p, n, b, g, r, s in itertools.product(files[of]['p'],
                     files[of]['n'], files[of]['b'], files[of]['g'],
                     files[of]['r'], files[of]['s']):
-                rf = restoreRule(f, nf, p, n, b, g, r, s)
+                rf, rlist = restoreRule(f, nf, p, n, b, g, r, s)
                 rfiles.append(rf)
                 print
                 # Method noise
@@ -212,6 +215,7 @@ def main():
                 print
 
         alle.extend(rfiles)
+        alle.extend(rlist)
         alle.extend(mfiles)
 
         nameRule(f, toPNG(