Adds ways to control strictness.

Increases efficiency by 1.5x (if used in observation table)

NominalAngluin.cabal

@@ -22,6 +22,7 @@ executable NominalAngluin
   build-depends:
     base >=4.8 && <4.9,
     containers,
+    deepseq,
     haskeline,
     mtl,
     NLambda

src/Examples/Fifo.hs

@@ -1,6 +1,7 @@
-{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
 module Examples.Fifo (DataInput(..), fifoExample) where
 
+import Control.DeepSeq (NFData)
 import           GHC.Generics (Generic)
 import           NLambda
 import           Prelude      (Eq, Int, Maybe (..), Ord, Show, length, reverse,
@@ -34,7 +35,7 @@ sizeFifo (Fifo l1 l2) = length l1 + length l2
 -- nominal automaton.
 
 -- The alphabet:
-data DataInput = Put Atom | Get Atom deriving (Eq, Ord, Show, Generic)
+data DataInput = Put Atom | Get Atom deriving (Eq, Ord, Show, Generic, NFData)
 instance BareNominalType DataInput
 instance Contextual DataInput where
     when f (Put a) = Put (when f a)

src/ObservationTable.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE DeriveGeneric     #-}
+{-# LANGUAGE DeriveAnyClass    #-}
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE RecordWildCards   #-}
@@ -14,6 +15,8 @@ import           GHC.Generics (Generic)
 import           Prelude      (Bool (..), Eq, Ord, Show, ($), (++), (.), uncurry)
 import qualified Prelude      ()
 
+import Control.DeepSeq
+
 -- An observation table is a function S x E -> O
 -- (Also includes SA x E -> O)
 type Table i o = Fun ([i], [i]) o
@@ -53,9 +56,7 @@ data State i = State
     , ee  :: Set [i]  -- suffixes
     , aa  :: Set i    -- alphabet (remains constant)
     }
-    deriving (Show, Ord, Eq, Generic)
+    deriving (Show, Ord, Eq, Generic, NFData, BareNominalType)
-
-instance NominalType i => BareNominalType (State i)
 
 instance NominalType i => Conditional (State i) where
     cond f s1 s2 = fromTup (cond f (toTup s1) (toTup s2)) where