i accidentally factor 10..
This commit is contained in:
parent
cad98f10cb
commit
fe7b575800
@ -248,17 +248,18 @@ addPoint :: Adj -- ^ global adjacency matrix of all nodes
|
|||||||
-> Maybe Graph
|
-> Maybe Graph
|
||||||
addPoint adj attr d div req g@(nodes, _, dens) n =
|
addPoint adj attr d div req g@(nodes, _, dens) n =
|
||||||
let
|
let
|
||||||
(! constr,! densNew) = (constraint attr div req g n,updateDensity adj nodes n dens)
|
(constr, densNew) = (constraint attr div req g n,updateDensity adj nodes n dens)
|
||||||
-- +|| (parTuple2 rdeepseq rdeepseq)
|
-- +|| (parTuple2 rdeepseq rdeepseq)
|
||||||
in
|
in
|
||||||
case constr of
|
case densNew >= d of
|
||||||
Nothing -> Nothing
|
False -> Nothing
|
||||||
(Just c@(ful,constr)) ->
|
True ->
|
||||||
--trace (B.unpack $ outputArray constr) $
|
case constr of
|
||||||
case densNew >= d of
|
Nothing -> Nothing
|
||||||
True -> Just {-$ trace ("submitting graph:\n================\n " P.++ (B.unpack $ outputGraph [(A.computeS $nodes ++ A.fromListUnboxed (ix1 1) [n], c, densNew)])) -}
|
(Just c@(ful,constr)) ->
|
||||||
|
--trace (B.unpack $ outputArray constr) $
|
||||||
|
Just {-$ trace ("submitting graph:\n================\n " P.++ (B.unpack $ outputGraph [(A.computeS $nodes ++ A.fromListUnboxed (ix1 1) [n], c, densNew)])) -}
|
||||||
(A.computeUnboxedS $nodes ++ A.fromListUnboxed (ix1 1) [n], c, densNew)
|
(A.computeUnboxedS $nodes ++ A.fromListUnboxed (ix1 1) [n], c, densNew)
|
||||||
False -> Nothing
|
|
||||||
|
|
||||||
reduceDim :: (A.Shape sh, Integral a) => (sh :. a) -> sh
|
reduceDim :: (A.Shape sh, Integral a) => (sh :. a) -> sh
|
||||||
reduceDim (a :. b) = a --A.shapeOfList $ tail $ A.listOfShape a
|
reduceDim (a :. b) = a --A.shapeOfList $ tail $ A.listOfShape a
|
||||||
|
Loading…
Reference in New Issue
Block a user