Skip to content

Commit

Permalink
Fixed issue with fuse keeping worse graphs when multitravers if off f…
Browse files Browse the repository at this point in the history
…or fuse, also fixed issue with setting multitravers in fuse
  • Loading branch information
Ward Wheeler authored and Ward Wheeler committed Nov 28, 2024
1 parent 46dfde3 commit 4636446
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/Search/Refinement.hs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ fuseGraphs inArgs inGS inData inGraphList

-- Default MultiTraverse off--need to rediagnose if set differnet from fuse option
let doMultiTraverse
| any ((== "MultiTraverse") . fst) lcArgList = True
| any ((== "multitraverse") . fst) lcArgList = True
| otherwise = False

-- readdition options, specified as swap types
Expand Down Expand Up @@ -418,17 +418,20 @@ fuseGraphs inArgs inGS inData inGraphList
pure newGraphs


-- This in case found worse (using single traverse) or more but same cost
listToReturn <- GO.selectGraphs Best (outgroupIndex inGS) (fromJust keepNum) 0 $ inGraphList <> rediagnoseGraphList

logWith LogMore $
unwords
[ "\tAfter fusing:"
, show $ length rediagnoseGraphList
, show $ length listToReturn
, "resulting graphs with minimum cost"
, show . minimum $ fmap snd5 rediagnoseGraphList
, show . minimum $ fmap snd5 listToReturn
, " after fuse rounds (total): "
, show counterFuse
, "\n"
]
pure rediagnoseGraphList
pure listToReturn


-- | getFuseGraphParams returns fuse parameters from arglist
Expand Down

0 comments on commit 4636446

Please sign in to comment.