提交: b6c821c54efd7859a51266ef4f8af16b74a59a42 - cammy (git)

A categorical programming language

Commit MetaInfo

• 修订版: b6c821c54efd7859a51266ef4f8af16b74a59a42 (tree)
• 时间: 2022-03-28 15:44:27
• 作者: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Allow N to be fancy blackboard N in LaTeX.

更改概述

• modified: README.txt
• modified: cammy-rpy/cammylib/sexp.py
• modified: cammy-rpy/rename.py
• modified: cammy-rpy/repl.py
• modified: cammy-rpy/weave.py
• modified: hive/complex-graph.cammy
• modified: hive/fractal-membership.cammy
• modified: hive/mat2/mul.cammy
• modified: hive/sdf2/circle.cammy
• modified: hive/sdf2/metaballs.cammy
• modified: hive/v2/burning-ship.cammy
• delete: hive/v2/c-sqr.cammy
• add: hive/v2/complex/about.md
• add: hive/v2/complex/i.cammy
• add: hive/v2/complex/norm.cammy
• add: hive/v2/complex/sqr.cammy
• modified: hive/v2/mandelbrot.cammy
• modified: hive/v2/map.cammy
• modified: hive/v2/map2.cammy
• delete: hive/v2/norm.cammy
• modified: hive/v2/polar.cammy
• modified: hive/v2/scale.cammy
• modified: hive/v2/translate.cammy
• delete: hive/v2/{c-mag-2.cammy => complex/mag-2.cammy}
• delete: hive/v2/{c-mul.cammy => complex/mul.cammy}
• delete: hive/v2/{c-sqrt.cammy => complex/sqrt.cammy}

差异

--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,3 @@
-# Frame
-
-The frame is a preprocessor written in OCaml which statically links together
-multiple Cammy expressions. The frame takes any nullary functor which is not
-standard, and treats it as a file path into a tree of Cammy expressions. Each
-path is replaced with the expression at that path.
-
 # Jelly
 
 The jelly optimizer is a Cammy-to-Cammy optimizer which uses e-graphs to

--- a/cammy-rpy/cammylib/sexp.py
+++ b/cammy-rpy/cammylib/sexp.py
@@ -46,7 +46,7 @@ class Atom(SExp):
         return False
 
     def extractType(self, extractor, formatter, outerPrecedence):
-        return self.symbol
+        return formatter.formatN if self.symbol == "N" else self.symbol
 
     def buildArrow(self):
         return buildUnary(self.symbol)

--- a/cammy-rpy/rename.py
+++ b/cammy-rpy/rename.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from cammylib.hive import Hive
+from cammylib.hive import Hive, MissingAtom
 from cammylib.sexp import BASIS_ATOMS, BASIS_FUNCTORS
 
 def comb(dag):
@@ -28,7 +28,10 @@ def main(argv):
             suffix = len(fullpath) - 6
             assert suffix >= 0, "proven by .endswith() check above"
             atom = fullpath[prefix:suffix]
-            hive.load(atom)
+            try:
+                hive.load(atom)
+            except MissingAtom as ma:
+                print "Couldn't find", ma.atom, "while trying to load", atom
     graph = comb(hive.dag)
     write = True
     if tatom in graph:

--- a/cammy-rpy/repl.py
+++ b/cammy-rpy/repl.py
@@ -13,6 +13,8 @@ from cammylib.types import ConstraintStore, TypeExtractor, TypeFormatter, Unific
 LINE_BUFFER_LENGTH = 1024
 
 class PlaintextTypeFormatter(TypeFormatter):
+    formatN = "N"
+
     def resetsBracketsFor(self, constructor):
         return constructor in ("hom", "list")
 
@@ -40,7 +42,13 @@ def command(hive, code, line):
         sexp = sexp.canonicalize(hive)
         sexp = jellify(sexp)
         arrow = sexp.buildArrow()
