fix everything

Author: fonsp

notebooks/week1/abstraction.jl

@@ -13,6 +13,15 @@ macro bind(def, element)
     end
 end
 
+# ╔═╡ da1d65a0-ec42-11ea-0141-334c9eeeb035
+begin
+	using Pkg
+	Pkg.activate(mktempdir())
+	Pkg.add(["PlutoUI", "Images", "ImageMagick"])
+	using PlutoUI
+	using Images
+end
+
 # ╔═╡ 5ef51c3a-70a7-11eb-2023-31113399a57f
 html"""
 <div style="
@@ -85,17 +94,6 @@ The goal of this section is to introduce you to the notion of abstraction. You c
 Before we get lost talking about the foundations of number theory, I will present you with a few examples that represent one to me. 
 "
 
-# ╔═╡ 0504ac94-70ee-11eb-1c4e-977d9e7d35c9
-one = [
-	1,
-	1.0,
-	"one",
-	1//1,
-	oneimage,
-	[1 0; 0 1],
-	corgi,
-]
-
 # ╔═╡ 6fcac482-70ee-11eb-0b80-ff41c708053b
 md"Each of the items in this list is a specific, or **_specialized_** representation of _one_:
 1. as an integer
@@ -111,9 +109,6 @@ Of course, these are just a few examples of _one_. People have been representing
 The difference between these ones to me is clear. In fact, I just articulated it to you. Now, let's turn to how a computer sees _one_ differently based on what I type.
 "
 
-# ╔═╡ 0b1668ba-ec42-11ea-3e50-ed97c5b17ced
-computer_ones = typeof.(one)
-
 # ╔═╡ 9ebc079a-70f0-11eb-07d9-f9e80f3f4584
 md"So to a computer, all of these are different types."
 
@@ -122,26 +117,6 @@ md"### What is a collection of _one_s?
 
 Now, I want to make a collection of ones for some reason. Below is a way for you to experiment building this collection with different _one_s. As you do this experiment, I want you to look at what stays in the same in the Julia output, and what doesn't."
 
-# ╔═╡ b2239b96-70ef-11eb-0b85-21ecab25dc9f
-begin
-	one_keys = ["1", "1.0", "one", "1//1", "Cute One", "2x2 Identity", "One Corgi"] 
-	selections = one_keys .=> one_keys
-	lookup_element = Dict(one_keys .=> one)
-	md"$(@bind element_key Select(selections))"
-end
-
-# ╔═╡ 4251f668-70aa-11eb-3d89-35f8d53b7d9b
-# your chosen one
-element = lookup_element[element_key]
-
-# ╔═╡ f1568d10-ec41-11ea-3dd2-a9cb273ce5b8
-#its type
-typeof(element)
-
-# ╔═╡ ab02d850-ec41-11ea-10b2-a1b600b12658
-# a 3x4 array of this one.
-array = fill(element,3,4)
-
 # ╔═╡ f6886d90-70ed-11eb-07c4-471ee267e7c1
 md"""
 Before we even look at the output, I am amazed that this code even ran. Are you telling me that the computer doesn't care which _one_ I am using in my array?
