Restructure src directory

apps/ExperimentMain.hs

@@ -3,10 +3,10 @@ module Main where
 
 import           Options.Applicative
 
-import qualified Hopfield.Experiment
-import qualified Hopfield.SmallExperiments
-import qualified Hopfield.ClusterExperiments
-import qualified Hopfield.Experiment2SuperAttractors
+import qualified Hopfield.Experiments.Experiment
+import qualified Hopfield.Experiments.SmallExperiments
+import qualified Hopfield.Experiments.ClusterExperiments
+import qualified Hopfield.Experiments.Experiment2SuperAttractors
 
 
 data ExperimentArgs = ExperimentArgs { experimentName :: String
@@ -27,8 +27,8 @@ main = do
   ExperimentArgs expName args <- execParser argParser
 
   case expName of
-    "experiment" -> Hopfield.Experiment.main
-    "small"      -> Hopfield.SmallExperiments.main
-    "cluster"    -> Hopfield.ClusterExperiments.run args
-    "super"      -> Hopfield.Experiment2SuperAttractors.main
+    "experiment" -> Hopfield.Experiments.Experiment.main
+    "small"      -> Hopfield.Experiments.SmallExperiments.main
+    "cluster"    -> Hopfield.Experiments.ClusterExperiments.run args
+    "super"      -> Hopfield.Experiments.Experiment2SuperAttractors.main
     _            -> error "unknown experiment"

apps/Recognize.hs

@@ -12,9 +12,9 @@ import           System.Directory
 
 import Hopfield.Common
 import Hopfield.Hopfield
-import Hopfield.ConvertImage
-import Hopfield.RestrictedBoltzmannMachine
-import Hopfield.ClassificationBoltzmannMachine
+import Hopfield.Images.ConvertImage
+import Hopfield.Boltzmann.RestrictedBoltzmannMachine
+import Hopfield.Boltzmann.ClassificationBoltzmannMachine
 import Hopfield.Benchmark
 import Hopfield.Util
 

hopfield.cabal

@@ -15,21 +15,21 @@ library
   exposed-modules:
       Hopfield.Hopfield
     , Hopfield.Analysis
-    , Hopfield.Measurement
-    , Hopfield.ClassificationBoltzmannMachine
+    , Hopfield.Benchmark
+    , Hopfield.Boltzmann.ClassificationBoltzmannMachine
+    , Hopfield.Boltzmann.RestrictedBoltzmannMachine
     , Hopfield.Clusters
     , Hopfield.Common
-    , Hopfield.ConvertImage
-    , Hopfield.RestrictedBoltzmannMachine
+    , Hopfield.Experiments.ClusterExperiments
+    , Hopfield.Experiments.Experiment
+    , Hopfield.Experiments.Experiment2SuperAttractors
+    , Hopfield.Experiments.ExperimentUtil
+    , Hopfield.Experiments.SmallExperiments
+    , Hopfield.Images.ConvertImage
+    , Hopfield.Measurement
     , Hopfield.SuperAttractors
-    , Hopfield.Util
-    , Hopfield.Experiment
     , Hopfield.TestUtil
-    , Hopfield.ExperimentUtil
-    , Hopfield.Benchmark
-    , Hopfield.SmallExperiments
-    , Hopfield.ClusterExperiments
-    , Hopfield.Experiment2SuperAttractors
+    , Hopfield.Util
   other-modules:
   hs-source-dirs:
     src
@@ -52,7 +52,7 @@ library
     , monad-loops >= 0.3.3.0
     , split >= 0.2.1.1
   c-sources:
-      src/Hopfield/convertImage.c
+      src/Hopfield/Images/convertImage.c
   include-dirs:
       src/Hopfield
     , /usr/include/ImageMagick

src/Hopfield/Benchmark.hs

@@ -3,7 +3,7 @@ module Hopfield.Benchmark where
 
 import Hopfield.Hopfield
 import Hopfield.Clusters
-import Hopfield.ClusterExperiments
+import Hopfield.Experiments.ClusterExperiments
 
 bench1 :: IO ()
 bench1 = print =<< experimentUsingT1NoAvg Hebbian 10 10

src/Hopfield/ClassificationBoltzmannMachine.hs → src/Hopfield/Boltzmann/ClassificationBoltzmannMachine.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE PatternGuards, ScopedTypeVariables #-}
 
-module Hopfield.ClassificationBoltzmannMachine where
+module Hopfield.Boltzmann.ClassificationBoltzmannMachine where
 -- | Base Restricted Boltzmann machine.
 
 -- http://en.wikipedia.org/wiki/Restricted_Boltzmann_machine

src/Hopfield/RestrictedBoltzmannMachine.hs → src/Hopfield/Boltzmann/RestrictedBoltzmannMachine.hs

@@ -2,7 +2,7 @@
 
 -- | Base Restricted Boltzmann machine.
 -- http://en.wikipedia.org/wiki/Restricted_Boltzmann_machine
-module Hopfield.RestrictedBoltzmannMachine where
+module Hopfield.Boltzmann.RestrictedBoltzmannMachine where
 
 
 import           Data.Maybe

src/Hopfield/ClusterExperiments.hs → src/Hopfield/Experiments/ClusterExperiments.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ParallelListComp #-}
 
-module Hopfield.ClusterExperiments where
+module Hopfield.Experiments.ClusterExperiments where
 -- Cluster Experiments which were performed by Federico
 
 import Control.Monad

src/Hopfield/Experiment.hs → src/Hopfield/Experiments/Experiment.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ParallelListComp #-}
 
-module Hopfield.Experiment where
+module Hopfield.Experiments.Experiment where
 
 import Control.Monad (replicateM)
 import Control.Monad.Random
@@ -9,7 +9,7 @@ import Test.QuickCheck.Gen (unGen)
 
 import Hopfield.Clusters
 import Hopfield.Common
-import Hopfield.ExperimentUtil
+import Hopfield.Experiments.ExperimentUtil
 import Hopfield.Hopfield
 import Hopfield.Measurement
 import Hopfield.SuperAttractors

src/Hopfield/Experiment2SuperAttractors.hs → src/Hopfield/Experiments/Experiment2SuperAttractors.hs

@@ -1,15 +1,15 @@
 {-# LANGUAGE ParallelListComp #-}
 
 -- | Performs experiments with two super attractors.
-module Hopfield.Experiment2SuperAttractors where
+module Hopfield.Experiments.Experiment2SuperAttractors where
 
 import Control.Monad (replicateM)
 import Control.Monad.Random
 import Test.QuickCheck
 import Test.QuickCheck.Gen (unGen)
 
 import Hopfield.Common
-import Hopfield.ExperimentUtil
+import Hopfield.Experiments.ExperimentUtil
 import Hopfield.Hopfield (LearningType (..))
 import Hopfield.Measurement
 import Hopfield.SuperAttractors

src/Hopfield/ExperimentUtil.hs → src/Hopfield/Experiments/ExperimentUtil.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ParallelListComp #-}
 
-module Hopfield.ExperimentUtil where
+module Hopfield.Experiments.ExperimentUtil where
 
 import qualified Data.Vector as V
 

src/Hopfield/SmallExperiments.hs → src/Hopfield/Experiments/SmallExperiments.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE ParallelListComp #-}
 
-module Hopfield.SmallExperiments where
+module Hopfield.Experiments.SmallExperiments where
 
 -- Module use to perform small experiments that prove that Storkey learning
 -- has a bigger basin size than Hebbian learning

src/Hopfield/ConvertImage.hsc → src/Hopfield/Images/ConvertImage.hsc

@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
 
-module Hopfield.ConvertImage (
+module Hopfield.Images.ConvertImage (
   loadPicture
 , CBinaryPattern (..)
 ) where
@@ -11,7 +11,7 @@ import Foreign.Ptr
 import Foreign.Storable
 import Foreign.Marshal.Array
 
-#include "convertImage.h"
+#include "Images/convertImage.h"
 
 -- From: http://www.haskell.org/haskellwiki/FFI_cook_book
 #let alignment t = "%lu", (unsigned long) offsetof(struct { char x__; t (y__); }, y__)

src/Hopfield/TestUtil.hs

@@ -16,7 +16,7 @@ import           Test.QuickCheck
 
 import           Hopfield.Hopfield
 import           Hopfield.Measurement
-import           Hopfield.RestrictedBoltzmannMachine
+import           Hopfield.Boltzmann.RestrictedBoltzmannMachine
 import           Hopfield.Util