From c65bc7bda846e810dfadf4710ca4e5011ee31d1e Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 6 Apr 2020 10:41:47 +0200 Subject: [PATCH] chore(workflow-types): derive Show for Graph and Edge --- src/Model/Types/Workflow.hs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Model/Types/Workflow.hs b/src/Model/Types/Workflow.hs index 7f87c6723..c74fcdfd6 100644 --- a/src/Model/Types/Workflow.hs +++ b/src/Model/Types/Workflow.hs @@ -120,9 +120,7 @@ data WorkflowGraphEdge userid fileid = WGE , wgeTarget :: WorkflowGraphNodeLabel , wgeForm :: Map WorkflowEdgePayloadLabel (NonNull (Set (WorkflowEdgePayloadSpecification fileid userid))) } - -instance (Show userid, Show fileid) => Show (WorkflowGraphEdge userid fileid) where - show WGE{..} = "WGE {wgeActors = " ++ show wgeActors ++ ", wgeTarget = " ++ show wgeTarget ++ ", wgeForm = " ++ show wgeForm ++ "}" + deriving Show instance (Eq userid, Eq fileid) => Eq (WorkflowGraphEdge userid fileid) where e1@WGE{} == e2@WGE{} = wgeActors e1 == wgeActors e2 && wgeTarget e1 == wgeTarget e2 && wgeForm e1 == wgeForm e2 @@ -133,9 +131,7 @@ instance (Ord userid, Ord fileid) => Ord (WorkflowGraphEdge userid fileid) where data WorkflowGraph userid fileid = WorkflowGraph { wgNodes :: Map WorkflowGraphNodeLabel (WorkflowGraphNode, Set (WorkflowGraphEdge userid fileid)) } - -instance (Show userid, Show fileid) => Show (WorkflowGraph userid fileid) where - show (WorkflowGraph m) = show m + deriving Show instance (Eq userid, Eq fileid) => Eq (WorkflowGraph userid fileid) where WorkflowGraph m1 == WorkflowGraph m2 = m1 == m2