small error fixes

master
elfeiin 2024-05-05 19:27:23 -07:00
parent 5031157fea
commit 4334369d7a
Signed by: elfein
GPG Key ID: A53FDD4FD091A276
4 changed files with 12 additions and 7 deletions

View File

@ -43,7 +43,7 @@ impl Flywheel {
pub fn steel(radius: Length, thickness: Length) -> Self {
Self {
tensile_strength: Mega::<Pascal>::new(700.0),
density: Density::new::<KgPerCubicMeter>(7850.0),
density: KgPerCubicMeter::new(7850.0),
radius,
thickness,
}
@ -52,7 +52,7 @@ impl Flywheel {
pub fn wood(radius: Length, thickness: Length) -> Self {
Self {
tensile_strength: Mega::<Pascal>::new(105.0),
density: Density::new::<KgPerCubicMeter>(700.0),
density: KgPerCubicMeter::new(700.0),
radius,
thickness,
}
@ -60,7 +60,7 @@ impl Flywheel {
pub fn max_velocity(&self) -> Speed {
let accel = self.tensile_strength / (self.density * PI.powf(2.0) * self.radius.square());
Speed::new::<MetersPerSecond>(accel.to_units::<units::MetersPerSecondPerSecond>().powf(0.5))
MetersPerSecond::new(accel.to_units::<units::MetersPerSecondPerSecond>().powf(0.5))
}
}

View File

@ -4,8 +4,6 @@ pub mod dimensions;
pub mod units;
pub mod prefixes;
pub mod measurement;
pub use units::unit;
pub use prefixes::prefix_group;
pub trait Unit<D> {
fn new(v: f64) -> D;

View File

@ -3,6 +3,10 @@ use crate::{
measurement::Measurement,
};
use core::marker::PhantomData;
use core::ops::{
Mul,
Add,
};
#[macro_export]
macro_rules! prefix_group{
@ -36,7 +40,7 @@ macro_rules! prefix_group{
TEMPERATURE,
AMOUNT,
INTENSITY > {
Measurement::new::<Self>(v)
Measurement::new(v.mul(Self::scale()).add(Self::offset()))
}
fn scale() -> f64 {
$scale * T:: scale()

View File

@ -2,7 +2,10 @@ use crate::{
Unit,
dimensions::*,
};
use core::ops::{Mul, Add};
use core::ops::{
Mul,
Add,
};
const YEAR: f64 = 31_557_600.0;
const DAY: f64 = 60.0 * 60.0 * 24.0;