@@ -4,7 +4,8 @@ data Pilha = Pilha [Box] deriving (Show, Eq) data Box = Box (Int,Int) | BoxRecursivo (Int,Int) Box - | Pedestal Int Box + deriving (Show, Eq) +data Pedestal = Pedestal Int Box deriving (Show, Eq) tamanho :: Pilha -> Int @@ -16,7 +17,7 @@ empilha :: Pilha -> Box -> Pilha empilha _ (Box (2,1)) = (Pilha [Box (1,1), Box (2,1)]) empilha _ _ = (Pilha [Box (1,1), Box (1,1)]) -junta :: Box -> Box -> Box +junta :: Box -> Box -> (Either Pedestal Box) junta (Box(alturaPedestal,larguraPedestal)) (Box(alturaCaixa,larguraCaixa)) - | larguraPedestal < larguraCaixa = Pedestal alturaPedestal (Box(alturaCaixa , larguraCaixa)) -junta (Box dimensoes) box = BoxRecursivo dimensoes box + | larguraPedestal < larguraCaixa = Left $ Pedestal alturaPedestal (Box(alturaCaixa , larguraCaixa)) +junta (Box dimensoes) box = Right $ BoxRecursivo dimensoes box 59-pile-of-boxes/PileBoxes.hs @@ -36,11 +36,11 @@ testeEmpilhaDuasCaixas = TestList testeJuntaDuasCaixas = TestList [ "Junta caixa 3x3 com outra 2x2" ~: - junta (Box (3,3)) (Box (2,2)) ~?= (BoxRecursivo (3,3) (Box (2,2))) + junta (Box (3,3)) (Box (2,2)) ~?= (Right $BoxRecursivo (3,3) (Box (2,2))) ,"Junta caixa 4x4 com outra 3x3" ~: - junta (Box (4,4)) (Box (3,3)) ~?= (BoxRecursivo (4,4) (Box (3,3))) + junta (Box (4,4)) (Box (3,3)) ~?= (Right $BoxRecursivo (4,4) (Box (3,3))) ,"Junta caixa 3x3 com outra 4x4" ~: - junta (Box (3,3)) (Box (4,4)) ~?= (Pedestal 3 (Box (4,4))) + junta (Box (3,3)) (Box (4,4)) ~?= (Left $Pedestal 3 (Box (4,4))) ,"Junta caixa 2x2 com outra 5x5" ~: - junta (Box (2,2)) (Box (5,5)) ~?= (Pedestal 2 (Box (5,5))) + junta (Box (2,2)) (Box (5,5)) ~?= (Left $Pedestal 2 (Box (5,5))) ] 59-pile-of-boxes/Tests.hs b0581e9c38619fe7fdb22f15bf52a8ff9e771ce3 ticolucci ticolucci@gmail.com http://github.com/dojosp/participant-s-projects/commit/e99425d184fa7a145f95ebc3fbe62b97568c1282 e99425d184fa7a145f95ebc3fbe62b97568c1282 2008-12-01T11:55:12-08:00 2008-12-01T11:55:12-08:00 Aprendendo a usar o Either - nao gostamos muito de como ficou. Mari 8b8b70c56c15e7db026b9625a34e73578a3ec7c5 ticolucci ticolucci@gmail.com