summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/World/Lattice.hs (renamed from src/Lattice.hs)2
-rw-r--r--src/World/Types.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Lattice.hs b/src/World/Lattice.hs
index b69aa41..257ea50 100644
--- a/src/Lattice.hs
+++ b/src/World/Lattice.hs
@@ -1,4 +1,4 @@
-module Lattice
+module World.Lattice
( LatticeCell (..)
, Lattice
, LatticeRule
diff --git a/src/World/Types.hs b/src/World/Types.hs
index e9be991..78bd5af 100644
--- a/src/World/Types.hs
+++ b/src/World/Types.hs
@@ -104,6 +104,6 @@ instance (Combinable a) => Combinable (AgentPropList a) where
newtype Proposal a b c = Proposal (LatticePropList a b, AgentPropList c) deriving (Show, Eq)
instance (Combinable a, Combinable b, Combinable c) => Combinable (Proposal a b c) where
- identity = Proposal ([], [])
+ identity = Proposal (LatticePropList [], AgentPropList [])
combinable (Proposal (l, a)) (Proposal (l', a')) = (combinable l l') && (combinable a a')
combine (Proposal (l, a)) (Proposal (l', a')) = Proposal (combine l l', combine a a')