diff options
| -rw-r--r-- | bin/cluster.hs | 4 | ||||
| -rw-r--r-- | bin/draw.hs | 3 | ||||
| -rw-r--r-- | cabal.project | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bin/cluster.hs b/bin/cluster.hs index 222834e..ba9e9f1 100644 --- a/bin/cluster.hs +++ b/bin/cluster.hs @@ -138,9 +138,7 @@ run opts = do hSetBuffering stdout NoBuffering m@((ps, cl), _) <- S.fold_ (\l r -> if mml l < mml r then l else r) (([[]], []), -1 / 0) id . takeWithProgress (nsamples opts) $ - if mhfrac opts <= 0 - then ssmh g (model $ getCompact parsed) - else mh g (mhfrac opts) (model $ getCompact parsed) + mh g (mhfrac opts) (model $ getCompact parsed) writeFile (outputPath opts <> "/props") . unlines $ map (intercalate "," . map show) ps writeFile (outputPath opts <> "/tree") . unlines $ map show cl writeFile (outputPath opts <> "/mml") $ show (mml m) diff --git a/bin/draw.hs b/bin/draw.hs index 89658f6..f2d5b54 100644 --- a/bin/draw.hs +++ b/bin/draw.hs @@ -73,7 +73,8 @@ main = run =<< execParser opts (parser <**> helper) (fullDesc <> progDesc "Draw phylogeny" <> header "phylogey - Bayesian phylogeny inference") parser = - Options <$> option nat (long "nthreshold" <> short 't' <> help "minimum number of variants" <> showDefault <> value 0 <> metavar "NAT") + Options + <$> option nat (long "nthreshold" <> short 't' <> help "minimum number of variants" <> showDefault <> value 0 <> metavar "NAT") <*> argument str (metavar "PROPS") <*> argument str (metavar "TREE") <*> argument str (metavar "PATH") diff --git a/cabal.project b/cabal.project index 754ddf0..3aea8cd 100644 --- a/cabal.project +++ b/cabal.project @@ -3,5 +3,5 @@ packages: *.cabal source-repository-package type: git location: https://vk3.wtf/cgit/ppl.git - tag: 592c36f2e2d05d2b2e7dfc40ff5758208d34b42f - --sha256: eb8d3b5f8f0f249374044f53b0c573c0f4300ccb6720ea475dd5986d15e0da91 + tag: be4be249004af1e7039a29d0228b506139983ea2 + --sha256: 0aa3887003290f5e1cc940c59ac7a83bfd59a90813e5f3569f0509c7826fd45c |