units-defs 2.0.1.1 → 2.1.0.1
raw patch · 24 files changed
+128/−65 lines, 24 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
+ Data.Units.Astronomical: AstronomicalUnit :: AstronomicalUnit
+ Data.Units.Astronomical: Day :: Day
+ Data.Units.Astronomical: EarthMass :: EarthMass
+ Data.Units.Astronomical: JovianMass :: JovianMass
+ Data.Units.Astronomical: JulianCentury :: JulianCentury
+ Data.Units.Astronomical: JulianYear :: JulianYear
+ Data.Units.Astronomical: LightYear :: LightYear
+ Data.Units.Astronomical: Parsec :: Parsec
+ Data.Units.Astronomical: SolarMass :: SolarMass
+ Data.Units.Astronomical: data AstronomicalUnit
+ Data.Units.Astronomical: data Day
+ Data.Units.Astronomical: data EarthMass
+ Data.Units.Astronomical: data JovianMass
+ Data.Units.Astronomical: data JulianCentury
+ Data.Units.Astronomical: data JulianYear
+ Data.Units.Astronomical: data LightYear
+ Data.Units.Astronomical: data Parsec
+ Data.Units.Astronomical: data SolarMass
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.AstronomicalUnit
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.Day
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.EarthMass
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.JovianMass
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.JulianCentury
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.JulianYear
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.LightYear
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.Parsec
+ Data.Units.Astronomical: instance Data.Metrology.Units.Unit Data.Units.Astronomical.SolarMass
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.AstronomicalUnit
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.Day
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.EarthMass
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.JovianMass
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.JulianCentury
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.JulianYear
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.LightYear
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.Parsec
+ Data.Units.Astronomical: instance GHC.Show.Show Data.Units.Astronomical.SolarMass
+ Data.Units.CGS: pattern Centimeter :: Centimeter
+ Data.Units.CGS: pattern Centimetre :: Centimetre
+ Data.Units.CGS: pattern Metre :: Metre
+ Data.Units.SI: pattern Gramme :: Gramme
+ Data.Units.SI: pattern Litre :: Litre
+ Data.Units.SI: pattern Metre :: Metre
+ Data.Units.SI: pattern Tonne :: Tonne
- Data.Constants.Mechanics: gravity_G :: forall lcsu_aICH n_aICI. (Fractional n_aICI, CompatibleUnit lcsu_aICH ((:*) ((:*) ((:^) Meter Three) ((:^) ((:@) Kilo Gram) MOne)) ((:^) Second MTwo))) => MkQu_ULN ((:*) ((:*) ((:^) Meter Three) ((:^) ((:@) Kilo Gram) MOne)) ((:^) Second MTwo)) lcsu_aICH n_aICI
+ Data.Constants.Mechanics: gravity_G :: forall lcsu_aPE8 n_aPE9. (Fractional n_aPE9, CompatibleUnit lcsu_aPE8 ((:*) ((:*) ((:^) Meter Three) ((:^) ((:@) Kilo Gram) MOne)) ((:^) Second MTwo))) => MkQu_ULN ((:*) ((:*) ((:^) Meter Three) ((:^) ((:@) Kilo Gram) MOne)) ((:^) Second MTwo)) lcsu_aPE8 n_aPE9
- Data.Constants.Mechanics: gravity_g :: forall lcsu_aIwa n_aIwb. (Fractional n_aIwb, CompatibleUnit lcsu_aIwa ((:/) Meter ((:^) Second Two))) => MkQu_ULN ((:/) Meter ((:^) Second Two)) lcsu_aIwa n_aIwb
+ Data.Constants.Mechanics: gravity_g :: forall lcsu_aPvC n_aPvD. (Fractional n_aPvD, CompatibleUnit lcsu_aPvC ((:/) Meter ((:^) Second Two))) => MkQu_ULN ((:/) Meter ((:^) Second Two)) lcsu_aPvC n_aPvD
Files
- CHANGES.md +15/−0
- Data/Constants/Math.hs +1/−1
- Data/Constants/Mechanics.hs +1/−1
- Data/Dimensions/SI.hs +1/−1
- Data/Metrology/SI.hs +1/−1
- Data/Metrology/SI/Mono.hs +1/−1
- Data/Metrology/SI/MonoTypes.hs +1/−1
- Data/Metrology/SI/Poly.hs +1/−1
- Data/Metrology/SI/PolyTypes.hs +38/−38
- Data/Units/Astronomical.hs +49/−0
- Data/Units/CGS.hs +1/−1
- Data/Units/PreciousMetals.hs +1/−1
- Data/Units/SI.hs +1/−1
- Data/Units/SI/Parser.hs +1/−1
- Data/Units/SI/Prefixes.hs +1/−1
- Data/Units/US.hs +2/−2
- Data/Units/US/Apothecaries.hs +1/−1
- Data/Units/US/Avoirdupois.hs +1/−1
- Data/Units/US/DryVolume.hs +1/−1
- Data/Units/US/Liquid.hs +1/−1
- Data/Units/US/Misc.hs +1/−3
- Data/Units/US/Survey.hs +1/−1
- Data/Units/US/Troy.hs +1/−1
- units-defs.cabal +5/−4
CHANGES.md view
@@ -1,3 +1,18 @@+Version 2.1.0.1+---------------++* Update .cabal file to export Data.Units.Astronomical.++Version 2.1+-----------++* Add support for Imperial and astronomical units, thanks to @Bebere.++Version 2.0.1.1+---------------++* Drop 7.8 support, fixing warnings on 8.0.+ Version 2.0.1 -------------
Data/Constants/Math.hs view
@@ -3,7 +3,7 @@ -- Module : Data.Constants.Math -- Copyright : (C) 2014 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Constants/Mechanics.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Constants.Mechanics -- Copyright : (C) 2014 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Dimensions/SI.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Dimensions.SI -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Metrology/SI.hs view
@@ -3,7 +3,7 @@ -- Module : Data.Metrology.SI -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Metrology/SI/Mono.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Metrology.SI.Mono -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Metrology/SI/MonoTypes.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Metrology.SI.MonoTypes -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Metrology/SI/Poly.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Metrology.SI.Poly -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Metrology/SI/PolyTypes.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Metrology.SI.PolyTypes -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --@@ -18,41 +18,41 @@ import Data.Metrology import qualified Data.Dimensions.SI as D -type Length = MkQu_DLN D.Length -type Mass = MkQu_DLN D.Mass -type Time = MkQu_DLN D.Time -type Current = MkQu_DLN D.Current -type Temperature = MkQu_DLN D.Temperature -type AmountOfSubstance = MkQu_DLN D.AmountOfSubstance -type LuminousIntensity = MkQu_DLN D.LuminousIntensity +type Length = MkQu_DLN D.Length+type Mass = MkQu_DLN D.Mass+type Time = MkQu_DLN D.Time+type Current = MkQu_DLN D.Current+type Temperature = MkQu_DLN D.Temperature+type AmountOfSubstance = MkQu_DLN D.AmountOfSubstance+type LuminousIntensity = MkQu_DLN D.LuminousIntensity -type Area = MkQu_DLN D.Area -type Volume = MkQu_DLN D.Volume -type Velocity = MkQu_DLN D.Velocity -type Acceleration = MkQu_DLN D.Acceleration -type Wavenumber = MkQu_DLN D.Wavenumber -type Density = MkQu_DLN D.Density -type SurfaceDensity = MkQu_DLN D.SurfaceDensity -type SpecificVolume = MkQu_DLN D.SpecificVolume -type CurrentDensity = MkQu_DLN D.CurrentDensity -type MagneticStrength = MkQu_DLN D.MagneticStrength -type Concentration = MkQu_DLN D.Concentration -type Luminance = MkQu_DLN D.Luminance -type Frequency = MkQu_DLN D.Frequency -type Force = MkQu_DLN D.Force -type Pressure = MkQu_DLN D.Pressure -type Energy = MkQu_DLN D.Energy -type Power = MkQu_DLN D.Power -type Charge = MkQu_DLN D.Charge -type ElectricPotential = MkQu_DLN D.ElectricPotential -type Capacitance = MkQu_DLN D.Capacitance -type Resistance = MkQu_DLN D.Resistance -type Conductance = MkQu_DLN D.Conductance -type MagneticFlux = MkQu_DLN D.MagneticFlux -type MagneticFluxDensity = MkQu_DLN D.MagneticFluxDensity -type Inductance = MkQu_DLN D.Inductance -type LuminousFlux = MkQu_DLN D.LuminousFlux -type Illuminance = MkQu_DLN D.Illuminance -type Kerma = MkQu_DLN D.Kerma -type CatalyticActivity = MkQu_DLN D.CatalyticActivity -type Momentum = MkQu_DLN D.Momentum +type Area = MkQu_DLN D.Area+type Volume = MkQu_DLN D.Volume+type Velocity = MkQu_DLN D.Velocity+type Acceleration = MkQu_DLN D.Acceleration+type Wavenumber = MkQu_DLN D.Wavenumber+type Density = MkQu_DLN D.Density+type SurfaceDensity = MkQu_DLN D.SurfaceDensity+type SpecificVolume = MkQu_DLN D.SpecificVolume+type CurrentDensity = MkQu_DLN D.CurrentDensity+type MagneticStrength = MkQu_DLN D.MagneticStrength+type Concentration = MkQu_DLN D.Concentration+type Luminance = MkQu_DLN D.Luminance+type Frequency = MkQu_DLN D.Frequency+type Force = MkQu_DLN D.Force+type Pressure = MkQu_DLN D.Pressure+type Energy = MkQu_DLN D.Energy+type Power = MkQu_DLN D.Power+type Charge = MkQu_DLN D.Charge+type ElectricPotential = MkQu_DLN D.ElectricPotential+type Capacitance = MkQu_DLN D.Capacitance+type Resistance = MkQu_DLN D.Resistance+type Conductance = MkQu_DLN D.Conductance+type MagneticFlux = MkQu_DLN D.MagneticFlux+type MagneticFluxDensity = MkQu_DLN D.MagneticFluxDensity+type Inductance = MkQu_DLN D.Inductance+type LuminousFlux = MkQu_DLN D.LuminousFlux+type Illuminance = MkQu_DLN D.Illuminance+type Kerma = MkQu_DLN D.Kerma+type CatalyticActivity = MkQu_DLN D.CatalyticActivity+type Momentum = MkQu_DLN D.Momentum
+ Data/Units/Astronomical.hs view
@@ -0,0 +1,49 @@+{-# LANGUAGE TemplateHaskell, TypeFamilies, TypeOperators #-}++-----------------------------------------------------------------------------+-- |+-- Module : Data.Units.Astronomical+-- Copyright : (C) 2013 Richard Eisenberg+-- License : BSD-style (see LICENSE)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu)+-- Stability : experimental+-- Portability : non-portable+--+-- The system of astronomical units, as defined by the International+-- Astronomical Union in 1976 and since then updated a few times.+--+-- The IAU documents used as reference are as follows:+-- <http://www.iau.org/static/resolutions/IAU1976_French.pdf>+-- <http://www.iau.org/static/resolutions/IAU1994_French.pdf>+-- <http://syrte.obspm.fr/IAU_resolutions/Res_IAU2012_B2.pdf>+-- <https://www.iau.org/publications/proceedings_rules/units/>+-----------------------------------------------------------------------------++module Data.Units.Astronomical (+ -- * Lengths+ AstronomicalUnit(..), LightYear(..), Parsec(..),++ -- * Time+ Day(..), JulianYear(..), JulianCentury(..),++ -- * Mass+ SolarMass(..), JovianMass(..), EarthMass(..)+ ) where++import Data.Constants.Math+import Data.Metrology.TH+import Data.Metrology+import Data.Units.SI+import Data.Units.SI.Prefixes++declareDerivedUnit "Day" [t| Second |] 86400 (Just "D")+declareDerivedUnit "JulianCentury" [t| Day |] 36525 (Just "julian century")+declareDerivedUnit "JulianYear" [t| JulianCentury |] 0.01 (Just "a")++declareDerivedUnit "AstronomicalUnit" [t| Metre |] 149597870700 (Just "au")+declareDerivedUnit "LightYear" [t| Metre |] 9460730472580800 (Just "ly")+declareDerivedUnit "Parsec" [t| AstronomicalUnit |] (648000 / piR) (Just "pc")++declareDerivedUnit "SolarMass" [t| Kilo :@ Gram |] (1.9891 * 10 ^ (30 :: Int)) (Just "S")+declareDerivedUnit "EarthMass" [t| SolarMass |] (1 / 332946.0487) (Just "E")+declareDerivedUnit "JovianMass" [t| SolarMass |] (1 / 1047.348644) (Just "MJ")
Data/Units/CGS.hs view
@@ -6,7 +6,7 @@ -- Module : Data.Units.CGS -- Copyright : (C) 2014 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/PreciousMetals.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Metrology.Units.PreciousMetals -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/SI.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.SI -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/SI/Parser.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.SI.Parser -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/SI/Prefixes.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.SI.Prefixes -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US.hs view
@@ -3,7 +3,7 @@ -- Module : Data.Units.US -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --@@ -33,7 +33,7 @@ -- * Velocity Knot(..),- + -- * Area Survey.Acre(..),
Data/Units/US/Apothecaries.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Apothecaries -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US/Avoirdupois.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Avoirdupois -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US/DryVolume.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.DryVolume -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US/Liquid.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Liquid -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US/Misc.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Misc -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --@@ -81,5 +81,3 @@ -- | Standard lengths: 'Foot', 'Inch', 'Yard', and 'Mile' lengths :: [Name] lengths = [ ''Foot, ''Inch, ''Yard, ''Mile ]--
Data/Units/US/Survey.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Survey -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
Data/Units/US/Troy.hs view
@@ -5,7 +5,7 @@ -- Module : Data.Units.US.Troy -- Copyright : (C) 2013 Richard Eisenberg -- License : BSD-style (see LICENSE)--- Maintainer : Richard Eisenberg (eir@cis.upenn.edu)+-- Maintainer : Richard Eisenberg (rae@cs.brynmawr.edu) -- Stability : experimental -- Portability : non-portable --
units-defs.cabal view
@@ -1,11 +1,11 @@ name: units-defs-version: 2.0.1.1+version: 2.1.0.1 cabal-version: >= 1.10 synopsis: Definitions for use with the units package homepage: http://github.com/goldfirere/units-defs category: Physics-author: Richard Eisenberg <eir@cis.upenn.edu>, Takayuki Muranushi <muranushi@gmail.com>-maintainer: Richard Eisenberg <eir@cis.upenn.edu>, Takayuki Muranushi <muranushi@gmail.com>+author: Richard Eisenberg <rae@cs.brynmawr.edu>, Takayuki Muranushi <muranushi@gmail.com>+maintainer: Richard Eisenberg <rae@cs.brynmawr.edu>, Takayuki Muranushi <muranushi@gmail.com> bug-reports: https://github.com/goldfirere/units-defs/issues stability: experimental extra-source-files: README.md, CHANGES.md@@ -22,7 +22,7 @@ source-repository this type: git location: https://github.com/goldfirere/units-defs.git- tag: v2.0.1.1+ tag: v2.1.0.1 library build-depends: @@ -51,6 +51,7 @@ Data.Units.US.Survey Data.Units.US.Troy Data.Units.PreciousMetals+ Data.Units.Astronomical default-language: Haskell2010 other-extensions: TemplateHaskell