Drezil/hgraph
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed small bug with indices-vector

Browse Source
This commit is contained in:
Nicole Dresselhaus 2013-12-02 22:56:30 +01:00
parent 9eda6c9165
commit 03a34eac8e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/DCB.hs
View File

@ -106,8 +106,7 @@ initGraph attr div req (i, j) =
constr = constraintInit attr div req i j constr = constraintInit attr div req i j
in case constr of in case constr of
Nothing -> Right (i, j) Nothing -> Right (i, j)
Just c -> Left $(A.computeS $A.fromFunction (ix1 2) Just c -> Left (A.fromListUnboxed (ix1 2) [i,j], c, 1)
(\(Z:.i) -> if i == 0 then i else j), c, 1)
-- | checks constraints of an initializing seed -- | checks constraints of an initializing seed
constraintInit :: Attr -> MaxDivergence -> Int -> Int -> Int -> Maybe Constraints constraintInit :: Attr -> MaxDivergence -> Int -> Int -> Int -> Maybe Constraints
@ -168,7 +167,7 @@ addPoint adj attr d div req g@(nodes, _, dens) n =
Nothing -> Nothing Nothing -> Nothing
(Just c) -> (Just c) ->
case dens >= d of case dens >= d of
True -> Just (A.computeS $nodes ++ A.fromFunction (ix1 1) (\i -> n), c, densNew) True -> Just (A.computeS $nodes ++ A.fromListUnboxed (ix1 1) [n], c, densNew)
False -> Nothing False -> Nothing
-- | yields all valid addititons (=neighbours) to a Graph -- | yields all valid addititons (=neighbours) to a Graph