@@ -182,12 +157,6 @@ begin
 	"""
 end
 
-# ╔═╡ 5363a400-ec44-11ea-284e-d13a8872551c
-begin
-	one_image_array = fill(oneimage,3,4)
-	insert(corgi, one_image_array, i, j)
-end
-
 # ╔═╡ 71ac08ea-7145-11eb-237d-5506adfb9533
 begin
 	one_number_array = fill(1,3,4)
@@ -208,15 +177,6 @@ md"""
 ## Appendix
 """
 
-# ╔═╡ da1d65a0-ec42-11ea-0141-334c9eeeb035
-begin
-	using Pkg
-	Pkg.activate(mktempdir())
-	Pkg.add(["PlutoUI", "Images", "ImageMagick"])
-	using PlutoUI
-	using Images
-end
-
 # ╔═╡ 1a2a9000-ec43-11ea-3f39-8312ea286a92
 begin
 	oneimage = load(download("https://gallery.yopriceville.com/var/albums/Free-Clipart-Pictures/Decorative-Numbers/Cute_Number_One_PNG_Clipart_Image.png?m=1437447301"))
@@ -225,6 +185,46 @@ begin
 end
 
 
+# ╔═╡ 0504ac94-70ee-11eb-1c4e-977d9e7d35c9
+one = [
+	1,
+	1.0,
+	"one",
+	1//1,
+	oneimage,
+	[1 0; 0 1],
+	corgi,
+]
+
+# ╔═╡ 0b1668ba-ec42-11ea-3e50-ed97c5b17ced
+computer_ones = typeof.(one)
+
+# ╔═╡ b2239b96-70ef-11eb-0b85-21ecab25dc9f
+begin
+	one_keys = ["1", "1.0", "one", "1//1", "Cute One", "2x2 Identity", "One Corgi"] 
+	selections = one_keys .=> one_keys
+	lookup_element = Dict(one_keys .=> one)
+	md"$(@bind element_key Select(selections))"
+end
+
+# ╔═╡ 4251f668-70aa-11eb-3d89-35f8d53b7d9b
+# your chosen one
+element = lookup_element[element_key]
+
+# ╔═╡ f1568d10-ec41-11ea-3dd2-a9cb273ce5b8
+#its type
+typeof(element)
+
+# ╔═╡ ab02d850-ec41-11ea-10b2-a1b600b12658
+# a 3x4 array of this one.
+array = fill(element,3,4)
+
+# ╔═╡ 5363a400-ec44-11ea-284e-d13a8872551c
+begin
+	one_image_array = fill(oneimage,3,4)
+	insert(corgi, one_image_array, i, j)
+end
+
 # ╔═╡ Cell order:
 # ╟─5ef51c3a-70a7-11eb-2023-31113399a57f
 # ╟─60ae819a-70a7-11eb-31d4-750c7f5dc6ca

notebooks/week1/images.jl

@@ -13,6 +13,31 @@ macro bind(def, element)
     end
 end
 
+# ╔═╡ 74b008f6-ed6b-11ea-291f-b3791d6d1b35
+begin
+	import Pkg
+	Pkg.activate(mktempdir())
+	Pkg.add([
+		Pkg.PackageSpec(name="ImageIO", version="0.5"),
+		Pkg.PackageSpec(name="ImageShow", version="0.2"),
+		Pkg.PackageSpec(name="FileIO", version="1.6"),
+		Pkg.PackageSpec(name="PNGFiles", version="0.3.6"),
+		Pkg.PackageSpec(name="Colors", version="0.12"),
+		Pkg.PackageSpec(name="ColorVectorSpace", version="0.8"),
+		Pkg.PackageSpec(name="PlutoUI", version="0.7"), 
+		Pkg.PackageSpec(name="HypertextLiteral", version="0.5")
+	])
+
+	using Colors, ColorVectorSpace, ImageShow, FileIO
+	using PlutoUI
+	using HypertextLiteral
+end
+
+# ╔═╡ 71a1e08a-6abc-48d5-b177-5184dbdd76a8
+filter!(LOAD_PATH) do path
+	path != "@v#.#"
+end;
+
 # ╔═╡ e91d7926-ec6e-41e7-aba2-9dca333c8aa5
 html"""
 <div style="
@@ -74,31 +99,6 @@ md"""
 _When running this notebook for the first time, this could take up to 15 minutes. Hang in there!_
 """
 
-# ╔═╡ 74b008f6-ed6b-11ea-291f-b3791d6d1b35
-begin
-	import Pkg
-	Pkg.activate(mktempdir())
-	Pkg.add([
-		Pkg.PackageSpec(name="ImageIO", version="0.5"),
-		Pkg.PackageSpec(name="ImageShow", version="0.2"),
-		Pkg.PackageSpec(name="FileIO", version="1.6"),
-		Pkg.PackageSpec(name="PNGFiles", version="0.3.6"),
-		Pkg.PackageSpec(name="Colors", version="0.12"),
-		Pkg.PackageSpec(name="ColorVectorSpace", version="0.8"),
-		Pkg.PackageSpec(name="PlutoUI", version="0.7"), 
-		Pkg.PackageSpec(name="HypertextLiteral", version="0.5")
-	])
-
-	using Colors, ColorVectorSpace, ImageShow, FileIO
-	using PlutoUI
-	using HypertextLiteral
-end
-
-# ╔═╡ 71a1e08a-6abc-48d5-b177-5184dbdd76a8
-filter!(LOAD_PATH) do path
-	path != "@v#.#"
-end;
-
 # ╔═╡ ca1b507e-6017-11eb-34e6-6b85cd189002
 md"""
 # Images as examples of data  all around us
@@ -272,18 +272,6 @@ Even more fun is to use your own webcam. Try pressing the enable button below. T
 press the camera to capture an image. Kind of fun to keep pressing the button as you move your hand etc.
 """
 
