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

feat: Add ton_per_minute and ton_per_day #405

Merged
merged 1 commit into from
Feb 7, 2023
Merged

feat: Add ton_per_minute and ton_per_day #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/si/mass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ quantity! {
@ton_assay: 2.916_667_E-2; "AT", "assay ton", "assay tons";
@ton_long: 1.016_047_E3; "2240 lb", "long ton", "long tons";
@ton_short: 9.071_847_E2; "2000 lb", "short ton", "short tons";
@ton: 1.0_E3; "t", "ton", "tons"; // ton, metric
/// Ton Metric
@ton: 1.0_E3; "t", "ton", "tons";
}
}
13 changes: 11 additions & 2 deletions src/si/mass_rate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,14 @@ quantity! {
"short tons per second";
@ton_short_per_hour: 2.519_957_5_E-1; "2000 lb/h", "short ton per hour",
"short tons per hour";
@ton_per_second: 1.0_E3; "t/s", "ton per second",
"tons per second"; // ton per second, metric
/// Ton per second, metric.
@ton_per_second: 1.0_E3; "t/s", "ton per second", "tons per second";
/// Ton per minute, metric.
@ton_per_minute: 1.666_666_666_666_666_6_E1; "t/min", "ton per minute", "tons per minute";
/// Ton per hour, metric.
@ton_per_hour: 2.777777777777778_E-1; "t/h", "ton per hour", "tons per hour";
/// Ton per day, metric.
@ton_per_day: 1.157_407_407_407_407_4_E-2; "t/d", "ton per day", "tons per day";
}
}

Expand Down Expand Up @@ -165,6 +171,9 @@ mod test {
test::<m::ton_short, t::second, r::ton_short_per_second>();
test::<m::ton_short, t::hour, r::ton_short_per_hour>();
test::<m::ton, t::second, r::ton_per_second>();
test::<m::ton, t::minute, r::ton_per_minute>();
test::<m::ton, t::hour, r::ton_per_hour>();
test::<m::ton, t::day, r::ton_per_day>();

fn test<M: m::Conversion<V>, T: t::Conversion<V>, R: r::Conversion<V>>() {
Test::assert_approx_eq(&MassRate::new::<R>(V::one()),
Expand Down