-        print arrow.run(T()).asStr()
+        cs = ConstraintStore()
+        domain, codomain = arrow.types(cs)
+        extractor = TypeExtractor(cs, PlaintextTypeFormatter())
+        if extractor.extract(domain) != "1":
+            print "Arrow is not an element"
+        else:
+            print arrow.run(T()).asStr()
 
 def repl(hive, stdin, stdout):
     while True:

--- a/cammy-rpy/weave.py
+++ b/cammy-rpy/weave.py
@@ -13,6 +13,8 @@ from cammylib.types import ConstraintStore, TypeExtractor, TypeFormatter, Unific
 SortFileNames = make_timsort_class()
 
 class LatexTypeFormatter(TypeFormatter):
+    formatN = r"\mathbb{N}"
+
     def resetsBracketsFor(self, constructor):
         return constructor == "list"
 

--- a/hive/complex-graph.cammy
+++ b/hive/complex-graph.cammy
@@ -1,4 +1,4 @@
-(comp (pair (f/addpair (f/divpair (comp pair/swap f-atan2) (fun/const (f/mulpair f-pi f/2))) (fun/const (comp f/2 f-recip))) (f/mulpair v2/norm (fun/const f/2))) hv2rgb)
+(comp (pair (f/addpair (f/divpair (comp pair/swap f-atan2) (fun/const (f/mulpair f-pi f/2))) (fun/const (comp f/2 f-recip))) (f/mulpair v2/complex/norm (fun/const f/2))) hv2rgb)
 
 Map a complex number to a color. The magnitude is mapped to luminance and the
 angle is mapped to hue.

--- a/hive/fractal-membership.cammy
+++ b/hive/fractal-membership.cammy
@@ -1,9 +1,4 @@
-(comp
-  (iter-fractal @0 @1)
-  (comp
-    (list/filter v2/c-mag-2)
-    (comp list/len
-      (f/divpair nat/to-f (fun/const (comp @1 nat/to-f))))))
+(comp (iter-fractal @0 @1) (comp (list/filter v2/complex/mag-2) (comp list/len (f/divpair nat/to-f (fun/const (comp @1 nat/to-f))))))
 
 Measure the degree to which a fractal diverges. Given a maximum number of
 steps, we iterate the IFS for a fractal in the complex plane until its

--- a/hive/mat2/mul.cammy
+++ b/hive/mat2/mul.cammy
@@ -1,3 +1,3 @@
-(comp (fun/tensor id mat2/trans) (pair (mat2/vecpair fst (comp snd fst)) (mat2/vecpair fst (comp snd snd))))
+(comp (pair/tensor id mat2/trans) (pair (mat2/vecpair fst (comp snd fst)) (mat2/vecpair fst (comp snd snd))))
 
 Multiply two matrices.

--- a/hive/sdf2/circle.cammy
+++ b/hive/sdf2/circle.cammy
@@ -1 +1,3 @@
-(f/subpair v2/norm (fun/const f-one))
+(f/subpair v2/complex/norm (fun/const f-one))
+
+

--- a/hive/sdf2/metaballs.cammy
+++ b/hive/sdf2/metaballs.cammy
@@ -1,13 +1,3 @@
-(f/subpair
-  (fun/apppair
-    (comp @1 (fold
-      (fun/name (fun/const f-zero))
-      (curry
-        (f/addpair
-          (f/divpair (comp (comp fst fst) snd)
-            (comp (comp
-              (pair (comp (comp fst fst) fst) snd)
-              (v2/map2 f/sub)) v2/norm))
-          (fun/apppair (comp fst snd) snd)))))
-    id)
-  (fun/const @0))
+(f/subpair (fun/apppair (comp @1 (fold (fun/name (fun/const f-zero)) (curry (f/addpair (f/divpair (comp (comp fst fst) snd) (comp (comp (pair (comp (comp fst fst) fst) snd) (v2/map2 f/sub)) v2/complex/norm)) (fun/apppair (comp fst snd) snd))))) id) (fun/const @0))
+
+

