From dc8c611b33bc12ff0fb60cd7c7f23384309be219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B9=A4=E7=BF=94=E4=B8=87=E9=87=8C?= Date: Sun, 19 Sep 2021 16:22:39 +0800 Subject: [PATCH 1/3] fix typo in Typeclasses5 --- exercises/typeclasses/Typeclasses5.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/typeclasses/Typeclasses5.hs b/exercises/typeclasses/Typeclasses5.hs index b4cf79e..8c55293 100644 --- a/exercises/typeclasses/Typeclasses5.hs +++ b/exercises/typeclasses/Typeclasses5.hs @@ -52,7 +52,7 @@ data Point3 = Point3 Int Int Int -- logObject (Point3 3 4 5) "Test.hs" -> "Calculated 'Point 3 4 5' from input file Test.hs" -- compareFromEntry (Point3 3 4 5) (Point3 3 4 5) -- -> (True, "New Point calculation matches.") --- compareFromEntry (Point3 3 4 5) (Point3 3 4 5) +-- compareFromEntry (Point3 3 4 5) (Point3 6 8 10) -- -> (False, "New Point calculation does not match previous.") -- Fill in this function as a generalization of compareFromEntry From ffa030c6d0904fac9b3e661edadbc97ee7cc3f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B9=A4=E7=BF=94=E4=B8=87=E9=87=8C?= Date: Sun, 19 Sep 2021 16:31:15 +0800 Subject: [PATCH 2/3] fix typo --- exercises/typeclasses/Typeclasses5.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/typeclasses/Typeclasses5.hs b/exercises/typeclasses/Typeclasses5.hs index 8c55293..b686b41 100644 --- a/exercises/typeclasses/Typeclasses5.hs +++ b/exercises/typeclasses/Typeclasses5.hs @@ -49,7 +49,7 @@ data Person = Person String String Int data Point3 = Point3 Int Int Int deriving (Show, Read, Eq) --- logObject (Point3 3 4 5) "Test.hs" -> "Calculated 'Point 3 4 5' from input file Test.hs" +-- logObject (Point3 3 4 5) "Test.hs" -> "Calculated 'Point3 3 4 5' from input file Test.hs" -- compareFromEntry (Point3 3 4 5) (Point3 3 4 5) -- -> (True, "New Point calculation matches.") -- compareFromEntry (Point3 3 4 5) (Point3 6 8 10) From d66122cca47efc6c31e5487a840d541522d7b485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B9=A4=E7=BF=94=E4=B8=87=E9=87=8C?= Date: Sun, 19 Sep 2021 16:33:21 +0800 Subject: [PATCH 3/3] fix typo --- exercises/typeclasses/Typeclasses5.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/typeclasses/Typeclasses5.hs b/exercises/typeclasses/Typeclasses5.hs index b686b41..c0f67fe 100644 --- a/exercises/typeclasses/Typeclasses5.hs +++ b/exercises/typeclasses/Typeclasses5.hs @@ -50,9 +50,9 @@ data Point3 = Point3 Int Int Int deriving (Show, Read, Eq) -- logObject (Point3 3 4 5) "Test.hs" -> "Calculated 'Point3 3 4 5' from input file Test.hs" --- compareFromEntry (Point3 3 4 5) (Point3 3 4 5) +-- compareFromEntry "Point3 3 4 5" (Point3 3 4 5) -- -> (True, "New Point calculation matches.") --- compareFromEntry (Point3 3 4 5) (Point3 6 8 10) +-- compareFromEntry "Point3 3 4 5" (Point3 6 8 10) -- -> (False, "New Point calculation does not match previous.") -- Fill in this function as a generalization of compareFromEntry