1 files changed, 11 insertions, 2 deletions

diff --git a/src/Sequence/Formula.hs b/src/Sequence/Formula.hs
index 878ec7f..5c06503 100644
--- a/src/Sequence/Formula.hs
+++ b/src/Sequence/Formula.hs
@@ -1,14 +1,14 @@
 {-# LANGUAGE RecordWildCards, RankNTypes, TypeSynonymInstances, FlexibleInstances, MultiParamTypeClasses, ViewPatterns, TypeFamilies, GADTs, TypeOperators, ExistentialQuantification, FlexibleContexts, IncoherentInstances #-}
 
 module Sequence.Formula
-  ( FormulaM, Formula, quot'
+  ( FormulaM, FormulaMT, Formula, quot'
   , (:<:)(..), Context(..), ctx
   , evalFormula, evalFormula'
   , findDistribution, findDistribution'
   , findAverage
   , val
   , d, z
-  , Table, table
+  , Table, table, cTable
   ) where
 
 import Control.Lens hiding (Context(..))
@@ -31,6 +31,7 @@ import Data.List
 import Data.Maybe
 import Data.Either
 import Data.Tuple
+import Data.Ratio
 
 import Data.Map (Map)
 import qualified Data.Map as Map
@@ -38,6 +39,8 @@ import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
 
+import Debug.Trace
+
 class (:<:) small large where
   ctx' :: Traversal' large small
 
@@ -68,6 +71,7 @@ ctxStore :: Traversal' (Context input) (Formula input)
 ctxStore modifyF (Context large fSt) = Context large <$> _Just modifyF fSt
 
 type FormulaM input a = StateT (Set [String]) (ReaderT (Context input) (ExceptT (Question input) EventM)) a
+type FormulaMT t input a = t (StateT (Set [String]) (ReaderT (Context input) (ExceptT (Question input) EventM))) a
 
 type Formula input = FormulaM input Int
 
@@ -154,3 +158,8 @@ type Table a = Map a Rational
 
 table :: Ord a => Table a -> FormulaM input a
 table = liftBase . makeEventProb . Map.assocs
+
+cTable :: Ord v => [(Integer, Integer, v)] -> Table v
+cTable results = Map.fromList $ map (\(from, to, value) -> (value, (abs (to - from) + 1) % (range + 1))) results
+  where
+    range = maximum [ max from to | (from, to, _) <- results ] - minimum [ min from to | (from, to, _) <- results ]