diff --git a/RUFAS/units.py b/RUFAS/units.py index ebcb9821ef..18b2073f67 100644 --- a/RUFAS/units.py +++ b/RUFAS/units.py @@ -18,9 +18,7 @@ class MeasurementUnits(Enum): CENTIMETERS_PER_MILLIMETER = "cm/mm" CONCEPTIONS = "conception" CONCEPTIONS_PER_SERVICE = "conceptions per service" - COWS = "cows" CUBIC_METERS = "m^3" - CUBIC_METERS_PER_DAY = "m^3/day" CUBIC_METERS_PER_KILOGRAM = "m^3/kg" CUBIC_METERS_PER_LITER = "m^3/L" CUBIC_METERS_PER_CUBIC_MILLIMETER = "m^3/mm^3" @@ -68,10 +66,8 @@ class MeasurementUnits(Enum): LITERS_PER_HA = "L/ha" LITERS_PER_KILOWATTS_PER_HOUR = "L/kWhr" MEGACALORIES = "Mcal" - MEGACALORIES_PER_KILOGRAM = "Mcal/kg" MEGAGRAMS_PER_KILOGRAM = "Mg/kg" MEGAJOULES = "MJ" - MEGAJOULES_PER_CUBIC_METER = "MJ/m^3" MEGAJOULES_PER_SQUARE_METER = "MJ/m^2" METERS = "m" METERS_PER_KILOMETER = "m/km" diff --git a/tests/test_units.py b/tests/test_units.py index 5def011d43..2b2ba2b10f 100644 --- a/tests/test_units.py +++ b/tests/test_units.py @@ -16,9 +16,7 @@ def test_units_member_values() -> None: assert MeasurementUnits.CENTIMETERS_PER_MILLIMETER.value == "cm/mm" assert MeasurementUnits.CONCEPTIONS.value == "conception" assert MeasurementUnits.CONCEPTIONS_PER_SERVICE.value == "conceptions per service" - assert MeasurementUnits.COWS.value == "cows" assert MeasurementUnits.CUBIC_METERS.value == "m^3" - assert MeasurementUnits.CUBIC_METERS_PER_DAY.value == "m^3/day" assert MeasurementUnits.CUBIC_METERS_PER_KILOGRAM.value == "m^3/kg" assert MeasurementUnits.CUBIC_METERS_PER_LITER.value == "m^3/L" assert MeasurementUnits.CUBIC_METERS_PER_CUBIC_MILLIMETER.value == "m^3/mm^3" @@ -58,10 +56,8 @@ def test_units_member_values() -> None: assert MeasurementUnits.LITERS.value == "L" assert MeasurementUnits.LITERS_PER_CUBIC_METER.value == "L/m^3" assert MeasurementUnits.MEGACALORIES.value == "Mcal" - assert MeasurementUnits.MEGACALORIES_PER_KILOGRAM.value == "Mcal/kg" assert MeasurementUnits.MEGAGRAMS_PER_KILOGRAM.value == "Mg/kg" assert MeasurementUnits.MEGAJOULES.value == "MJ" - assert MeasurementUnits.MEGAJOULES_PER_CUBIC_METER.value == "MJ/m^3" assert MeasurementUnits.MEGAJOULES_PER_SQUARE_METER.value == "MJ/m^2" assert MeasurementUnits.METERS.value == "m" assert MeasurementUnits.METERS_PER_KILOMETER.value == "m/km" @@ -101,9 +97,7 @@ def test_units_str_method() -> None: assert str(MeasurementUnits.CENTIMETERS_PER_MILLIMETER) == "cm/mm" assert str(MeasurementUnits.CONCEPTIONS) == "conception" assert str(MeasurementUnits.CONCEPTIONS_PER_SERVICE) == "conceptions per service" - assert str(MeasurementUnits.COWS) == "cows" assert str(MeasurementUnits.CUBIC_METERS) == "m^3" - assert str(MeasurementUnits.CUBIC_METERS_PER_DAY) == "m^3/day" assert str(MeasurementUnits.CUBIC_METERS_PER_KILOGRAM) == "m^3/kg" assert str(MeasurementUnits.CUBIC_METERS_PER_LITER) == "m^3/L" assert str(MeasurementUnits.CUBIC_METERS_PER_CUBIC_MILLIMETER) == "m^3/mm^3" @@ -142,9 +136,7 @@ def test_units_str_method() -> None: assert str(MeasurementUnits.LITERS) == "L" assert str(MeasurementUnits.LITERS_PER_CUBIC_METER) == "L/m^3" assert str(MeasurementUnits.MEGACALORIES) == "Mcal" - assert str(MeasurementUnits.MEGACALORIES_PER_KILOGRAM) == "Mcal/kg" assert str(MeasurementUnits.MEGAJOULES) == "MJ" - assert str(MeasurementUnits.MEGAJOULES_PER_CUBIC_METER) == "MJ/m^3" assert str(MeasurementUnits.MEGAJOULES_PER_SQUARE_METER) == "MJ/m^2" assert str(MeasurementUnits.METERS) == "m" assert str(MeasurementUnits.METERS_PER_KILOMETER) == "m/km"