Much DRYer units.rs, testing change

This commit is contained in:
Kasper 2020-01-09 15:09:02 +01:00
parent 93e80e6f76
commit f1095ca8de

View File

@ -8,171 +8,104 @@ pub enum UnitType {
Area,
Volume,
Mass,
Temperature,
}
use UnitType::*;
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Unit {
NoUnit,
macro_rules! create_units {
( $( $x:ident : $y:expr ),*, ) => {
#[derive(Clone, Copy, PartialEq, Debug)]
pub enum Unit {
$($x),*
}
use Unit::*;
Nanosecond,
Microsecond,
Millisecond,
Second,
Minute,
Hour,
Day,
Week,
Month,
Quarter,
Year,
Decade,
Century,
Millenium,
Millimeter,
Centimeter,
Decimeter,
Meter,
Kilometer,
Inch,
Foot,
Yard,
Mile,
// 1-dimensional only:
NauticalMile,
LightYear,
SquareMillimeter,
SquareCentimeter,
SquareDecimeter,
SquareMeter,
SquareKilometer,
SquareInch,
SquareFoot,
SquareYard,
SquareMile,
// 2-dimensional only:
Are,
Decare,
Hectare,
Acre,
CubicMillimeter,
CubicCentimeter,
CubicDecimeter,
CubicMeter,
CubicKilometer,
CubicInch,
CubicFoot,
CubicYard,
CubicMile,
// 3-dimensional only:
Milliliter,
Centiliter,
Deciliter,
Liter,
Teaspoon,
Tablespoon,
FluidOunce,
Cup,
Pint,
Quart,
Gallon,
OilBarrel,
Milligram,
Gram,
Hectogram,
Kilogram,
ShortTon,
LongTon,
MetricTon,
Ounce,
Pound,
}
use Unit::*;
fn get_info(unit: &Unit) -> (UnitType, d128) {
match unit {
Unit::NoUnit => (UnitType::NoUnit, d128!(1)),
Nanosecond => (Time, d128!(1)),
Microsecond => (Time, d128!(1000)),
Millisecond => (Time, d128!(1000000)),
Second => (Time, d128!(1000000000)),
Minute => (Time, d128!(60000000000)),
Hour => (Time, d128!(3600000000000)),
Day => (Time, d128!(86400000000000)),
Week => (Time, d128!(604800000000000)),
Month => (Time, d128!(2629746000000000)),
Quarter => (Time, d128!(7889238000000000)),
Year => (Time, d128!(31556952000000000)),
Decade => (Time, d128!(315569520000000000)),
Century => (Time, d128!(3155695200000000000)),
Millenium => (Time, d128!(31556952000000000000)),
Millimeter => (Length, d128!(10)),
Centimeter => (Length, d128!(100)),
Decimeter => (Length, d128!(1000)),
Meter => (Length, d128!(10000)),
Kilometer => (Length, d128!(10000000)),
Inch => (Length, d128!(254)),
Foot => (Length, d128!(3048)),
Yard => (Length, d128!(9144)),
Mile => (Length, d128!(16093440)),
NauticalMile => (Length, d128!(18520000)),
LightYear => (Length, d128!(94607304725808000000)),
SquareMillimeter => (Area, d128!(100)),
SquareCentimeter => (Area, d128!(10000)),
SquareDecimeter => (Area, d128!(1000000)),
SquareMeter => (Area, d128!(100000000)),
SquareKilometer => (Area, d128!(100000000000000)),
SquareInch => (Area, d128!(64516)),
SquareFoot => (Area, d128!(9290304)),
SquareYard => (Area, d128!(83612736)),
SquareMile => (Area, d128!(258998811033600)),
Are => (Area, d128!(10000000000)),
Decare => (Area, d128!(100000000000)),
Hectare => (Area, d128!(1000000000000)),
Acre => (Area, d128!(404685642240)),
CubicMillimeter => (Volume, d128!(1)),
CubicCentimeter => (Volume, d128!(1000)),
CubicDecimeter => (Volume, d128!(1000000)),
CubicMeter => (Volume, d128!(1000000000)),
CubicKilometer => (Volume, d128!(1000000000000000000)),
CubicInch => (Volume, d128!(16387.064)),
CubicFoot => (Volume, d128!(28316846.592)),
CubicYard => (Volume, d128!(764554857.984)),
CubicMile => (Volume, d128!(4168181825440579584)),
Milliliter => (Volume, d128!(1000)),
Centiliter => (Volume, d128!(10000)),
Deciliter => (Volume, d128!(100000)),
Liter => (Volume, d128!(1000000)),
Teaspoon => (Volume, d128!(4928.92159375)),
Tablespoon => (Volume, d128!(14786.76478125)),
FluidOunce => (Volume, d128!(29573.5295625)),
Cup => (Volume, d128!(236588.2365)),
Pint => (Volume, d128!(473176.473)),
Quart => (Volume, d128!(946352.946)),
Gallon => (Volume, d128!(3785411.784)),
OilBarrel => (Volume, d128!(158987294.928)),
Milligram => (Mass, d128!(0.001)),
Gram => (Mass, d128!(1)),
Hectogram => (Mass, d128!(100)),
Kilogram => (Mass, d128!(1000)),
MetricTon => (Mass, d128!(1000000)),
Ounce => (Mass, d128!(28.349523125)),
Pound => (Mass, d128!(453.59237)),
ShortTon => (Mass, d128!(907184.74)),
LongTon => (Mass, d128!(1016046.9088)),
fn get_info(unit: &Unit) -> (UnitType, d128) {
match unit {
$(
Unit::$x => $y
),*
}
}
}
}
create_units!(
NoUnit: (UnitType::NoUnit, d128!(1)),
Nanosecond: (Time, d128!(1)),
Microsecond: (Time, d128!(1000)),
Millisecond: (Time, d128!(1000000)),
Second: (Time, d128!(1000000000)),
Minute: (Time, d128!(60000000000)),
Hour: (Time, d128!(3600000000000)),
Day: (Time, d128!(86400000000000)),
Week: (Time, d128!(604800000000000)),
Month: (Time, d128!(2629746000000000)),
Quarter: (Time, d128!(7889238000000000)),
Year: (Time, d128!(31556952000000000)),
Decade: (Time, d128!(315569520000000000)),
Century: (Time, d128!(3155695200000000000)),
Millenium: (Time, d128!(31556952000000000000)),
Millimeter: (Length, d128!(10)),
Centimeter: (Length, d128!(100)),
Decimeter: (Length, d128!(1000)),
Meter: (Length, d128!(10000)),
Kilometer: (Length, d128!(10000000)),
Inch: (Length, d128!(254)),
Foot: (Length, d128!(3048)),
Yard: (Length, d128!(9144)),
Mile: (Length, d128!(16093440)),
NauticalMile: (Length, d128!(18520000)),
LightYear: (Length, d128!(94607304725808000000)),
SquareMillimeter: (Area, d128!(100)),
SquareCentimeter: (Area, d128!(10000)),
SquareDecimeter: (Area, d128!(1000000)),
SquareMeter: (Area, d128!(100000000)),
SquareKilometer: (Area, d128!(100000000000000)),
SquareInch: (Area, d128!(64516)),
SquareFoot: (Area, d128!(9290304)),
SquareYard: (Area, d128!(83612736)),
SquareMile: (Area, d128!(258998811033600)),
Are: (Area, d128!(10000000000)),
Decare: (Area, d128!(100000000000)),
Hectare: (Area, d128!(1000000000000)),
Acre: (Area, d128!(404685642240)),
CubicMillimeter: (Volume, d128!(1)),
CubicCentimeter: (Volume, d128!(1000)),
CubicDecimeter: (Volume, d128!(1000000)),
CubicMeter: (Volume, d128!(1000000000)),
CubicKilometer: (Volume, d128!(1000000000000000000)),
CubicInch: (Volume, d128!(16387.064)),
CubicFoot: (Volume, d128!(28316846.592)),
CubicYard: (Volume, d128!(764554857.984)),
CubicMile: (Volume, d128!(4168181825440579584)),
Milliliter: (Volume, d128!(1000)),
Centiliter: (Volume, d128!(10000)),
Deciliter: (Volume, d128!(100000)),
Liter: (Volume, d128!(1000000)),
Teaspoon: (Volume, d128!(4928.92159375)),
Tablespoon: (Volume, d128!(14786.76478125)),
FluidOunce: (Volume, d128!(29573.5295625)),
Cup: (Volume, d128!(236588.2365)),
Pint: (Volume, d128!(473176.473)),
Quart: (Volume, d128!(946352.946)),
Gallon: (Volume, d128!(3785411.784)),
OilBarrel: (Volume, d128!(158987294.928)),
Milligram: (Mass, d128!(0.001)),
Gram: (Mass, d128!(1)),
Hectogram: (Mass, d128!(100)),
Kilogram: (Mass, d128!(1000)),
MetricTon: (Mass, d128!(1000000)),
Ounce: (Mass, d128!(28.349523125)),
Pound: (Mass, d128!(453.59237)),
ShortTon: (Mass, d128!(907184.74)),
LongTon: (Mass, d128!(1016046.9088)),
);
impl Unit {
pub fn category(&self) -> UnitType {
return get_info(self).0
@ -182,95 +115,110 @@ impl Unit {
}
}
fn get_convertion_factor(unit: Unit, to_unit: Unit) -> d128 {
return unit.weight() / to_unit.weight();
}
pub fn convert(value: d128, unit: Unit, to_unit: Unit) -> Result<d128, String> {
let convertion_factor = get_convertion_factor(unit, to_unit);
Ok(value * convertion_factor)
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_convert() {
pub fn convert(value: &str, unit: Unit, to_unit: Unit) -> f64 {
pub fn convert_test(value: f64, unit: Unit, to_unit: Unit) -> f64 {
use std::str::FromStr;
let decimal_value = d128::from_str(value).unwrap();
let result = decimal_value * unit.weight() / to_unit.weight();
let string_result = &result.to_string();
return f64::from_str(string_result).unwrap();
let value_string = &value.to_string();
let value_d128 = d128::from_str(value_string).unwrap();
let result = convert(value_d128, unit, to_unit);
let string_result = &result.unwrap().to_string();
let float_result = f64::from_str(string_result).unwrap();
return float_result;
}
assert_eq!(convert("1000", Nanosecond, Microsecond), 1.0);
assert_eq!(convert("1000", Microsecond, Millisecond), 1.0);
assert_eq!(convert("1000", Millisecond, Second), 1.0);
assert_eq!(convert("60", Second, Minute), 1.0);
assert_eq!(convert("60", Minute, Hour), 1.0);
assert_eq!(convert("24", Hour, Day), 1.0);
assert_eq!(convert("7", Day, Week), 1.0);
assert_eq!(convert("30.436875", Day, Month), 1.0);
assert_eq!(convert("3", Month, Quarter), 1.0);
assert_eq!(convert("4", Quarter, Year), 1.0);
assert_eq!(convert("10", Year, Decade), 1.0);
assert_eq!(convert("10", Decade, Century), 1.0);
assert_eq!(convert("10", Century, Millenium), 1.0);
assert_eq!(convert_test(1000.0, Nanosecond, Microsecond), 1.0);
assert_eq!(convert_test(1000.0, Nanosecond, Microsecond), 1.0);
assert_eq!(convert_test(1000.0, Microsecond, Millisecond), 1.0);
assert_eq!(convert_test(1000.0, Millisecond, Second), 1.0);
assert_eq!(convert_test(60.0, Second, Minute), 1.0);
assert_eq!(convert_test(60.0, Minute, Hour), 1.0);
assert_eq!(convert_test(24.0, Hour, Day), 1.0);
assert_eq!(convert_test(7.0, Day, Week), 1.0);
assert_eq!(convert_test(30.436875, Day, Month), 1.0);
assert_eq!(convert_test(3.0, Month, Quarter), 1.0);
assert_eq!(convert_test(4.0, Quarter, Year), 1.0);
assert_eq!(convert_test(10.0, Year, Decade), 1.0);
assert_eq!(convert_test(10.0, Decade, Century), 1.0);
assert_eq!(convert_test(10.0, Century, Millenium), 1.0);
assert_eq!(convert("10", Millimeter, Centimeter), 1.0);
assert_eq!(convert("10", Centimeter, Decimeter), 1.0);
assert_eq!(convert("10", Decimeter, Meter), 1.0);
assert_eq!(convert("1000", Meter, Kilometer), 1.0);
assert_eq!(convert("2.54", Centimeter, Inch), 1.0);
assert_eq!(convert("12", Inch, Foot), 1.0);
assert_eq!(convert("3", Foot, Yard), 1.0);
assert_eq!(convert("1760", Yard, Mile), 1.0);
assert_eq!(convert("1852", Meter, NauticalMile), 1.0);
assert_eq!(convert("9460730472580800", Meter, LightYear), 1.0);
assert_eq!(convert_test(10.0, Millimeter, Centimeter), 1.0);
assert_eq!(convert_test(10.0, Centimeter, Decimeter), 1.0);
assert_eq!(convert_test(10.0, Decimeter, Meter), 1.0);
assert_eq!(convert_test(1000.0, Meter, Kilometer), 1.0);
assert_eq!(convert_test(2.54, Centimeter, Inch), 1.0);
assert_eq!(convert_test(12.0, Inch, Foot), 1.0);
assert_eq!(convert_test(3.0, Foot, Yard), 1.0);
assert_eq!(convert_test(1760.0, Yard, Mile), 1.0);
assert_eq!(convert_test(1852.0, Meter, NauticalMile), 1.0);
assert_eq!(convert_test(9460730472580800.0, Meter, LightYear), 1.0);
assert_eq!(convert("10", Millimeter, Centimeter), 1.0);
assert_eq!(convert("10", Centimeter, Decimeter), 1.0);
assert_eq!(convert("10", Decimeter, Meter), 1.0);
assert_eq!(convert("1000", Meter, Kilometer), 1.0);
assert_eq!(convert("2.54", Centimeter, Inch), 1.0);
assert_eq!(convert("12", Inch, Foot), 1.0);
assert_eq!(convert("3", Foot, Yard), 1.0);
assert_eq!(convert("1760", Yard, Mile), 1.0);
assert_eq!(convert("1852", Meter, NauticalMile), 1.0);
assert_eq!(convert("9460730472580800", Meter, LightYear), 1.0);
assert_eq!(convert_test(10.0, Millimeter, Centimeter), 1.0);
assert_eq!(convert_test(10.0, Centimeter, Decimeter), 1.0);
assert_eq!(convert_test(10.0, Decimeter, Meter), 1.0);
assert_eq!(convert_test(1000.0, Meter, Kilometer), 1.0);
assert_eq!(convert_test(2.54, Centimeter, Inch), 1.0);
assert_eq!(convert_test(12.0, Inch, Foot), 1.0);
assert_eq!(convert_test(3.0, Foot, Yard), 1.0);
assert_eq!(convert_test(1760.0, Yard, Mile), 1.0);
assert_eq!(convert_test(1852.0, Meter, NauticalMile), 1.0);
assert_eq!(convert_test(9460730472580800.0, Meter, LightYear), 1.0);
assert_eq!(convert("100", SquareMillimeter, SquareCentimeter), 1.0);
assert_eq!(convert("100", SquareCentimeter, SquareDecimeter), 1.0);
assert_eq!(convert("100", SquareDecimeter, SquareMeter), 1.0);
assert_eq!(convert("1000000", SquareMeter, SquareKilometer), 1.0);
assert_eq!(convert("645.16", SquareMillimeter, SquareInch), 1.0);
assert_eq!(convert("144", SquareInch, SquareFoot), 1.0);
assert_eq!(convert("9", SquareFoot, SquareYard), 1.0);
assert_eq!(convert("3097600", SquareYard, SquareMile), 1.0);
assert_eq!(convert("100", SquareMeter, Are), 1.0);
assert_eq!(convert("10", Are, Decare), 1.0);
assert_eq!(convert("10", Decare, Hectare), 1.0);
assert_eq!(convert("640", Acre, SquareMile), 1.0);
assert_eq!(convert_test(100.0, SquareMillimeter, SquareCentimeter), 1.0);
assert_eq!(convert_test(100.0, SquareCentimeter, SquareDecimeter), 1.0);
assert_eq!(convert_test(100.0, SquareDecimeter, SquareMeter), 1.0);
assert_eq!(convert_test(1000000.0, SquareMeter, SquareKilometer), 1.0);
assert_eq!(convert_test(645.16, SquareMillimeter, SquareInch), 1.0);
assert_eq!(convert_test(144.0, SquareInch, SquareFoot), 1.0);
assert_eq!(convert_test(9.0, SquareFoot, SquareYard), 1.0);
assert_eq!(convert_test(3097600.0, SquareYard, SquareMile), 1.0);
assert_eq!(convert_test(100.0, SquareMeter, Are), 1.0);
assert_eq!(convert_test(10.0, Are, Decare), 1.0);
assert_eq!(convert_test(10.0, Decare, Hectare), 1.0);
assert_eq!(convert_test(640.0, Acre, SquareMile), 1.0);
assert_eq!(convert("1000", CubicMillimeter, CubicCentimeter), 1.0);
assert_eq!(convert("1000", CubicCentimeter, CubicDecimeter), 1.0);
assert_eq!(convert("1000", CubicDecimeter, CubicMeter), 1.0);
assert_eq!(convert("1000000000", CubicMeter, CubicKilometer), 1.0);
assert_eq!(convert("1728", CubicInch, CubicFoot), 1.0);
assert_eq!(convert("27", CubicFoot, CubicYard), 1.0);
assert_eq!(convert("5451776000", CubicYard, CubicMile), 1.0);
assert_eq!(convert("1", Milliliter, CubicCentimeter), 1.0);
assert_eq!(convert("10", Milliliter, Centiliter), 1.0);
assert_eq!(convert("10", Centiliter, Deciliter), 1.0);
assert_eq!(convert("10", Deciliter, Liter), 1.0);
assert_eq!(convert("4.92892159375", Milliliter, Teaspoon), 1.0);
assert_eq!(convert("3", Teaspoon, Tablespoon), 1.0);
assert_eq!(convert("2", Tablespoon, FluidOunce), 1.0);
assert_eq!(convert("8", FluidOunce, Cup), 1.0);
assert_eq!(convert("2", Cup, Pint), 1.0);
assert_eq!(convert("2", Pint, Quart), 1.0);
assert_eq!(convert("4", Quart, Gallon), 1.0);
assert_eq!(convert("42", Gallon, OilBarrel), 1.0);
assert_eq!(convert_test(1000.0, CubicMillimeter, CubicCentimeter), 1.0);
assert_eq!(convert_test(1000.0, CubicCentimeter, CubicDecimeter), 1.0);
assert_eq!(convert_test(1000.0, CubicDecimeter, CubicMeter), 1.0);
assert_eq!(convert_test(1000000000.0, CubicMeter, CubicKilometer), 1.0);
assert_eq!(convert_test(1728.0, CubicInch, CubicFoot), 1.0);
assert_eq!(convert_test(27.0, CubicFoot, CubicYard), 1.0);
assert_eq!(convert_test(5451776000.0, CubicYard, CubicMile), 1.0);
assert_eq!(convert_test(1.0, Milliliter, CubicCentimeter), 1.0);
assert_eq!(convert_test(10.0, Milliliter, Centiliter), 1.0);
assert_eq!(convert_test(10.0, Centiliter, Deciliter), 1.0);
assert_eq!(convert_test(10.0, Deciliter, Liter), 1.0);
assert_eq!(convert_test(4.92892159375, Milliliter, Teaspoon), 1.0);
assert_eq!(convert_test(3.0, Teaspoon, Tablespoon), 1.0);
assert_eq!(convert_test(2.0, Tablespoon, FluidOunce), 1.0);
assert_eq!(convert_test(8.0, FluidOunce, Cup), 1.0);
assert_eq!(convert_test(2.0, Cup, Pint), 1.0);
assert_eq!(convert_test(2.0, Pint, Quart), 1.0);
assert_eq!(convert_test(4.0, Quart, Gallon), 1.0);
assert_eq!(convert_test(42.0, Gallon, OilBarrel), 1.0);
assert_eq!(convert("1000", Milligram, Gram), 1.0);
assert_eq!(convert("100", Gram, Hectogram), 1.0);
assert_eq!(convert("1000", Gram, Kilogram), 1.0);
assert_eq!(convert("1000", Kilogram, MetricTon), 1.0);
assert_eq!(convert("0.45359237", Kilogram, Pound), 1.0);
assert_eq!(convert("16", Ounce, Pound), 1.0);
assert_eq!(convert("2000", Pound, ShortTon), 1.0);
assert_eq!(convert("2240", Pound, LongTon), 1.0);
assert_eq!(convert_test(1000.0, Milligram, Gram), 1.0);
assert_eq!(convert_test(100.0, Gram, Hectogram), 1.0);
assert_eq!(convert_test(1000.0, Gram, Kilogram), 1.0);
assert_eq!(convert_test(1000.0, Kilogram, MetricTon), 1.0);
assert_eq!(convert_test(0.45359237, Kilogram, Pound), 1.0);
assert_eq!(convert_test(16.0, Ounce, Pound), 1.0);
assert_eq!(convert_test(2000.0, Pound, ShortTon), 1.0);
assert_eq!(convert_test(2240.0, Pound, LongTon), 1.0);
}
}