fishfood 0.0.1.10 → 0.0.1.11

raw patch · 7 files changed

+37/−18 lines, 7 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• changelog.markdown +4/−0
• debian/DEBIAN/control +1/−1
• fishfood.cabal +1/−1
• fishfood.spec +1/−1
• src-lib/FishFood/Data/CommandOptions.hs +7/−7
• src-lib/FishFood/Data/Verbosity.hs +21/−5
• src-test/FishFood/Test/QuickCheck/Data/Verbosity.hs +2/−3

@@ -61,3 +61,7 @@  ## 0.0.1.10 Updated list of test-compilers.++## 0.0.1.11+Replaced module **Distribution.Verbosity** with **FishFood.Data.Verbosity**.+

@@ -1,5 +1,5 @@ Package:	fishfood-Version:	0.0.1.10-1+Version:	0.0.1.11-1 Section:	utils Priority:	optional Architecture:	amd64

@@ -14,7 +14,7 @@ -- along with FishFood.  If not, see <http://www.gnu.org/licenses/>.  Name:		fishfood-Version:	0.0.1.10+Version:	0.0.1.11 Cabal-version:	>= 1.10 Copyright:	(C) 2013-2015 Dr. Alistair Ward License:	GPL

@@ -21,7 +21,7 @@  Summary:	Calculates file-size frequency-distribution. Name:		fishfood-Version:	0.0.1.10+Version:	0.0.1.11 Release:	1 License:	GPLv3 # From '/usr/share/doc/packages/rpm/GROUPS'.

@@ -48,8 +48,8 @@  import qualified	Data.Default import qualified	Data.Maybe-import qualified	Distribution.Verbosity import qualified	FishFood.Data.File	as Data.File+import qualified	FishFood.Data.Verbosity	as Data.Verbosity import qualified	ToolShed.SelfValidate  -- | Either an arithmetic size-increase for which there's a default, or a geometric size-ratio.@@ -57,10 +57,10 @@  -- | Declares a record to contain command-line options. data CommandOptions ratio	= MkCommandOptions {-	getBinSizeDelta				:: BinSizeDelta ratio,			-- ^ Either the arithmetic size-increase (defaulting to one standard-deviation), or the geometric size-ratio, of the sequence of bins into which files are categorized.-	getDeriveProbabilityMassFunction	:: Bool,				-- ^ Whether to derive the "Probability mass function" rather than the "Frequency-distribution".-	getNDecimalDigits			:: Int,					-- ^ The precision to which fractional data is displayed.-	getVerbosity				:: Distribution.Verbosity.Verbosity	-- ^ The threshold for ancillary information-output.+	getBinSizeDelta				:: BinSizeDelta ratio,		-- ^ Either the arithmetic size-increase (defaulting to one standard-deviation), or the geometric size-ratio, of the sequence of bins into which files are categorized.+	getDeriveProbabilityMassFunction	:: Bool,			-- ^ Whether to derive the "Probability mass function" rather than the "Frequency-distribution".+	getNDecimalDigits			:: Int,				-- ^ The precision to which fractional data is displayed.+	getVerbosity				:: Data.Verbosity.Verbosity	-- ^ The threshold for ancillary information-output. } deriving Show  instance Data.Default.Default (CommandOptions ratio)	where@@ -68,7 +68,7 @@ 		getBinSizeDelta				= Left Nothing,	-- Interpreted as one standard-deviation. 		getDeriveProbabilityMassFunction	= False, 		getNDecimalDigits			= 3,-		getVerbosity				= Distribution.Verbosity.normal+		getVerbosity				= Data.Default.def 	}  instance (Num ratio, Ord ratio, Show ratio) => ToolShed.SelfValidate.SelfValidator (CommandOptions ratio)	where@@ -97,7 +97,7 @@ 	 ]  -- | Smart constructor.-mkCommandOptions :: (Num ratio, Ord ratio, Show ratio) => BinSizeDelta ratio -> Bool -> Int -> Distribution.Verbosity.Verbosity -> CommandOptions ratio+mkCommandOptions :: (Num ratio, Ord ratio, Show ratio) => BinSizeDelta ratio -> Bool -> Int -> Data.Verbosity.Verbosity -> CommandOptions ratio mkCommandOptions binSizeDelta deriveProbabilityMassFunction nDecimalDigits verbosity 	| ToolShed.SelfValidate.isValid commandOptions	= commandOptions 	| otherwise					= error $ "FishFood.Data.CommandOptions.mkCommandOptions:\t" ++ ToolShed.SelfValidate.getFirstError commandOptions

@@ -18,20 +18,36 @@ {- |  [@AUTHOR@]	Dr. Alistair Ward - [@DESCRIPTION@]	Instance-definitions for 'Distribution.Verbosity.Verbosity'.+ [@DESCRIPTION@]+	The levels of program-output.+	N.B.: the data-type is coincidentally similar to 'Distribution.Verbosity.Internal.VerbosityLevel'. -}  module FishFood.Data.Verbosity(+-- * Types+-- ** Data-types+	Verbosity(), -- * Constants 	range ) where  import qualified	Data.Default-import qualified	Distribution.Verbosity -instance Data.Default.Default Distribution.Verbosity.Verbosity	where-	def	= Distribution.Verbosity.normal+-- | Define the levels of program-output.+data Verbosity+	= Silent+	| Normal+	| Verbose+	| Deafening+	deriving (Enum, Eq, Ord, Read, Show) +instance Data.Default.Default Verbosity	where+	def	= Normal++instance Bounded Verbosity where+	minBound	= Silent+	maxBound	= Deafening+ -- | The constant complete range of values.-range :: [Distribution.Verbosity.Verbosity]+range :: [Verbosity] range	= [minBound .. maxBound]

@@ -18,14 +18,13 @@ {- |  [@AUTHOR@]	Dr. Alistair Ward - [@DESCRIPTION@]	Implements 'Test.QuickCheck.Arbitrary' for 'Distribution.Verbosity.Verbosity'.+ [@DESCRIPTION@]	Implements 'Test.QuickCheck.Arbitrary'. -}  module FishFood.Test.QuickCheck.Data.Verbosity() where -import qualified	Distribution.Verbosity import qualified	FishFood.Data.Verbosity	as Data.Verbosity import qualified	Test.QuickCheck -instance Test.QuickCheck.Arbitrary Distribution.Verbosity.Verbosity	where+instance Test.QuickCheck.Arbitrary Data.Verbosity.Verbosity	where 	arbitrary	= Test.QuickCheck.elements Data.Verbosity.range