--- a/hive/v2/burning-ship.cammy
+++ b/hive/v2/burning-ship.cammy
@@ -1 +1,3 @@
-(curry (comp (pair fst (comp (comp snd (v2/map f/abs)) v2/c-sqr)) (v2/map2 f-add)))
+(curry (comp (pair fst (comp (comp snd (v2/map f/abs)) v2/complex/sqr)) (v2/map2 f-add)))
+
+An iteration of the Burning Ship fractal, a relative of the Mandelbrot set.

--- a/hive/v2/c-sqr.cammy
+++ /dev/null
@@ -1 +0,0 @@
-(comp fun/dup v2/c-mul)

--- /dev/null
+++ b/hive/v2/complex/about.md
@@ -0,0 +1,3 @@
+A two-dimensional vector space can be interpreted as a type of complex
+numbers via the [Cayley–Dickson
+construction](https://en.wikipedia.org/wiki/Cayley%E2%80%93Dickson_construction).

--- /dev/null
+++ b/hive/v2/complex/i.cammy
@@ -0,0 +1,4 @@
+(pair f-zero f-one)
+
+The imaginary unit $i$. By convention, multiplication by $i$ corresponds to a
+quarter turn counterclockwise on the Cartesian plane.

--- a/hive/v2/c-mag-2.cammy
+++ b/hive/v2/complex/mag-2.cammy
@@ -1,3 +1,3 @@
-(f/ltpair v2/norm (fun/const f/2))
+(f/ltpair v2/complex/norm (fun/const f/2))
 
 Whether a complex number's magnitude is less than 2.

--- /dev/null
+++ b/hive/v2/complex/norm.cammy
@@ -0,0 +1,3 @@
+(comp (comp fun/dup f/dot2) f/sqrt-pos)
+
+The norm of a complex number.

--- /dev/null
+++ b/hive/v2/complex/sqr.cammy
@@ -0,0 +1,3 @@
+(comp fun/dup v2/complex/mul)
+
+

--- a/hive/v2/c-sqrt.cammy
+++ b/hive/v2/complex/sqrt.cammy
@@ -1,8 +1,10 @@
 (comp
   (comp v2/polar
     (pair
-      (comp fst (comp f-sqrt (case id f-zero)))
+      (comp fst f/sqrt-pos)
       (f/divpair snd (fun/const f/2))))
   (pair
     (f/mulpair fst (comp snd f-cos))
     (f/mulpair fst (comp snd f-sin))))
+
+The square root of a complex number.

--- a/hive/v2/mandelbrot.cammy
+++ b/hive/v2/mandelbrot.cammy
@@ -1 +1,4 @@
-(curry (comp (pair fst (comp snd v2/c-sqr)) (v2/map2 f-add)))
+(curry (comp (pair fst (comp snd v2/complex/sqr)) (v2/map2 f-add)))
+
+Perform a Mandelbrot iteration. The Mandelbrot set is composed of points
+which do not diverge under iteration.

--- a/hive/v2/map.cammy
+++ b/hive/v2/map.cammy
@@ -1 +1,3 @@
 (pair (comp fst @0) (comp snd @0))
+
+Map over both dimensions of a vector simultaneously.

--- a/hive/v2/map2.cammy
+++ b/hive/v2/map2.cammy
@@ -2,3 +2,5 @@
   (comp (pair (comp fst fst) (comp snd fst)) @0)
   (comp (pair (comp fst snd) (comp snd snd)) @0))
 
+
+Lift a binary operation to a vector space.

--- a/hive/v2/norm.cammy
+++ /dev/null
@@ -1 +0,0 @@
-(comp (comp (comp fun/dup f/dot2) f-sqrt) (case id f-zero))

--- a/hive/v2/polar.cammy
+++ b/hive/v2/polar.cammy
@@ -1 +1,4 @@
-(pair v2/norm f-atan2)
+(pair v2/complex/norm f-atan2)
+
+Convert from rectangular coordinates to polar coordinates on the Cartesian
+plane.

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

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