diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -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 ------------- diff --git a/Data/Constants/Math.hs b/Data/Constants/Math.hs --- a/Data/Constants/Math.hs +++ b/Data/Constants/Math.hs @@ -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 -- diff --git a/Data/Constants/Mechanics.hs b/Data/Constants/Mechanics.hs --- a/Data/Constants/Mechanics.hs +++ b/Data/Constants/Mechanics.hs @@ -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 -- diff --git a/Data/Dimensions/SI.hs b/Data/Dimensions/SI.hs --- a/Data/Dimensions/SI.hs +++ b/Data/Dimensions/SI.hs @@ -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 -- diff --git a/Data/Metrology/SI.hs b/Data/Metrology/SI.hs --- a/Data/Metrology/SI.hs +++ b/Data/Metrology/SI.hs @@ -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 -- diff --git a/Data/Metrology/SI/Mono.hs b/Data/Metrology/SI/Mono.hs --- a/Data/Metrology/SI/Mono.hs +++ b/Data/Metrology/SI/Mono.hs @@ -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 -- diff --git a/Data/Metrology/SI/MonoTypes.hs b/Data/Metrology/SI/MonoTypes.hs --- a/Data/Metrology/SI/MonoTypes.hs +++ b/Data/Metrology/SI/MonoTypes.hs @@ -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 -- diff --git a/Data/Metrology/SI/Poly.hs b/Data/Metrology/SI/Poly.hs --- a/Data/Metrology/SI/Poly.hs +++ b/Data/Metrology/SI/Poly.hs @@ -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 -- diff --git a/Data/Metrology/SI/PolyTypes.hs b/Data/Metrology/SI/PolyTypes.hs --- a/Data/Metrology/SI/PolyTypes.hs +++ b/Data/Metrology/SI/PolyTypes.hs @@ -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 diff --git a/Data/Units/Astronomical.hs b/Data/Units/Astronomical.hs new file mode 100644 --- /dev/null +++ b/Data/Units/Astronomical.hs @@ -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: +-- +-- +-- +-- +----------------------------------------------------------------------------- + +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") diff --git a/Data/Units/CGS.hs b/Data/Units/CGS.hs --- a/Data/Units/CGS.hs +++ b/Data/Units/CGS.hs @@ -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 -- diff --git a/Data/Units/PreciousMetals.hs b/Data/Units/PreciousMetals.hs --- a/Data/Units/PreciousMetals.hs +++ b/Data/Units/PreciousMetals.hs @@ -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 -- diff --git a/Data/Units/SI.hs b/Data/Units/SI.hs --- a/Data/Units/SI.hs +++ b/Data/Units/SI.hs @@ -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 -- diff --git a/Data/Units/SI/Parser.hs b/Data/Units/SI/Parser.hs --- a/Data/Units/SI/Parser.hs +++ b/Data/Units/SI/Parser.hs @@ -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 -- diff --git a/Data/Units/SI/Prefixes.hs b/Data/Units/SI/Prefixes.hs --- a/Data/Units/SI/Prefixes.hs +++ b/Data/Units/SI/Prefixes.hs @@ -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 -- diff --git a/Data/Units/US.hs b/Data/Units/US.hs --- a/Data/Units/US.hs +++ b/Data/Units/US.hs @@ -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(..), diff --git a/Data/Units/US/Apothecaries.hs b/Data/Units/US/Apothecaries.hs --- a/Data/Units/US/Apothecaries.hs +++ b/Data/Units/US/Apothecaries.hs @@ -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 -- diff --git a/Data/Units/US/Avoirdupois.hs b/Data/Units/US/Avoirdupois.hs --- a/Data/Units/US/Avoirdupois.hs +++ b/Data/Units/US/Avoirdupois.hs @@ -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 -- diff --git a/Data/Units/US/DryVolume.hs b/Data/Units/US/DryVolume.hs --- a/Data/Units/US/DryVolume.hs +++ b/Data/Units/US/DryVolume.hs @@ -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 -- diff --git a/Data/Units/US/Liquid.hs b/Data/Units/US/Liquid.hs --- a/Data/Units/US/Liquid.hs +++ b/Data/Units/US/Liquid.hs @@ -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 -- diff --git a/Data/Units/US/Misc.hs b/Data/Units/US/Misc.hs --- a/Data/Units/US/Misc.hs +++ b/Data/Units/US/Misc.hs @@ -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 ] - - diff --git a/Data/Units/US/Survey.hs b/Data/Units/US/Survey.hs --- a/Data/Units/US/Survey.hs +++ b/Data/Units/US/Survey.hs @@ -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 -- diff --git a/Data/Units/US/Troy.hs b/Data/Units/US/Troy.hs --- a/Data/Units/US/Troy.hs +++ b/Data/Units/US/Troy.hs @@ -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 -- diff --git a/units-defs.cabal b/units-defs.cabal --- a/units-defs.cabal +++ b/units-defs.cabal @@ -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 , Takayuki Muranushi -maintainer: Richard Eisenberg , Takayuki Muranushi +author: Richard Eisenberg , Takayuki Muranushi +maintainer: Richard Eisenberg , Takayuki Muranushi 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