-# ╔═╡ d6742ea0-1106-4f3c-a5b8-a31a48d33f19
-@bind webcam_data1 camera_input()
-
-# ╔═╡ 1d7375b7-7ea6-4d67-ab73-1c69d6b8b87f
-myface1 = process_raw_camera_data(webcam_data1);
-
-# ╔═╡ 6224c74b-8915-4983-abf0-30e6ba04a46d
-[
-	myface1              myface1[   :    , end:-1:1]
-	myface1[end:-1:1, :] myface1[end:-1:1, end:-1:1]
-]
-
 # ╔═╡ cef1a95a-64c6-11eb-15e7-636a3621d727
 md"""
 ## Inspecting your data
@@ -343,12 +331,6 @@ md"""
 We can also use variables as indices...
 """
 
-# ╔═╡ 94b77934-713e-11eb-18cf-c5dc5e7afc5b
-row_i,col_i
-
-# ╔═╡ ff762861-b186-4eb0-9582-0ce66ca10f60
-philip[row_i, col_i]
-
 # ╔═╡ 13844ebf-52c4-47e9-bda4-106a02fad9d7
 md"""
 ...and these variables can be controlled by sliders!
@@ -360,6 +342,12 @@ md"""
 # ╔═╡ 6511a498-7ac9-445b-9c15-ec02d09783fe
 @bind col_i Slider(1:size(philip)[2], show_value=true)
 
+# ╔═╡ 94b77934-713e-11eb-18cf-c5dc5e7afc5b
+row_i,col_i
+
+# ╔═╡ ff762861-b186-4eb0-9582-0ce66ca10f60
+philip[row_i, col_i]
+
 # ╔═╡ c9ed950c-dcd9-4296-a431-ee0f36d5b557
 md"""
 ### Locations in an image: Range indexing
@@ -565,29 +553,6 @@ function create_bar()
 	return missing
 end
 
-# ╔═╡ d862fb16-edf1-11ea-36ec-615d521e6bc0
-colored_line(create_bar())
-
-# ╔═╡ e3394c8a-edf0-11ea-1bb8-619f7abb6881
-if !@isdefined(create_bar)
-	not_defined(:create_bar)
-else
-	let
-		result = create_bar()
-		if ismissing(result)
-			still_missing()
-		elseif isnothing(result)
-			keep_working(md"Did you forget to write `return`?")
-		elseif !(result isa Vector) || length(result) != 100
-			keep_working(md"The result should be a `Vector` with 100 elements.")
-		elseif result[[1,50,100]] != [0,1,0]
-			keep_working()
-		else
-			correct()
-		end
-	end
-end
-
 # ╔═╡ 693af19c-64cc-11eb-31f3-57ab2fbae597
 md"""
 ## Reducing the size of an image
@@ -791,18 +756,6 @@ md"""
 We can do the same to create different size matrices, by creating two sliders, one for reds and one for greens. Try it out!
 """
 
-# ╔═╡ 2a94a2cf-b697-4b0b-afd0-af2e35af2bb1
-@bind webcam_data camera_input()
-
-# ╔═╡ 3e0ece65-b8a7-4be7-ae44-6d7210c2e15b
-myface = process_raw_camera_data(webcam_data);
-
-# ╔═╡ 4ee18bee-13e6-4478-b2ca-ab66100e57ec
-[
-	myface              myface[   :    , end:-1:1]
-	myface[end:-1:1, :] myface[end:-1:1, end:-1:1]
-]
-
 # ╔═╡ ace86c8a-60ee-11eb-34ef-93c54abc7b1a
 md"""
 # Summary
