From d8d2da821331a3a748b1964b6fbb221907c85ba1 Mon Sep 17 00:00:00 2001 From: Stephan Schiffels Date: Fri, 25 Oct 2024 10:32:44 +0200 Subject: [PATCH] fixed some minors after merging master --- src/Poseidon/CLI/Forge.hs | 2 +- src/Poseidon/Janno.hs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Poseidon/CLI/Forge.hs b/src/Poseidon/CLI/Forge.hs index 72d0bb2e..2565ec94 100644 --- a/src/Poseidon/CLI/Forge.hs +++ b/src/Poseidon/CLI/Forge.hs @@ -20,7 +20,7 @@ import Poseidon.GenotypeData (GenoDataSource (..), printSNPCopyProgress, selectIndices, snpSetMergeList) import Poseidon.Janno (JannoRow (..), ListColumn (..), - JannoRows (..), getMaybeJannoList, + JannoRows (..), getMaybeListColumn, jannoRows2EigenstratIndEntries, writeJannoFile) import Poseidon.Package (PackageReadOptions (..), diff --git a/src/Poseidon/Janno.hs b/src/Poseidon/Janno.hs index 3e611ac5..8f6057fd 100644 --- a/src/Poseidon/Janno.hs +++ b/src/Poseidon/Janno.hs @@ -655,4 +655,5 @@ deriveGeneric ''JannoRow jannoRows2EigenstratIndEntries :: JannoRows -> [EigenstratIndEntry] jannoRows2EigenstratIndEntries (JannoRows jannoRows) = do -- list monad jannoRow <- jannoRows -- looping over jannoRows - return $ EigenstratIndEntry (jPoseidonID jannoRow) (sfSex (jGeneticSex jannoRow)) (head . getJannoList $ jGroupName jannoRow) + let GroupName gText = head . getListColumn . jGroupName $ jannoRow + return $ EigenstratIndEntry (jPoseidonID jannoRow) (sfSex (jGeneticSex jannoRow)) (T.unpack gText)