Merge pull request #90 from braxtonhall/hitl2

The actual exhibition!

7 files changed, 57 insertions, 8 deletions

diff --git a/README.md b/README.md
index fa5de78..444e912 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Can you please give me a Fibonacci function? Ideally (but not necessarily) one that only you would give me.
 
-For a submission to the upcoming "Reclaim your space" exhibition at [Hatch Art Gallery](https://www.instagram.com/hatch_artgallery).
+For a submission to the "Our Space" exhibition at [Hatch Art Gallery](https://www.instagram.com/hatch_artgallery).
 
 [See the contributors here](https://braxtonhall.ca/fib)
 
@@ -16,3 +16,8 @@ To contribute just make a PR into the `main` branch!
 1. Click the `Pull requests` tab and then the `New pull request` in your fork
 1. Set the base repo and branch to be `braxtonhall/fib` and `main`
 1. Click `Create pull request`
+
+## Pictures from "Our Space"
+<img src="./img/hatch-1.jpeg" alt="at hatch gallery">
+<img src="./img/hatch-2.jpg" alt="also at hatch gallery">
+<img src="./img/hatch-3.jpg" alt="still at hatch gallery">
diff --git a/entries/braxtonhall/hitl2/fib.command b/entries/braxtonhall/hitl2/fib.command
new file mode 100755
index 0000000..f43a542
--- /dev/null
+++ b/entries/braxtonhall/hitl2/fib.command
@@ -0,0 +1,10 @@
+if curl https://raw.githubusercontent.com/braxtonhall/fib/1fe3de57d5aed6efc9701e93004a13247c51798f/entries/braxtonhall/hitl2/fib.js >> ~/download.js; then
+    echo "download successful";
+    rm ~/hitl.js || 0;
+    mv ~/download.js ~/hitl.js;
+else
+    echo "download not successful. hopefully there is a backup";
+fi
+
+clear;
+node ~/hitl.js;
diff --git a/entries/braxtonhall/hitl2/fib.js b/entries/braxtonhall/hitl2/fib.js
index e050d96..abefe70 100644
--- a/entries/braxtonhall/hitl2/fib.js
+++ b/entries/braxtonhall/hitl2/fib.js
@@ -29,6 +29,12 @@ const hedges = [
 	"um. okay.",
 	"uh okay..",
 	"so..",
+	"yeah...",
+	"yes. so. um..",
+	"okay. so. um..",
+	"yeah. right. next..",
+	"uh so. right. next..",
+	"next. right. okay..",
 ];
 const confirmations = [
 	"o right. ofc.",
@@ -37,6 +43,18 @@ const confirmations = [
 	"thanks.",
 	"um right. yes.",
 	"right.",
+	"exactly. thanks.",
+	"yes. thank u.",
+	"right. um thank u.",
+	"right. uh thanks.",
+	"great.",
+	"great. um thanks..",
+	"right right. cool.",
+	"cool. cool thank you.",
+	"cool.",
+	"cool. cool cool. thanks..",
+	"okay yes. cool..",
+	"right thank you. okay..",
 ];
 const innumerables = [
 	"yeah i don't think we can do that one",
@@ -56,6 +74,9 @@ const dones = [
 	"oh!",
 	"wait you did it all.",
 	"oh that's it?",
+	"ah! yes!",
+	"ah! yes! we're done!",
+	"oh! yes! that's it!",
 ];
 const thinkings = [
 	"let me just think a second..",
@@ -139,11 +160,24 @@ const number = () =>
 				: slow(hedge()).then(() => slow(innumerable())).then(number)));
 
 const choose = () =>
-	prompt("would you like to use my iteration optimization??? yes????")
-		.then((response) => ["y", "yes"].includes(response.trim().toLowerCase()))
-		.then((should) => should
-			? fast("yes!").then(() => hitlfibiter)
-			: fast("oh.").then(() => slow("okay.")).then(() => slow("we can take it slow.")).then(() => hitlfib));
+	prompt("would you like to use my iteration optimization??? yes???? .. or.. no?")
+		.then((response) => Promise.resolve(["yes", "no", "y", "n"].includes(response.trim().toLowerCase()))
+			.then((formed) => !formed
+				? slow("um. sorry. one more time..").then(choose)
+				: ["yes", "y"].includes(response.trim().toLowerCase())
+					? fast("yes!").then(() => hitlfibiter)
+					: fast("oh.").then(() => slow("okay.")).then(() => slow("we can take it slow.")).then(() => hitlfib)));
+
+const optimize = (n) =>
+	n < 4
+		? hitlfib
+		: n > 25 
+			? slow(hedge())
+				.then(() => fast("acutally.."))
+				.then(() => fast("i need to use my iteration optimization for this."))
+				.then(() => slow("i hope that's okay."))
+				.then(() => hitlfibiter)
+			: choose();
 
 const flow = () =>
 	slow("\nwhat's the fib you'd like to compute? i can help u out")
@@ -151,7 +185,7 @@ const flow = () =>
 		.then((n) => slow(confirmation())
 			.then(() => fast(hedge()))
 			.then(() => slow(`i will help u compute ${green(`fib ${n}`)}`))
-			.then(choose)
+			.then(() => optimize(n))
 			.then((fib) => fib(n))
 			.then((fibn) => slow(hedge())
 				.then(() => fast(done()))
diff --git a/img/hatch-1.jpeg b/img/hatch-1.jpeg
new file mode 100644
index 0000000..3d82d48
--- /dev/null
+++ b/img/hatch-1.jpeg
diff --git a/img/hatch-2.jpg b/img/hatch-2.jpg
new file mode 100644
index 0000000..8482783
--- /dev/null
+++ b/img/hatch-2.jpg
diff --git a/img/hatch-3.jpg b/img/hatch-3.jpg
new file mode 100644
index 0000000..ecbc03b
--- /dev/null
+++ b/img/hatch-3.jpg
diff --git a/index.html b/index.html
index b3a7b9c..54bba8c 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@
     <h1><code>fib</code></h1>
     <p>Can you please give me a Fibonacci function? Ideally (but not necessarily) one that only you would give me.</p>
 
-    <p>For a submission to the upcoming "Reclaim your space" exhibition at <a href="https://www.instagram.com/hatch_artgallery">Hatch Art Gallery</a>.</p>
+    <p>For a submission to the "Our Space" exhibition at <a href="https://www.instagram.com/hatch_artgallery">Hatch Art Gallery</a>.</p>
 
     <div id="contributors-container">
         <h3>Contributors</h3>