UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/unit] Changed imperial units definitions

Browse Source 
Imperial units are now defined directly from the base unit, instead of
building on one another.

Change-Id: Ieb020643983ef49092d2d3033a7cc2135c646015
This commit is contained in:
Gabriel Ozouf
2020-07-27 13:38:53 +02:00
committed by Émilie Feral
parent 87dd1b6310
commit 1f3c4b66a0
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
poincare/include/poincare/unit.h
View File

@@ -312,15 +312,15 @@ public:
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("ft", "12*_in",
Representative("ft", "12*0.0254*_m",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("yd", "3*_ft",
Representative("yd", "3*12*0.0254*_m",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
Representative("mi", "1760*_yd",
Representative("mi", "1760*3*12*0.0254*_m",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
@@ -345,15 +345,15 @@ public:
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("lb", "16*_oz",
Representative("lb", "16*0.028349523125*_kg",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("shtn", "2000*_lb",
Representative("shtn", "2000*16*0.028349523125*_kg",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("lgtn", "2240*_lb",
Representative("lgtn", "2240*16*0.028349523125*_kg",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
@@ -462,7 +462,7 @@ public:
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Metric),
Representative("acre", "43560*_ft^2",
Representative("acre", "4046.8564224*_m^2",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
@@ -472,11 +472,11 @@ public:
Representative::Prefixable::Yes,
NegativePrefixes,
Representative::OutputSystem::Metric),
Representative("tsp", "4.92892159375*_mL",
Representative("tsp", "0.00492892159375*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
Representative("Tbsp", "3*_tsp",
Representative("Tbsp", "3*0.00492892159375*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
@@ -484,19 +484,19 @@ public:
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("cp", "8*_floz",
Representative("cp", "8*0.0295735295625*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),
Representative("pt", "2*_cp",
Representative("pt", "16*0.0295735295625*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
Representative("qt", "4*_cp",
Representative("qt", "32*0.0295735295625*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::None),
Representative("gal", "4*_qt",
Representative("gal", "128*0.0295735295625*_L",
Representative::Prefixable::No,
NoPrefix,
Representative::OutputSystem::Imperial),