Skip to content

Add base units to some quantities (first steps) #601

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

Merged
merged 29 commits into from
Mar 1, 2019
Merged

Add base units to some quantities (first steps) #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2512da9
Adding base units to all base quantities, and base units for area as …
tmilnthorp Feb 4, 2019
f11b196
tmilnthorp Feb 18, 2019
b571f03
tmilnthorp Feb 18, 2019
24af6da
tmilnthorp Feb 19, 2019
9716fed
Can't handle prefixes right now.
tmilnthorp Feb 19, 2019
690229e
tmilnthorp Feb 19, 2019
3c8e95b
Merge branch 'master' into GenericMultiply
tmilnthorp Feb 25, 2019
ea120cd
tmilnthorp Feb 25, 2019
748a737
Use Undefined BaseUnits where not specified
tmilnthorp Feb 25, 2019
f2fdccc
Merge "master" into GenericMultiply
tmilnthorp Feb 26, 2019
8c6c283
tmilnthorp Feb 26, 2019
14bcdca
tmilnthorp Feb 26, 2019
2e02250
tmilnthorp Feb 26, 2019
68b4d2a
tmilnthorp Feb 26, 2019
157e3ac
tmilnthorp Feb 26, 2019
5a4f9d3
tmilnthorp Feb 27, 2019
0b224df
tmilnthorp Feb 27, 2019
c1fd1ca
tmilnthorp Feb 27, 2019
9833798
tmilnthorp Feb 27, 2019
3a74576
tmilnthorp Feb 27, 2019
32441d5
tmilnthorp Feb 28, 2019
52eee1d
tmilnthorp Feb 28, 2019
4e43eb6
tmilnthorp Feb 28, 2019
46043ad
tmilnthorp Feb 28, 2019
911dcfb
tmilnthorp Feb 28, 2019
d4f14d2
Merge branch 'master' into GenericMultiply
tmilnthorp Mar 1, 2019
a88bcc4
tmilnthorp Mar 1, 2019
fb67783
tmilnthorp Mar 1, 2019
6daed99
PR updates
tmilnthorp Mar 1, 2019
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
30 changes: 29 additions & 1 deletion Common/UnitDefinitions/Acceleration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
{
"SingularName": "MeterPerSecondSquared",
"PluralName": "MetersPerSecondSquared",
"BaseUnits": {
"L": "Meter",
"T": "Second"
},
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ],
Expand All @@ -23,8 +27,12 @@
{
"SingularName": "InchPerSecondSquared",
"PluralName": "InchesPerSecondSquared",
"BaseUnits": {
"L": "Inch",
"T": "Second"
},
"FromUnitToBaseFunc": "x*0.0254",
"FromBaseToUnitFunc": "x/0.0254",
"FromBaseToUnitFunc": "x/0.0254",
"Localization": [
{
"Culture": "en-US",
Expand All @@ -35,6 +43,10 @@
{
"SingularName": "FootPerSecondSquared",
"PluralName": "FeetPerSecondSquared",
"BaseUnits": {
"L": "Foot",
"T": "Second"
},
"FromUnitToBaseFunc": "x*0.304800",
"FromBaseToUnitFunc": "x/0.304800",
"Localization": [
Expand All @@ -47,6 +59,10 @@
{
"SingularName": "KnotPerSecond",
"PluralName": "KnotsPerSecond",
"BaseUnits": {
"L": "NauticalMile",
"T": "Second"
},
"FromUnitToBaseFunc": "x*0.5144444444444",
"FromBaseToUnitFunc": "x/0.5144444444444",
"Localization": [
Expand All @@ -59,6 +75,10 @@
{
"SingularName": "KnotPerMinute",
"PluralName": "KnotsPerMinute",
"BaseUnits": {
"L": "NauticalMile",
"T": "Minute"
},
"FromUnitToBaseFunc": "x*0.5144444444444/60",
"FromBaseToUnitFunc": "x/0.5144444444444*60",
"Localization": [
Expand All @@ -71,6 +91,10 @@
{
"SingularName": "KnotPerHour",
"PluralName": "KnotsPerHour",
"BaseUnits": {
"L": "NauticalMile",
"T": "Hour"
},
"FromUnitToBaseFunc": "x*0.5144444444444/3600",
"FromBaseToUnitFunc": "x/0.5144444444444*3600",
"Localization": [
Expand All @@ -83,6 +107,10 @@
{
"SingularName": "StandardGravity",
"PluralName": "StandardGravity",
"BaseUnits": {
"L": "Meter",
"T": "Second"
},
"FromUnitToBaseFunc": "x*9.80665",
"FromBaseToUnitFunc": "x/9.80665",
"Localization": [
Expand Down
6 changes: 6 additions & 0 deletions Common/UnitDefinitions/AmountOfSubstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"PluralName": "Moles",
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"BaseUnits": {
"N": "Mole"
},
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega"],
"Localization": [
{
Expand All @@ -22,6 +25,9 @@
{
"SingularName": "PoundMole",
"PluralName": "PoundMoles",
"BaseUnits": {
"N": "PoundMole"
},
"FromUnitToBaseFunc": "x*453.59237",
"FromBaseToUnitFunc": "x/453.59237",
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ],
Expand Down
33 changes: 33 additions & 0 deletions Common/UnitDefinitions/Area.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
{
"SingularName": "SquareKilometer",
"PluralName": "SquareKilometers",
"BaseUnits": {
"L": "Kilometer"
},
"FromUnitToBaseFunc": "x*1e6",
"FromBaseToUnitFunc": "x/1e6",
"Localization": [
Expand All @@ -25,6 +28,9 @@
{
"SingularName": "SquareMeter",
"PluralName": "SquareMeters",
"BaseUnits": {
"L": "Meter"
},
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"Localization": [
Expand All @@ -41,6 +47,9 @@
{
"SingularName": "SquareDecimeter",
"PluralName": "SquareDecimeters",
"BaseUnits": {
"L": "Decimeter"
},
"FromUnitToBaseFunc": "x*1e-2",
"FromBaseToUnitFunc": "x/1e-2",
"Localization": [
Expand All @@ -57,6 +66,9 @@
{
"SingularName": "SquareCentimeter",
"PluralName": "SquareCentimeters",
"BaseUnits": {
"L": "Centimeter"
},
"FromUnitToBaseFunc": "x*1e-4",
"FromBaseToUnitFunc": "x/1e-4",
"Localization": [
Expand All @@ -73,6 +85,9 @@
{
"SingularName": "SquareMillimeter",
"PluralName": "SquareMillimeters",
"BaseUnits": {
"L": "Millimeter"
},
"FromUnitToBaseFunc": "x*1e-6",
"FromBaseToUnitFunc": "x/1e-6",
"Localization": [
Expand All @@ -89,6 +104,9 @@
{
"SingularName": "SquareMicrometer",
"PluralName": "SquareMicrometers",
"BaseUnits": {
"L": "Micrometer"
},
"FromUnitToBaseFunc": "x*1e-12",
"FromBaseToUnitFunc": "x/1e-12",
"Localization": [
Expand All @@ -105,6 +123,9 @@
{
"SingularName": "SquareMile",
"PluralName": "SquareMiles",
"BaseUnits": {
"L": "Mile"
},
"FromUnitToBaseFunc": "x*2.59e6",
"FromBaseToUnitFunc": "x/2.59e6",
"Localization": [
Expand All @@ -121,6 +142,9 @@
{
"SingularName": "SquareYard",
"PluralName": "SquareYards",
"BaseUnits": {
"L": "Yard"
},
"FromUnitToBaseFunc": "x*0.836127",
"FromBaseToUnitFunc": "x/0.836127",
"Localization": [
Expand All @@ -137,6 +161,9 @@
{
"SingularName": "SquareFoot",
"PluralName": "SquareFeet",
"BaseUnits": {
"L": "Foot"
},
"FromUnitToBaseFunc": "x*0.092903",
"FromBaseToUnitFunc": "x/0.092903",
"Localization": [
Expand All @@ -153,6 +180,9 @@
{
"SingularName": "UsSurveySquareFoot",
"PluralName": "UsSurveySquareFeet",
"BaseUnits": {
"L": "UsSurveyFoot"
},
"FromUnitToBaseFunc": "x*0.09290341161",
"FromBaseToUnitFunc": "x/0.09290341161",
"Localization": [
Expand All @@ -165,6 +195,9 @@
{
"SingularName": "SquareInch",
"PluralName": "SquareInches",
"BaseUnits": {
"L": "Inch"
},
"FromUnitToBaseFunc": "x*0.00064516",
"FromBaseToUnitFunc": "x/0.00064516",
"Localization": [
Expand Down
21 changes: 21 additions & 0 deletions Common/UnitDefinitions/Duration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
{
"SingularName": "Year365",
"PluralName": "Years365",
"BaseUnits": {
"T": "Year365"
},
"FromUnitToBaseFunc": "x*365*24*3600",
"FromBaseToUnitFunc": "x/(365*24*3600)",
"Localization": [
Expand All @@ -25,6 +28,9 @@
{
"SingularName": "Month30",
"PluralName": "Months30",
"BaseUnits": {
"T": "Month30"
},
"FromUnitToBaseFunc": "x*30*24*3600",
"FromBaseToUnitFunc": "x/(30*24*3600)",
"Localization": [
Expand All @@ -41,6 +47,9 @@
{
"SingularName": "Week",
"PluralName": "Weeks",
"BaseUnits": {
"T": "Week"
},
"FromUnitToBaseFunc": "x*7*24*3600",
"FromBaseToUnitFunc": "x/(7*24*3600)",
"Localization": [
Expand All @@ -57,6 +66,9 @@
{
"SingularName": "Day",
"PluralName": "Days",
"BaseUnits": {
"T": "Day"
},
"FromUnitToBaseFunc": "x*24*3600",
"FromBaseToUnitFunc": "x/(24*3600)",
"Localization": [
Expand All @@ -73,6 +85,9 @@
{
"SingularName": "Hour",
"PluralName": "Hours",
"BaseUnits": {
"T": "Hour"
},
"FromUnitToBaseFunc": "x*3600",
"FromBaseToUnitFunc": "x/3600",
"Localization": [
Expand All @@ -89,6 +104,9 @@
{
"SingularName": "Minute",
"PluralName": "Minutes",
"BaseUnits": {
"T": "Minute"
},
"FromUnitToBaseFunc": "x*60",
"FromBaseToUnitFunc": "x/60",
"Localization": [
Expand All @@ -105,6 +123,9 @@
{
"SingularName": "Second",
"PluralName": "Seconds",
"BaseUnits": {
"T": "Second"
},
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"Prefixes": [ "Nano", "Micro", "Milli" ],
Expand Down
3 changes: 3 additions & 0 deletions Common/UnitDefinitions/ElectricCurrent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"PluralName": "Amperes",
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"BaseUnits": {
"I": "Ampere"
},
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Centi", "Kilo", "Mega" ],
"Localization": [
{
Expand Down
5 changes: 5 additions & 0 deletions Common/UnitDefinitions/Energy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
{
"SingularName": "Joule",
"PluralName": "Joules",
"BaseUnits": {
"L": "Meter",
"M": "Kilogram",
"T": "Second"
},
"FromUnitToBaseFunc": "x",
"FromBaseToUnitFunc": "x",
"Prefixes": [ "Kilo", "Mega" ],
Expand Down
Loading