Merge branch 'master' of github.com:ndaniels/MRFy

ndaniels · Jul 9, 2012 · 4b44659 · 4b44659
2 parents 7f16a10 + e4f7c51
commit 4b44659
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/HMMPlus.hs b/HMMPlus.hs
@@ -138,7 +138,8 @@ p_int = decimal
 p_direction = liftA mkDirection (optSpaces *> dir <* optSpaces <?> "direction")
             where dir = oneStringOf [ "1", "-1" ]
 
-p_exposure = liftA (map mkExposure) (optSpaces *> many1 (oneOf "io") <* optSpaces <?> "exposure")
+p_exposure = EList <$> liftA (map mkExposure) 
+                       (optSpaces *> many1 (oneOf "io") <* optSpaces <?> "exposure")
 
 
 

diff --git a/MRFTypes.hs b/MRFTypes.hs
@@ -7,6 +7,7 @@ module MRFTypes
   , StrandPair(..)
   , Helix(..)
   , Exposure(..), mkExposure, unElist
+  , ExposureList(..)
   , Direction(..), mkDirection
   , BetaStrand(..), BetaPosition, BetaResidue(..), BetaPair(..)
   , TProb(..), TProbs, m_m, m_i, m_d, i_m, i_i, d_m, d_d, b_m, m_e