Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use exact values for US liquid volume units #3229

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Use exact values for US liquid volume units #3229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aeee89
Use exact values for US liquid volume units
Vistinum Jul 5, 2024
3e37bbe
Merge branch 'develop' into develop
josdejong Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 31 additions & 88 deletions src/type/unit/Unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1833,30 +1833,30 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
name: 'minim',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.00000006161152,
value: 0.000000061611519921875,
offset: 0
}, // 0.06161152 mL
}, // 1/61440 gallons
fluiddram: {
name: 'fluiddram',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0000036966911,
value: 0.0000036966911953125,
offset: 0
}, // 3.696691 mL
}, // 1/1024 gallons
fluidounce: {
name: 'fluidounce',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.00002957353,
value: 0.0000295735295625,
offset: 0
}, // 29.57353 mL
}, // 1/128 gallons
gill: {
name: 'gill',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0001182941,
value: 0.00011829411825,
offset: 0
}, // 118.2941 mL
}, // 1/32 gallons
cc: {
name: 'cc',
base: BASE_UNITS.VOLUME,
Expand All @@ -1868,117 +1868,51 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
name: 'cup',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0002365882,
value: 0.0002365882365,
offset: 0
}, // 236.5882 mL
}, // 1/16 gallons
pint: {
name: 'pint',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0004731765,
value: 0.000473176473,
offset: 0
}, // 473.1765 mL
}, // 1/8 gallons
quart: {
name: 'quart',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0009463529,
value: 0.000946352946,
offset: 0
}, // 946.3529 mL
}, // 1/4 gallons
gallon: {
name: 'gallon',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.003785412,
value: 0.003785411784,
offset: 0
}, // 3.785412 L
}, // 3.785411784 L
beerbarrel: {
name: 'beerbarrel',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.1173478,
value: 0.117347765304,
offset: 0
}, // 117.3478 L
}, // 31 gallons
oilbarrel: {
name: 'oilbarrel',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.1589873,
value: 0.158987294928,
offset: 0
}, // 158.9873 L
}, // 42 gallons
hogshead: {
name: 'hogshead',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.2384810,
value: 0.238480942392,
offset: 0
}, // 238.4810 L

// {name: 'min', base: BASE_UNITS.VOLUME, prefixes: PREFIXES.NONE, value: 0.00000006161152, offset: 0}, // 0.06161152 mL // min is already in use as minute
fldr: {
name: 'fldr',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0000036966911,
offset: 0
}, // 3.696691 mL
floz: {
name: 'floz',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.00002957353,
offset: 0
}, // 29.57353 mL
gi: {
name: 'gi',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0001182941,
offset: 0
}, // 118.2941 mL
cp: {
name: 'cp',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0002365882,
offset: 0
}, // 236.5882 mL
pt: {
name: 'pt',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0004731765,
offset: 0
}, // 473.1765 mL
qt: {
name: 'qt',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.0009463529,
offset: 0
}, // 946.3529 mL
gal: {
name: 'gal',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.003785412,
offset: 0
}, // 3.785412 L
bbl: {
name: 'bbl',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.1173478,
offset: 0
}, // 117.3478 L
obl: {
name: 'obl',
base: BASE_UNITS.VOLUME,
prefixes: PREFIXES.NONE,
value: 0.1589873,
offset: 0
}, // 158.9873 L
// {name: 'hogshead', base: BASE_UNITS.VOLUME, prefixes: PREFIXES.NONE, value: 0.2384810, offset: 0}, // 238.4810 L // TODO: hh?
}, // 63 gallons

// Mass
g: {
Expand Down Expand Up @@ -2786,14 +2720,23 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
teaspoons: 'teaspoon',
tablespoons: 'tablespoon',
minims: 'minim',
fldr: 'fluiddram',
fluiddrams: 'fluiddram',
floz: 'fluidounce',
fluidounces: 'fluidounce',
gi: 'gill',
gills: 'gill',
cp: 'cup',
cups: 'cup',
pt: 'pint',
pints: 'pint',
qt: 'quart',
quarts: 'quart',
gal: 'gallon',
gallons: 'gallon',
bbl: 'beerbarrel',
beerbarrels: 'beerbarrel',
obl: 'oilbarrel',
oilbarrels: 'oilbarrel',
hogsheads: 'hogshead',
gtts: 'gtt',
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/function/arithmetic/divide.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ describe('divide', function () {
})

it('should divide one valued unit by a valueless unit and vice-versa', function () {
assert.strictEqual(divide(math.unit('4 gal'), math.unit('L')).toString(), '15.141648')
assert.strictEqual(divide(math.unit('gal'), math.unit('4 L')).toString(), '0.946353')
assert.strictEqual(divide(math.unit('4 gal'), math.unit('L')).toString(), '15.141647136')
assert.strictEqual(divide(math.unit('gal'), math.unit('4 L')).toString(), '0.946352946')

assert.strictEqual(divide(math.unit('inch'), math.unit(math.fraction(1), 'cm')).toFraction(), '127/50')
})
Expand Down