logo snowflake cleanup

jxc42 · Oct 2, 2018 · 309966a · 309966a
1 parent c78930b
commit 309966a
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 130 deletions.
diff --git a/data/geom/five/snow1.LoG b/data/geom/five/snow1.LoG
diff --git a/data/geom/five/snow2.LoG b/data/geom/five/snow2.LoG
diff --git a/data/geom/five/snow3.LoG b/data/geom/five/snow3.LoG
diff --git a/data/geom/five/star.LoG b/data/geom/five/star.LoG
diff --git a/data/geom/penoff/train_penoff_3.LoG b/data/geom/penoff/train_penoff_3.LoG
diff --git a/data/geom/penoff/train_penoff_5.LoG b/data/geom/penoff/train_penoff_5.LoG
diff --git a/data/geom/penoff/train_penoff_6.LoG b/data/geom/penoff/train_penoff_6.LoG
diff --git a/data/geom/penoff/train_penoff_7.LoG b/data/geom/penoff/train_penoff_7.LoG
diff --git a/data/geom/six/snow1.LoG b/data/geom/six/snow1.LoG
diff --git a/data/geom/six/snow2.LoG b/data/geom/six/snow2.LoG
diff --git a/data/geom/six/snow3.LoG b/data/geom/six/snow3.LoG
diff --git a/data/geom/six/star.LoG b/data/geom/six/star.LoG
diff --git a/data/geom/square/train_square_10.LoG b/data/geom/square/train_square_10.LoG
diff --git a/data/geom/three/snow1.LoG b/data/geom/three/snow1.LoG
diff --git a/data/geom/three/snow2.LoG b/data/geom/three/snow2.LoG
diff --git a/data/geom/three/snow3.LoG b/data/geom/three/snow3.LoG
diff --git a/data/geom/three/star.LoG b/data/geom/three/star.LoG
diff --git a/makeLogoTasks.py b/makeLogoTasks.py
@@ -80,6 +80,7 @@ def problem(n, examples, highresolution, needToTrain=False):
                     for f in files:
                         if f.endswith("_l.png"):
                             fullPath = rootdir + subfolder + "/" + subfl + '/' + f
+                            eprint(fullPath)
                             img1 = fileToArray(fullPath)
                             highresolution = fileToArray(fullPath.replace("_l.png", "_h.png"))
                             try:
@@ -368,8 +369,19 @@ def T(*a): tasks.append(manualLogoTask(*a))
           """
           (loop j %d
           (embed (loop i infinity (move epsilonLength epsilonAngle)))
-          pu (move %s 0a) pd)"""%(n,l))        
+          pu (move %s 0a) pd)"""%(n,l))
 
+    for n in [3,5,6]:
+        body = {"empty": "(move 1d 0a)",
+                "dashed": "pu (move 1d 0a) pd (move 1d 0a)",
+                "circle": "(move 1d 0a) (loop i (+ infinity infinity) (move epsilonLength epsilonAngle))",
+                "semicircle": "(move 1d 0a) (loop i infinity (move epsilonLength epsilonAngle))"}
+        for name in body:
+            T("%d-%s snowflake"%(n,name),
+              """
+              (loop j %d
+              (embed %s)
+              (move 0d (/a (+a 1a 1a) %d)))"""%(n,body[name],n))
     return tasks
 
 def montageTasks(tasks):