From c7c28fa6bf1596407248b32c5a60533a2156e760 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Fri, 10 May 2024 14:35:37 +0200 Subject: [PATCH] [binoculars-ng] removed Arbitrary instances --- binoculars-ng/Makefile.am | 2 -- binoculars-ng/src/Hkl/Binoculars/Config/Sample.hs | 8 ----- .../src/Hkl/Binoculars/Projections/Hkl.hs | 4 --- .../src/Hkl/Binoculars/Projections/QCustom.hs | 8 ----- .../src/Hkl/Binoculars/Projections/Test.hs | 4 --- binoculars-ng/src/Hkl/DataSource.hs | 37 ---------------------- 6 files changed, 63 deletions(-) diff --git a/binoculars-ng/Makefile.am b/binoculars-ng/Makefile.am index e9b836b6..73aa32e1 100644 --- a/binoculars-ng/Makefile.am +++ b/binoculars-ng/Makefile.am @@ -122,8 +122,6 @@ binoculars_ng_GHCFLAGS=\ -package path-io \ -package pipes \ -package pipes-safe \ - -package QuickCheck \ - -package quickcheck-text \ -package terminal-progress-bar \ -package text \ -package transformers \ diff --git a/binoculars-ng/src/Hkl/Binoculars/Config/Sample.hs b/binoculars-ng/src/Hkl/Binoculars/Config/Sample.hs index ce886c27..95d7fe77 100644 --- a/binoculars-ng/src/Hkl/Binoculars/Config/Sample.hs +++ b/binoculars-ng/src/Hkl/Binoculars/Config/Sample.hs @@ -36,8 +36,6 @@ import Data.HashMap.Lazy (fromList) import Data.Ini (Ini (..)) import Data.Text (Text) import GHC.Generics (Generic) -import Generic.Random (genericArbitraryU) -import Test.QuickCheck (Arbitrary (..)) import Hkl.Binoculars.Config import Hkl.Binoculars.Config.Common @@ -110,9 +108,6 @@ instance Is0DStreamable (DataSourceAcq Sample) Sample where <$> extract0DStreamValue uz <*> pure (Range 0 0)) -instance Arbitrary (DataSourcePath Sample) where - arbitrary = DataSourcePath'Sample <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary - default'DataSourcePath'Sample :: DataSourcePath Sample default'DataSourcePath'Sample = DataSourcePath'Sample (DataSourcePath'Double(hdf5p $ grouppat 0 $ datasetp "SIXS/I14-C-CX2__EX__DIFF-UHV__#1/A")) @@ -230,9 +225,6 @@ default'BinocularsConfig'Sample , binocularsConfig'Sample'Uz = Nothing } -instance Arbitrary BinocularsConfig'Sample where - arbitrary = genericArbitraryU - instance ToIni BinocularsConfig'Sample where toIni c = Ini { iniSections = fromList [ ("input", elemFMbDef "a" binocularsConfig'Sample'A c default'BinocularsConfig'Sample [ "`a` parameter of the sample lattice (same unit than the wavelength)." diff --git a/binoculars-ng/src/Hkl/Binoculars/Projections/Hkl.hs b/binoculars-ng/src/Hkl/Binoculars/Projections/Hkl.hs index 2386ced6..89b7b78d 100644 --- a/binoculars-ng/src/Hkl/Binoculars/Projections/Hkl.hs +++ b/binoculars-ng/src/Hkl/Binoculars/Projections/Hkl.hs @@ -57,7 +57,6 @@ import Pipes (await, each, runEffect, (>->)) import Pipes.Prelude (filter, map, tee, toListM) import Pipes.Safe (runSafeP, runSafeT) -import Test.QuickCheck (Arbitrary (..)) import Text.Printf (printf) import Hkl.Binoculars.Common @@ -94,9 +93,6 @@ deriving instance Show (DataFrameHkl' DataSourcePath) instance FromJSON (DataFrameHkl' DataSourcePath) instance ToJSON (DataFrameHkl' DataSourcePath) -instance Arbitrary (DataFrameHkl' DataSourcePath) where - arbitrary = DataFrameHkl <$> arbitrary <*> arbitrary - defaultDataSourcePath'DataFrameHkl :: DataFrameHkl' DataSourcePath defaultDataSourcePath'DataFrameHkl = DataFrameHkl default'DataSourcePath'DataFrameQCustom diff --git a/binoculars-ng/src/Hkl/Binoculars/Projections/QCustom.hs b/binoculars-ng/src/Hkl/Binoculars/Projections/QCustom.hs index ecafc89c..d1ffce5c 100644 --- a/binoculars-ng/src/Hkl/Binoculars/Projections/QCustom.hs +++ b/binoculars-ng/src/Hkl/Binoculars/Projections/QCustom.hs @@ -59,7 +59,6 @@ import Data.Vector.Storable.Mutable (unsafeWith) import Foreign.C.Types (CDouble (..)) import Foreign.ForeignPtr (ForeignPtr, withForeignPtr) import GHC.Generics (Generic) -import Generic.Random (genericArbitraryU) import Numeric.Units.Dimensional.Prelude (Angle, degree, radian, (*~), (/~)) import Path (Abs, Dir, Path) @@ -67,7 +66,6 @@ import Pipes (await, each, runEffect, yield, (>->)) import Pipes.Prelude (filter, map, tee, toListM) import Pipes.Safe (runSafeT) -import Test.QuickCheck (Arbitrary (..)) import Text.Printf (printf) import Hkl.Binoculars.Common @@ -132,9 +130,6 @@ instance Is1DStreamable (DataSourceAcq DataFrameQCustom) DataFrameQCustom where <*> extract1DStreamValue img i <*> extract1DStreamValue idx i -instance Arbitrary (DataSourcePath DataFrameQCustom) where - arbitrary = DataSourcePath'DataFrameQCustom <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary - default'DataSourcePath'DataFrameQCustom :: DataSourcePath DataFrameQCustom default'DataSourcePath'DataFrameQCustom = DataSourcePath'DataFrameQCustom @@ -187,9 +182,6 @@ data instance Config 'QCustomProjection , binocularsConfig'QCustom'SampleAxis :: Maybe SampleAxis } deriving (Show, Generic) -instance Arbitrary (Config 'QCustomProjection) where - arbitrary = genericArbitraryU - newtype instance Args 'QCustomProjection = Args'QCustomProjection (Maybe ConfigRange) default'BinocularsConfig'QCustom :: Config 'QCustomProjection diff --git a/binoculars-ng/src/Hkl/Binoculars/Projections/Test.hs b/binoculars-ng/src/Hkl/Binoculars/Projections/Test.hs index 27b65291..b5270d5f 100644 --- a/binoculars-ng/src/Hkl/Binoculars/Projections/Test.hs +++ b/binoculars-ng/src/Hkl/Binoculars/Projections/Test.hs @@ -54,7 +54,6 @@ import Pipes (await, each, runEffect, (>->)) import Pipes.Prelude (filter, map, tee, toListM) import Pipes.Safe (runSafeP, runSafeT) -import Test.QuickCheck (Arbitrary (..)) import Text.Printf (printf) import Hkl.Binoculars.Common @@ -91,9 +90,6 @@ deriving instance Show (DataFrameTest' DataSourcePath) instance FromJSON (DataFrameTest' DataSourcePath) instance ToJSON (DataFrameTest' DataSourcePath) -instance Arbitrary (DataFrameTest' DataSourcePath) where - arbitrary = DataFrameTest <$> arbitrary <*> arbitrary - defaultDataSourcePath'DataFrameTest :: DataFrameTest' DataSourcePath defaultDataSourcePath'DataFrameTest = DataFrameTest default'DataSourcePath'DataFrameQCustom diff --git a/binoculars-ng/src/Hkl/DataSource.hs b/binoculars-ng/src/Hkl/DataSource.hs index 6d7ec02c..f1a2faff 100644 --- a/binoculars-ng/src/Hkl/DataSource.hs +++ b/binoculars-ng/src/Hkl/DataSource.hs @@ -53,7 +53,6 @@ import GHC.Float (float2Double) import GHC.Generics (Generic) import Numeric.Units.Dimensional.Prelude (degree, (*~), (/~)) import Pipes.Safe (MonadSafe, catch, throwM) -import Test.QuickCheck (Arbitrary (..), oneof) import Prelude hiding (filter) @@ -228,14 +227,6 @@ instance DataSource Attenuation where withDataSourceP f (DataSourcePath'ApplyedAttenuationFactor p) g = withDataSourceP f p $ \ds -> g (DataSourceAcq'ApplyedAttenuationFactor ds) withDataSourceP _ DataSourcePath'NoAttenuation g = g DataSourceAcq'NoAttenuation -instance Arbitrary (DataSourcePath Attenuation) where - arbitrary = oneof - [ DataSourcePath'Attenuation <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary - , DataSourcePath'ApplyedAttenuationFactor <$> arbitrary - , pure DataSourcePath'NoAttenuation - ] - - -- Degree instance DataSource Degree where @@ -251,12 +242,6 @@ instance DataSource Degree where withDataSourceP f (DataSourcePath'Degree p) g = withHdf5PathP f p $ \ds -> g (DataSourceAcq'Degree ds) withDataSourceP _ (DataSourcePath'Degree'Const d) g = g (DataSourceAcq'Degree'Const d) -instance Arbitrary (DataSourcePath Degree) where - arbitrary = oneof - [ DataSourcePath'Degree <$> arbitrary - , DataSourcePath'Degree'Const <$> arbitrary - ] - -- Double instance DataSource Double where @@ -287,13 +272,6 @@ instance DataSource Double where Just v -> g (DataSourceAcq'Double'Const v)) withDataSourceP f (DataSourcePath'Double'Or l r) g = withDataSourcePOr f l r g -instance Arbitrary (DataSourcePath Double) where - arbitrary = oneof - [ DataSourcePath'Double <$> arbitrary - , DataSourcePath'Double'Const <$> arbitrary - ] - - -- Float instance DataSource Float where @@ -306,10 +284,6 @@ instance DataSource Float where withDataSourceP f (DataSourcePath'Float p) g = withHdf5PathP f p $ \ds -> g (DataSourceAcq'Float ds) -instance Arbitrary (DataSourcePath Float) where - arbitrary = DataSourcePath'Float <$> arbitrary - - -- Geometry nest :: [(r -> a) -> a] -> ([r] -> a) -> a @@ -349,11 +323,6 @@ instance DataSource Geometry where fptr <- liftIO $ newGeometry fixed gg (DataSourceAcq'Geometry fptr w' []) -instance Arbitrary (DataSourcePath Geometry) where - arbitrary = oneof - -- TODO add the Geometry constructor - [ DataSourcePath'Geometry'Fix <$> arbitrary] - -- Image condM :: (Monad m) => [(m Bool, m a)] -> m a @@ -384,9 +353,6 @@ instance DataSource Image where g (DataSourceAcq'Image'Word32 ds det arr)) ] -instance Arbitrary (DataSourcePath Image) where - arbitrary = DataSourcePath'Image <$> arbitrary <*> arbitrary - -- Int instance DataSource Int where @@ -412,6 +378,3 @@ instance DataSource Timestamp where withDataSourceP f (DataSourcePath'Timestamp p) g = withHdf5PathP f p $ \ds -> g (DataSourceAcq'Timestamp ds) withDataSourceP _ DataSourcePath'Timestamp'NoTimestamp g = g DataSourceAcq'Timestamp'NoTimestamp - -instance Arbitrary (DataSourcePath Timestamp) where - arbitrary = DataSourcePath'Timestamp <$> arbitrary -- 2.11.4.GIT