From 7972ad88012a56f6afd54ada46cd45206418682a Mon Sep 17 00:00:00 2001
From: braxtonhall
Date: Mon, 24 Oct 2022 12:03:21 -0700
Subject: Add Nico's new fibs

---
 entries/nritschel/assets/scratch.png | Bin 0 -> 752302 bytes
 entries/nritschel/scratch/README.md  |   1 +
 entries/nritschel/scratch/fib.sb3    | Bin 0 -> 43364 bytes
 entries/nritschel/xlsx/fib.xlsx      | Bin 0 -> 11704 bytes
 4 files changed, 1 insertion(+)
 create mode 100644 entries/nritschel/assets/scratch.png
 create mode 100644 entries/nritschel/scratch/README.md
 create mode 100644 entries/nritschel/scratch/fib.sb3
 create mode 100644 entries/nritschel/xlsx/fib.xlsx

(limited to 'entries')

diff --git a/entries/nritschel/assets/scratch.png b/entries/nritschel/assets/scratch.png
new file mode 100644
index 0000000..5883245
Binary files /dev/null and b/entries/nritschel/assets/scratch.png differ
diff --git a/entries/nritschel/scratch/README.md b/entries/nritschel/scratch/README.md
new file mode 100644
index 0000000..e059267
--- /dev/null
+++ b/entries/nritschel/scratch/README.md
@@ -0,0 +1 @@
+<img src="../assets/scratch.png" alt="scratch preview">
\ No newline at end of file
diff --git a/entries/nritschel/scratch/fib.sb3 b/entries/nritschel/scratch/fib.sb3
new file mode 100644
index 0000000..a3cf2cc
Binary files /dev/null and b/entries/nritschel/scratch/fib.sb3 differ
diff --git a/entries/nritschel/xlsx/fib.xlsx b/entries/nritschel/xlsx/fib.xlsx
new file mode 100644
index 0000000..e1b662d
Binary files /dev/null and b/entries/nritschel/xlsx/fib.xlsx differ
-- 
cgit v1.2.3-70-g09d2


From 06ad8853e86b5c270f31f6d7b99081323f2f677a Mon Sep 17 00:00:00 2001
From: Zack Grannan
Date: Mon, 24 Oct 2022 12:02:15 -0700
Subject: Add submission for zgrannan

---
 entries/zgrannan/Fib.hs | 18 ++++++++++++++++++
 people.json             | 11 +++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 entries/zgrannan/Fib.hs

(limited to 'entries')

diff --git a/entries/zgrannan/Fib.hs b/entries/zgrannan/Fib.hs
new file mode 100644
index 0000000..1918fc8
--- /dev/null
+++ b/entries/zgrannan/Fib.hs
@@ -0,0 +1,18 @@
+-- Point-less fibonacci
+fib :: Int -> Int
+fib = fix fib'
+  where
+    fib' =
+      ap (when 0 . (0 ==)) .
+      ap (when 1 . (1 ==)) .
+      ap (ap . ((+) .) . (. subtract 1)) (. subtract 2)
+
+    when t c e = if c then t else e
+
+    ap mf m = mf >>= (\f -> m >>= return . f)
+
+    fix f  = f (fix f)
+
+
+main :: IO ()
+main = mapM_ (print . fib) [0 .. 10]
diff --git a/people.json b/people.json
index 26dc1db..a9d5fa0 100644
--- a/people.json
+++ b/people.json
@@ -213,5 +213,16 @@
                 "link": "./entries/laelath/fib.bf"
             }
         ]
+    },
+    {
+        "github": "zgrannan",
+        "name": "Zack Grannan",
+        "title": "MS Student, UBC",
+        "entries": [
+            {
+                "name": "haskell",
+                "link": "./entries/zgrannan/Fib.hs"
+            }
+        ]
     }
 ]
-- 
cgit v1.2.3-70-g09d2