@@ -821,15 +774,15 @@ md"""
 ----
 """
 
-# ╔═╡ 45815734-ee0a-11ea-2982-595e1fc0e7b1
-bigbreak
-
 # ╔═╡ 5da8cbe8-eded-11ea-2e43-c5b7cc71e133
 begin
 	colored_line(x::Vector{<:Real}) = Gray.(Float64.((hcat(x)')))
 	colored_line(x::Any) = nothing
 end
 
+# ╔═╡ d862fb16-edf1-11ea-36ec-615d521e6bc0
+colored_line(create_bar())
+
 # ╔═╡ e074560a-601b-11eb-340e-47acd64f03b2
 hint(text) = Markdown.MD(Markdown.Admonition("hint", "Hint", [text]))
 
@@ -851,9 +804,32 @@ correct(text=rand(yays)) = Markdown.MD(Markdown.Admonition("correct", "Got it!",
 # ╔═╡ e0a4fc10-601b-11eb-211d-03570aca2726
 not_defined(variable_name) = Markdown.MD(Markdown.Admonition("danger", "Oopsie!", [md"Make sure that you define a variable called **$(Markdown.Code(string(variable_name)))**"]))
 
+# ╔═╡ e3394c8a-edf0-11ea-1bb8-619f7abb6881
+if !@isdefined(create_bar)
+	not_defined(:create_bar)
+else
+	let
+		result = create_bar()
+		if ismissing(result)
+			still_missing()
+		elseif isnothing(result)
+			keep_working(md"Did you forget to write `return`?")
+		elseif !(result isa Vector) || length(result) != 100
+			keep_working(md"The result should be a `Vector` with 100 elements.")
+		elseif result[[1,50,100]] != [0,1,0]
+			keep_working()
+		else
+			correct()
+		end
+	end
+end
+
 # ╔═╡ e0a6031c-601b-11eb-27a5-65140dd92897
 bigbreak = html"<br><br><br><br><br>";
 
+# ╔═╡ 45815734-ee0a-11ea-2982-595e1fc0e7b1
+bigbreak
+
 # ╔═╡ e0b15582-601b-11eb-26d6-bbf708933bc8
 function camera_input(;max_size=150, default_url="https://i.imgur.com/SUmi94P.png")
 """
@@ -1058,6 +1034,12 @@ function camera_input(;max_size=150, default_url="https://i.imgur.com/SUmi94P.pn
 """ |> HTML
 end
 
+# ╔═╡ d6742ea0-1106-4f3c-a5b8-a31a48d33f19
+@bind webcam_data1 camera_input()
+
+# ╔═╡ 2a94a2cf-b697-4b0b-afd0-af2e35af2bb1
+@bind webcam_data camera_input()
+
 # ╔═╡ e891fce0-601b-11eb-383b-bde5b128822e
 
 function process_raw_camera_data(raw_camera_data)
@@ -1093,6 +1075,24 @@ function process_raw_camera_data(raw_camera_data)
 	RGB.(reds, greens, blues)
 end
 
+# ╔═╡ 1d7375b7-7ea6-4d67-ab73-1c69d6b8b87f
+myface1 = process_raw_camera_data(webcam_data1);
+
+# ╔═╡ 6224c74b-8915-4983-abf0-30e6ba04a46d
+[
+	myface1              myface1[   :    , end:-1:1]
+	myface1[end:-1:1, :] myface1[end:-1:1, end:-1:1]
+]
+
+# ╔═╡ 3e0ece65-b8a7-4be7-ae44-6d7210c2e15b
+myface = process_raw_camera_data(webcam_data);
+
+# ╔═╡ 4ee18bee-13e6-4478-b2ca-ab66100e57ec
+[
+	myface              myface[   :    , end:-1:1]
+	myface[end:-1:1, :] myface[end:-1:1, end:-1:1]
+]
+
 # ╔═╡ 3ef77236-1867-4d02-8af2-ff4777fcd6d9
 exercise_css = html"""
 <style>