diff options
| -rw-r--r-- | nerine.cabal | 2 | ||||
| -rw-r--r-- | src/World/Lattice.hs (renamed from src/Lattice.hs) | 2 | ||||
| -rw-r--r-- | src/World/Types.hs | 2 | ||||
| -rw-r--r-- | test/LatticeTest.hs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nerine.cabal b/nerine.cabal index 903ef49..8f4f443 100644 --- a/nerine.cabal +++ b/nerine.cabal @@ -27,10 +27,10 @@ library exposed-modules: Agent Genome - Lattice Lib Mind Proposal + World.Lattice World.Types other-modules: Paths_nerine 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') diff --git a/test/LatticeTest.hs b/test/LatticeTest.hs index a7d67d8..403c650 100644 --- a/test/LatticeTest.hs +++ b/test/LatticeTest.hs @@ -2,7 +2,7 @@ module LatticeTest (suite) where import Test.Tasty import Test.Tasty.HUnit -import Lattice +import World.Lattice suite :: TestTree suite = testGroup "lattice tests" $ |