git.iko.soy/project-m36
on master help sign in
some simple attribute adjustments
7bfa060AgentM
ProjectM36/Attribute.hs+4−5
compare with master
unifiedsplit
@@ -70,12 +70,9 @@ attributeForName attrName attrs = case V.find ((attrName ==) . attributeName) at
70 Just attr -> Right attr
70 Just attr -> Right attr
71
71
72attributesForNames :: S.Set AttributeName -> Attributes -> Attributes
72attributesForNames :: S.Set AttributeName -> Attributes -> Attributes
73−attributesForNames attrNameSet attrs = V.foldr folder V.empty attrs
73+attributesForNames attrNameSet attrs = V.filter filt attrs
74 where
74 where
75− folder attr acc = if S.member (attributeName attr) attrNameSet then
75+ filt attr = S.member (attributeName attr) attrNameSet
76− acc `V.snoc` attr
77− else
78− acc
79
76
80attributeNameSet :: Attributes -> S.Set AttributeName
77attributeNameSet :: Attributes -> S.Set AttributeName
81attributeNameSet attrVec = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) attrVec
78attributeNameSet attrVec = S.fromList $ V.toList $ V.map (\(Attribute name _) -> name) attrVec
@@ -117,3 +114,5 @@ verifyAttributes attrs = if collapsedAttrs /= attrs then
117 where
114 where
118 collapsedAttrs = vectorUniqueify attrs
115 collapsedAttrs = vectorUniqueify attrs
119
116
117+attributesEqual :: Attributes -> Attributes -> Bool
118+attributesEqual attrs1 attrs2 = V.null (attributesDifference attrs1 attrs2)