提交: f1ce494419f15ecbc21a4174094990cb4fc0f433 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: f1ce494419f15ecbc21a4174094990cb4fc0f433 (tree)
• 时间: 2021-11-04 02:50:35
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Start doing trigonometry.

Halfway to HSL and graphing complex functions!

更改概述

• modified: cammy-run/main.py
• modified: frame/frame.ml
• modified: hive/f/10.cammy
• modified: hive/f/2.cammy
• modified: hive/f/3.cammy
• modified: hive/f/4.cammy
• add: hive/f/addpair.cammy
• delete: hive/f/div.cammy
• add: hive/f/divpair.cammy
• modified: hive/f/dot2.cammy
• modified: hive/f/error.cammy
• add: hive/f/mulpair.cammy
• modified: hive/f/sqr.cammy
• add: hive/f/subpair.cammy
• add: hive/f/sum.cammy
• add: hive/monads/maybe/join.cammy
• add: hive/monads/maybe/lift.cammy
• add: hive/monads/maybe/unit.cammy
• add: hive/monads/reader/join.cammy
• add: hive/monads/reader/unit.cammy
• add: hive/monads/state/unit.cammy
• modified: hive/v2/c-mul.cammy
• modified: hive/v2/scale.cammy
• modified: hive/v2/translate.cammy
• modified: movelist/movelist.scm
• modified: todo.txt

差异

--- a/cammy-run/main.py
+++ b/cammy-run/main.py
@@ -107,46 +107,30 @@ class H(Element):
 
 
 class Arrow(object):
