upd changelog

datasets/changelog.md

@@ -1,49 +1,55 @@
+0.3
+	* 'datasets' hosted within the DataHaskell/dh-core project
+
+	* Mushroom and Titanic datasets
+
+
 0.2.5
 
-* Old faithful matches R dataset
+	* Old Faithful matches R dataset
 
 0.2.4
 
-* Netflix dataset
+	* Netflix dataset
 
-0.2.3
+0.2.3	
 
-* Coal dataset
+	* Coal dataset
 
-* New internal API
+	* New internal API
 
-* Ord instance for IrisClass
+	* Ord instance for IrisClass
 
 0.2.2
 
-* Enum, bounded instances for IrisClass
+	* Enum, bounded instances for IrisClass
 
-* Gapminder dataset
+	* Gapminder dataset
 
-* Use wreq for HTTP and HTTPS requests
+	* Use wreq for HTTP and HTTPS requests
 
 0.2.1
 
-* Wine quality datasets
+	* Wine quality datasets
 
-* Vocabulary, UN, States datasets
+	* Vocabulary, UN, States datasets
 
-* CO2, Sunspots and Quakes datasets
+	* CO2, Sunspots and Quakes datasets
 
 0.2.0.3
 
-* Further GHC portability
+	* Further GHC portability
 
 0.2.0.2
 
-* Improve GHC portability
+	* Improve GHC portability
 
 0.2.0.1
 
-* Bugfix: include embedded data files in cabal extra-source-files
+	* Bugfix: include embedded data files in cabal extra-source-files
 
 0.2
 
-* iris dataset is a pure value (with file-embed)
+	* iris dataset is a pure value (with file-embed)
 
-* Michelson, Nightingale and BostonHousing datasets
+	* Michelson, Nightingale and BostonHousing datasets

datasets/datasets.cabal

@@ -81,9 +81,9 @@ Library
                  , Numeric.Datasets.WineQuality
                  , Numeric.Datasets.Netflix
    Build-depends:
-                   base                    >= 4.6 && < 5
+                   base          >= 4.6 && < 5
                  , aeson
-                 , attoparsec >= 0.13
+                 , attoparsec    >= 0.13
                  , bytestring
                  , cassava
                  , directory

datasets/src/Numeric/Datasets.hs

@@ -124,7 +124,7 @@ jsonDataset :: FromJSON a => Source -> Dataset a
 jsonDataset src = Dataset src Nothing Nothing JSON
 
 -- | Get a ByteString from the specified Source
-getFileFromSource :: FilePath -> Source -> IO (BL.ByteString)
+getFileFromSource :: FilePath -> Source -> IO BL.ByteString
 getFileFromSource cacheDir (URL url) = do
   createDirectoryIfMissing True cacheDir
   let fnm = cacheDir </> "ds" <> show (hash url)

datasets/src/Numeric/Datasets/Mushroom.hs

@@ -44,13 +44,14 @@ p,x,s,n,t,p,f,c,n,k,e,e,s,s,w,w,p,w,o,p,k,s,u
 e,x,s,y,t,a,f,c,b,k,e,c,s,s,w,w,p,w,o,p,n,n,g
 -}
 module Numeric.Datasets.Mushroom (
-    MushroomEntry(..)
+    mushroomDatabase
+  , MushroomEntry(..)
   , CapShape(..), CapSurface(..), CapColor(..), Odor(..)
   , GillAttachment(..), GillSpacing(..), GillSize(..), GillColor(..), StalkShape(..)
   , StalkRoot(..), StalkSurfaceAboveRing(..), StalkSurfaceBelowRing(..)
   , StalkColorAboveRing(..), StalkColorBelowRing(..), VeilType(..), VeilColor(..)
   , RingNumber(..), RingType(..), SporePrintColor(..), Population(..), Habitat(..) 
-  , mushroomDatabase) where
+  ) where
 
 import Numeric.Datasets