X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=hints%2Fassignment_7_hint_4.mdwn;h=568a9cc0ae856a09014ac38a9a4973c42012a873;hp=71ed621b6b108a5129242340d9f2723d5610dcad;hb=42a3335d8d35d189aa7de17622cd3e61d9d4b72f;hpb=1ad04632ef842a0591d1387d7709afc82f6ed3bd

diff --git a/hints/assignment_7_hint_4.mdwn b/hints/assignment_7_hint_4.mdwn
index 71ed621b..568a9cc0 100644
--- a/hints/assignment_7_hint_4.mdwn
+++ b/hints/assignment_7_hint_4.mdwn
@@ -46,13 +46,14 @@
 
 	Finally, we realize that we're going to have a set of `bool dpm`s to start with, and we need to compose \[[Qx]] with them. We don't want any of the monadic values in the set that wrap `false` to become `true`; instead, we want to apply a filter that checks whether values that formerly wrapped `true` should still continue to do so.
 
-	This is most easily done like this:
+	This could be handled like this:
 
 		fun entity_dpm ->
-			fun truth_value ->
+			let eliminate_non_Qxs = fun truth_value ->
 				if truth_value = false
 				then empty_set
-				else unit_set (bind dpm entity_dpm (fun e -> unit_dpm (Q e)))
+				else unit_set (bind_dpm entity_dpm (fun e -> unit_dpm (Q e)))
+			in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
 
 	Applied to an `entity_dpm`, that yields a function that we can bind to a `bool dpm set` and that will transform the doubly-wrapped `bool` into a new `bool dpm set`.
 
@@ -64,27 +65,29 @@
 			let obj = List.nth h (r 'x')
 			in (obj, r, h)
 		in let entity_dpm = getx
-		in fun truth_value ->
+		in let eliminate_non_Qxs = fun truth_value ->
 			if truth_value = false
 			then empty_set
 			else unit_set (bind_dpm entity_dpm (fun e -> unit_dpm (Q e)))
+		in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
 
 	or, simplifying:
 
 		let getx = fun (r, h) ->
 			let obj = List.nth h (r 'x')
 			in (obj, r, h)
-		in fun truth_value ->
+		in let eliminate_non_Qxs = fun truth_value ->
 			if truth_value
 			then unit_set (bind_dpm getx (fun e -> unit_dpm (Q e)))
 			else empty_set
+		in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
 
 	unpacking the definition of `bind_dpm`, that is:
 
 		let getx = fun (r, h) ->
 			let obj = List.nth h (r 'x')
 			in (obj, r, h)
-		in fun truth_value ->
+		in let eliminate_non_Qxs = fun truth_value ->
 			if truth_value
 			then unit_set (
 				fun (r, h) ->
@@ -92,10 +95,11 @@
 					in let u' = (fun e -> unit_dpm (Q e)) a
 					in u' (r', h')
 			) else empty_set
-		
+		in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
+
 	which is:
 
-		in fun truth_value ->
+		let eliminate_non_Qxs = fun truth_value ->
 			if truth_value
 			then unit_set (
 				fun (r, h) ->
@@ -104,18 +108,22 @@
 					in let u' = (fun e -> unit_dpm (Q e)) a
 					in u' (r', h')
 			) else empty_set
-		
+		in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
+
 	which is:
 
-		in fun truth_value ->
+		let eliminate_non_Qxs = fun truth_value ->
 			if truth_value
 			then unit_set (
 				fun (r, h) ->
 					let obj = List.nth h (r 'x')
 					in let u' = unit_dpm (Q obj)
-					in u' (r', h')
+					in u' (r, h)
 			) else empty_set
-		
+		in fun one_dpm -> (bind_dpm one_dpm eliminate_non_Qxs)
+
+	This is a function that takes a `bool dpm` as input and returns a `bool dpm set` as output.
+
 	This is a bit different than the \[[Qx]] we had before:
 
 		let eliminate_non_Qxs = (fun truth_value ->
@@ -125,7 +133,7 @@
 					then let obj = List.nth h (r 'x') in Q obj
 					else false
 				in (truth_value', r, h))
-		in (fun one_dpm -> unit_set (bind_dpm one_dpm eliminate_non_Qxs))
+		in fun one_dpm -> unit_set (bind_dpm one_dpm eliminate_non_Qxs)
 
 	because that one passed through every `bool dpm` that wrapped a `false`; whereas now we're discarding some of them. But these will work equally well. We can implement either behavior (or, as we said before, the behavior of never passing through a wrapped `false`).