-    pass
+    _immutable_ = True
 
 class Id(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return x
+    def run(self, x): return x
 
 class Comp(Arrow):
-
     _immutable_ = True
-
     def __init__(self, f, g):
         self.f = f
         self.g = g
-
-    def run(self, x):
-        return self.g.run(self.f.run(x))
+    def run(self, x): return self.g.run(self.f.run(x))
 
 class Ignore(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return T()
+    def run(self, x): return T()
 
 class First(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return x.first()
+    def run(self, x): return x.first()
 
 class Second(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return x.second()
+    def run(self, x): return x.second()
 
 class Pair(Arrow):
     _immutable_ = True
@@ -157,18 +141,12 @@ class Pair(Arrow):
         return P(self.f.run(x), self.g.run(x))
 
 class Left(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return L(x)
+    def run(self, x): return L(x)
 
 class Right(Arrow):
-
     _immutable_ = True
-
-    def run(self, x):
-        return R(x)
+    def run(self, x): return R(x)
 
 class Case(Arrow):
     _immutable_ = True
@@ -207,6 +185,10 @@ class FOne(Arrow):
     _immutable_ = True
     def run(self, x): return F(1.0)
 
+class FPi(Arrow):
+    _immutable_ = True
+    def run(self, x): return F(math.pi)
+
 def sign(f): return math.copysign(1.0, f) > 0.0
 class FSign(Arrow):
     _immutable_ = True
@@ -252,6 +234,10 @@ class FSqrt(Arrow):
         f = x.f()
         return L(F(math.sqrt(f))) if sign(f) else R(T())
 
+class FATan2(Arrow):
+    _immutable_ = True
+    def run(self, x): return F(math.atan2(x.first().f(), x.second().f()))
+
 
 class BuildProblem(Exception):
     def __init__(self, message):
@@ -267,6 +253,7 @@ unaryFunctors = {
     "either": Either(),
     "f-zero": FZero(),
     "f-one": FOne(),
+    "f-pi": FPi(),
     "f-sign": FSign(),
     "f-negate": FNegate(),
     "f-recip": FRecip(),
@@ -274,6 +261,7 @@ unaryFunctors = {
     "f-add": FAdd(),
     "f-mul": FMul(),
     "f-sqrt": FSqrt(),
+    "f-atan2": FATan2(),
 }
 
 def buildUnary(name):

--- a/frame/frame.ml
+++ b/frame/frame.ml
@@ -5,7 +5,8 @@ module CodeCache = Map.Make (String)
 let primitives =
   "id comp ignore fst snd pair left right case curry uncurry \
    zero succ pr nil cons fold t f not conj disj either \
-   f-zero f-one f-sign f-negate f-recip f-lt f-add f-mul f-sqrt"
+   f-zero f-one f-pi \
+   f-sign f-negate f-recip f-lt f-add f-mul f-sqrt f-atan2"
 
 let filter =
   List.fold_left

--- a/hive/f/10.cammy
+++ b/hive/f/10.cammy
@@ -1 +1 @@
-(comp (pair f-one f/9) f-add)
+(f/addpair f-one f/9)

--- a/hive/f/2.cammy
+++ b/hive/f/2.cammy
@@ -1 +1 @@
-(comp (pair f-one f-one) f-add)
+(f/addpair f-one f-one)

--- a/hive/f/3.cammy
+++ b/hive/f/3.cammy
@@ -1 +1 @@
-(comp (pair f-one f/2) f-add)
+(f/addpair f-one f/2)

--- a/hive/f/4.cammy
+++ b/hive/f/4.cammy
@@ -1 +1 @@
-(comp (pair f/2 f/2) f-add)
+(f/addpair f/2 f/2)

--- /dev/null
+++ b/hive/f/addpair.cammy
@@ -0,0 +1 @@
+(comp (pair @0 @1) f-add)

--- a/hive/f/div.cammy
+++ /dev/null
@@ -1 +0,0 @@
-(comp (pair fst (comp snd f-recip)) f-mul)

--- /dev/null
+++ b/hive/f/divpair.cammy
@@ -0,0 +1 @@
+(f/mulpair @0 (comp @1 f-recip))

--- a/hive/f/dot2.cammy
+++ b/hive/f/dot2.cammy
@@ -1,5 +1,3 @@
-(comp
-  (pair
-    (comp (pair (comp fst fst) (comp snd fst)) f-mul)
-    (comp (pair (comp fst snd) (comp snd snd)) f-mul))
-  f-add)
+(f/addpair
+  (f/mulpair (comp fst fst) (comp snd fst))
+  (f/mulpair (comp fst snd) (comp snd snd)))

--- a/hive/f/error.cammy
+++ b/hive/f/error.cammy
@@ -1 +1 @@
-(comp (pair (comp fst @0) (comp snd f-negate)) f-add)
+(f/addpair (comp fst @0) (comp snd f-negate))

--- /dev/null
+++ b/hive/f/mulpair.cammy
@@ -0,0 +1 @@
+(comp (pair @0 @1) f-mul)

--- a/hive/f/sqr.cammy
+++ b/hive/f/sqr.cammy
@@ -1 +1 @@
-(comp fun/dup f-mul)
+(f/mulpair id id)

--- /dev/null
+++ b/hive/f/subpair.cammy
@@ -0,0 +1 @@
+(f/addpair @0 (comp @1 f-negate))

--- /dev/null
+++ b/hive/f/sum.cammy
@@ -0,0 +1 @@
+(fold f-zero f-add)

--- /dev/null
+++ b/hive/monads/maybe/join.cammy
@@ -0,0 +1 @@
+(case id right)

--- /dev/null
+++ b/hive/monads/maybe/lift.cammy
@@ -0,0 +1 @@
+(comp @0 left)

--- /dev/null
+++ b/hive/monads/maybe/unit.cammy
@@ -0,0 +1 @@
+left

--- /dev/null
+++ b/hive/monads/reader/join.cammy
@@ -0,0 +1 @@
+(curry (comp (pair fun/app snd) fun/app))

--- /dev/null
+++ b/hive/monads/reader/unit.cammy
@@ -0,0 +1 @@
+(curry fst)

--- /dev/null
+++ b/hive/monads/state/unit.cammy
@@ -0,0 +1 @@
+(curry id)

--- a/hive/v2/c-mul.cammy
+++ b/hive/v2/c-mul.cammy
@@ -1,7 +1,7 @@
 (pair
-  (comp (pair
+  (f/subpair
     (comp (pair (comp fst fst) (comp snd fst)) f-mul)
-    (comp (pair (comp fst snd) (comp snd snd)) f-mul)) f/sub)
-  (comp (pair
+    (comp (pair (comp fst snd) (comp snd snd)) f-mul))
+  (f/addpair
     (comp (pair (comp fst snd) (comp snd fst)) f-mul)
-    (comp (pair (comp fst fst) (comp snd snd)) f-mul)) f-add))
+    (comp (pair (comp fst fst) (comp snd snd)) f-mul)))

--- a/hive/v2/scale.cammy
+++ b/hive/v2/scale.cammy
@@ -1,3 +1,3 @@
-(comp (pair (comp (comp (pair id (fun/const @1)) f/div) @0)
-  (fun/const @2)) f-mul)
-
+(f/mulpair
+  (comp (f/divpair id (fun/const @1)) @0)
+  (fun/const @2))

--- a/hive/v2/translate.cammy
+++ b/hive/v2/translate.cammy
@@ -1,2 +1,3 @@
-(comp (pair (comp (comp (pair id (fun/const @1)) f/sub) @0)
-  (fun/const @2)) f-add)
+(f/addpair
+  (comp (f/subpair id (fun/const @1)) @0)
+  (fun/const @2))

--- a/movelist/movelist.scm
+++ b/movelist/movelist.scm
@@ -19,6 +19,7 @@
     ((== expr 'f-add) (== s (list 'pair 'F 'F)) (== t 'F))
     ((== expr 'f-mul) (== s (list 'pair 'F 'F)) (== t 'F))
     ((== expr 'f-sqrt) (== s 'F) (== t (list 'sum 'F '1)))
+    ((== expr 'f-atan2) (== s (list 'pair 'F 'F)) (== t 'F))
     ; Compound before trivial.
     ((== expr 'succ) (== s 'N) (== t 'N))
     ((== expr 'zero) (== s '1) (== t 'N))
@@ -27,6 +28,7 @@
     ((== expr 'not) (== s '2) (== t '2))
     ((== expr 'f-zero) (== s '1) (== t 'F))
     ((== expr 'f-one) (== s '1) (== t 'F))
+    ((== expr 'f-pi) (== s '1) (== t 'F))
     ((== expr 'f-sign) (== s 'F) (== t '2))
     ((== expr 'f-negate) (== s 'F) (== t 'F))
     ((== expr 'f-recip) (== s 'F) (== t 'F))

--- a/todo.txt
+++ b/todo.txt
@@ -8,3 +8,12 @@
 * Typechecker needs to handle holes
 * Typechecker should handle polymorphism better
 * Typechecker errors are inscrutable
+* Draw complex functions
+  * hsl2rgb
+  * complex to HSL
+* Trigonometric functions
+  * f-atan2 added, need f-sin and f-cos?
+* Transcendental and other constants
+  * Euler's constant e
+  * pi
+  * Euler's constant gamma