diff options
| author | Martin Thoma <info@martin-thoma.de> | 2015-04-04 09:48:39 +0200 |
|---|---|---|
| committer | Martin Thoma <info@martin-thoma.de> | 2015-04-04 09:48:39 +0200 |
| commit | f4ed37f39c8d5539d8bb5f8281c853d91e80886b (patch) | |
| tree | a9aa7e59c94d2394a10603f906432a149986ce4f /docs/nonmult.rst | |
| parent | ff3bf58f7fbd3dfe76b886074ed8c3b610eb1453 (diff) | |
| download | pint-f4ed37f39c8d5539d8bb5f8281c853d91e80886b.tar.gz | |
Fixed some typos in the documentation; removed trailing slashes; broke some lines to make diffs easier; changed some hanging indentation according to PEP8
Diffstat (limited to 'docs/nonmult.rst')
| -rw-r--r-- | docs/nonmult.rst | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/nonmult.rst b/docs/nonmult.rst index 3d20c79..72a2400 100644 --- a/docs/nonmult.rst +++ b/docs/nonmult.rst @@ -5,10 +5,10 @@ Temperature conversion ====================== Unlike meters and seconds, the temperature units fahrenheits and -celsius are non-multiplicative units. These temperature units are +celsius are non-multiplicative units. These temperature units are expressed in a system with a reference point, and relations between temperature units include not only a scaling factor but also an offset. -Pint supports these type of units and conversions between them. +Pint supports these type of units and conversions between them. The default definition file includes fahrenheits, celsius, kelvin and rankine abbreviated as degF, degC, degK, and degR. @@ -39,7 +39,7 @@ or to other kelvin or rankine: 537.39 degR Additionally, for every non-multiplicative temperature unit -in the registry, there is also a *delta* counterpart to specify +in the registry, there is also a *delta* counterpart to specify differences. Absolute units have no *delta* counterpart. For example, the change in celsius is equal to the change in kelvin, but not in fahrenheit (as the scaling factor @@ -61,7 +61,7 @@ Subtraction of two temperatures given in offset units yields a *delta* unit: >>> Q_(25.4, ureg.degC) - Q_(10., ureg.degC) <Quantity(15.4, 'delta_degC')> -You can add or subtract a quantity with *delta* unit and a quantity with +You can add or subtract a quantity with *delta* unit and a quantity with offset unit: .. doctest:: @@ -81,7 +81,7 @@ If you want to add a quantity with absolute unit to one with offset unit, like h ... pint.unit.OffsetUnitCalculusError: Ambiguous operation with offset unit (degC, kelvin). -you have to avoid the ambiguity by either converting the offset unit to the +you have to avoid the ambiguity by either converting the offset unit to the absolute unit before addition .. doctest:: @@ -96,10 +96,10 @@ or convert the absolute unit to a *delta* unit: >>> Q_(10., ureg.degC) + heating_rate.to('delta_degC/min') * Q_(30, ureg.min) <Quantity(25.0, 'degC')> -In contrast to subtraction, the addition of quantities with offset units +In contrast to subtraction, the addition of quantities with offset units is ambiguous, e.g. for *10 degC + 100 degC* two different result are reasonable depending on the context, *110 degC* or *383.15 °C (= 283.15 K + 373.15 K)*. -Because of this ambiguity pint raises an error for the addition of two +Because of this ambiguity pint raises an error for the addition of two quantities with offset units (since pint-0.6). Quantities with *delta* units are multiplicative: @@ -110,7 +110,7 @@ Quantities with *delta* units are multiplicative: >>> print(speed.to('delta_degC/second')) 1.0 delta_degC / second -However, multiplication, division and exponentiation of quantities with +However, multiplication, division and exponentiation of quantities with offset units is problematic just like addition. Pint (since version 0.6) will by default raise an error when a quantity with offset unit is used in these operations. Due to this quantities with offset units cannot be created @@ -139,11 +139,11 @@ to true. In this mode, pint behaves differently: >>> T = 25.4 * ureg.degC >>> T <Quantity(25.4, 'degC')> - -* Before all other multiplications, all divisions and in case of - exponentiation [#f1]_ involving quantities with offset-units, pint - will convert the quantities with offset units automatically to the - corresponding base unit before performing the operation. + +* Before all other multiplications, all divisions and in case of + exponentiation [#f1]_ involving quantities with offset-units, pint + will convert the quantities with offset units automatically to the + corresponding base unit before performing the operation. >>> 1/T <Quantity(0.00334952269302, '1 / kelvin')> |
