diff --git a/src/Interior.hs b/src/Interior.hs index 6c0ec5c..9224bf2 100644 --- a/src/Interior.hs +++ b/src/Interior.hs @@ -104,20 +104,20 @@ placeInteriorIO imat imgmat irp graph = then (g2, (mat, rp)) else if (pr + nrows cmat - 1 > fst (matmax bnds) || - pc + ncols cmat - 1 > snd (matmax bnds) || - any (`notElem` clusterRoom appl) - (M.toList (M.submatrix - pr (pr + nrows cmat - 1) - pc (pc + ncols cmat - 1) - imat - )) || - any isJust - (M.toList (M.submatrix - pr (pr + nrows cmat - 1) - pc (pc + ncols cmat - 1) - mat - ))) || - not (isReachable newmat [] (oldreaches ++ reaches) exits) + pc + ncols cmat - 1 > snd (matmax bnds) || + any (`notElem` clusterRoom appl) + (M.toList (M.submatrix + pr (pr + nrows cmat - 1) + pc (pc + ncols cmat - 1) + imat + )) || + any isJust + (M.toList (M.submatrix + pr (pr + nrows cmat - 1) + pc (pc + ncols cmat - 1) + mat + ))) || + not (isReachable newmat [] (oldreaches ++ reaches) exits) then placeCluster g2 bnds (try + 1) mat rp appl else placeCluster g2 bnds (try + 1) newmat newrp appl