提交: 5e592f74e009e74fbc58b83f558cd7654711b2a9 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: 5e592f74e009e74fbc58b83f558cd7654711b2a9 (tree)
• 时间: 2021-11-14 02:23:00
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

demo/mandelbrot: Use bounded unfolds instead of application.

更改概述

• modified: cammy-run/main.py
• modified: hive/demo/mandelbrot.cammy

差异

--- a/cammy-run/main.py
+++ b/cammy-run/main.py
@@ -30,6 +30,9 @@ class Element(object):
     def f(self):
         raise TypeFail("not f")
 
+    def l(self):
+        raise TypeFail("not list")
+
     def first(self):
         raise TypeFail("not a pair")
 
@@ -42,9 +45,6 @@ class Element(object):
     def apply(self, y):
         raise TypeFail("not hom")
 
-    def fold(self, nil, cons):
-        raise TypeFail("not list")
-
 class T(Element):
     _immutable_ = True
 
@@ -114,16 +114,12 @@ class H(Element):
     def apply(self, y):
         return self._f.run(P(self._x, y))
 
-class Z(Element):
+class Xs(Element):
     _immutable_ = True
-    def fold(self, nil, cons): return nil.run(T())
-
-class C(Element):
-    _immutable_ = True
-    def __init__(self, x, xs):
-        self._x = x
-        self._xs = xs
-    def fold(self, nil, cons): return cons.run(P(self._x, self._xs))
+    _immutable_fields_ = "xs[*]",
+    def __init__(self, xs):
+        self.xs = xs
+    def l(self): return self.xs
 
 class Arrow(object):
     _immutable_ = True
@@ -220,18 +216,22 @@ class PrimRec(Arrow):
 
 class Nil(Arrow):
     _immutable_ = True
-    def run(self, x): return Z()
+    def run(self, x): return Xs([])
 
 class Cons(Arrow):
     _immutable_ = True
-    def run(self, x): return C(x.first(), x.second())
+    def run(self, x): return Xs([x.first()] + x.second().l())
 
 class Fold(Arrow):
     _immutable_ = True
     def __init__(self, n, c):
         self._n = n
         self._c = c
-    def run(self, x): return x.fold(self._n, self._c)
+    def run(self, x):
+        rv = self._n.run(T())
+        for e in x.l():
+            rv = self._c.run(P(e, rv))
+        return rv
 
 class FZero(Arrow):
     _immutable_ = True

--- a/hive/demo/mandelbrot.cammy
+++ b/hive/demo/mandelbrot.cammy
@@ -1,9 +1,12 @@
 (comp
   (comp
-    (pair v2/mandelbrot (comp (fun/const f-zero) fun/dup))
-    fun/app-80)
-  (comp
-    (comp (pair v2/norm (fun/const f/2)) f-lt)
     (comp
-      (comp either (case f-zero f-one))
-      (v3/triple id id id)))))
+      (fun/apppair
+        (fun/const (comp nat/256 nonempty/unfold))
+        (pair (comp (fun/const f-zero) fun/dup) v2/mandelbrot))
+      snd)
+    (comp
+      (list/filter (comp (pair v2/norm (fun/const f/2)) f-lt))
+      (comp list/len
+        (f/divpair nat/to-f (fun/const (comp nat/256 nat/to-f))))))
+  (v3/broadcast (f/subpair (fun/const f-one) id)))