Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-11-10 13:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix quantity conflicts

Browse source
This commit is contained in:
Tiffany Bennett 2016-08-21 12:21:26 -04:00
parent 5413bd1a22
commit 6432f0b864
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
definitions.units
View file

@ -487,8 +487,8 @@ angle ? radian
solid_angle ? steradian
money ? US$
force ? newton
pressure ? force / area
stress ? force / area
pressure ? pascal
stress pascal
charge ? coulomb
capacitance ? farad
resistance ? ohm
@ -1262,7 +1262,7 @@ ozcu ouncecopper # in circuitboard fabrication
#
radiant_energy J # Basic unit of radiation
radiant_energy_density ? J/m^3
radiant_energy_density J/m^3
radiant_flux W
spectral_flux_frequency W/Hz
spectral_flux_wavelength ? W/m
@ -1275,12 +1275,12 @@ spectral_radiance_wavelength ? W sr^-1 m^-3
spectral_irradiance_frequency ? W m^-2 Hz^-1
spectral_irradiance_wavelength ? W/m^3
radiosity ? W/m^2
spectral_radiosity_frequency ? W m^-2 Hz^-1
spectral_radiosity_frequency W m^-2 Hz^-1
spectral_radiosity_wavelength W m^-3
radiant_exitance W/m^2
spectral_exitance_frequency W m^-2 Hz^-1
spectral_exitance_wavelength W/m^3
radiant_exposure ? J/m^2
radiant_exposure J/m^2
spectral_exposure_frequency ? J m^-2 Hz^-1
spectral_exposure_wavelength J/m^3
@ -3162,7 +3162,7 @@ thermal_resistance ? 1/thermal_conductance
# of sheets of insulation or cloth that are of specified thickness.
thermal_admittance ? thermal_conductivity / length
thermal_insulance ? thermal_resistivity length
thermal_insulance thermal_resistivity length
thermal_insulation ? thermal_resistivity length
Rvalue degR ft^2 hr / btu

8
src/eval.rs
View file

@ -769,9 +769,6 @@ impl Context {
Def::Dimension(ref dname) => {
let dname = Rc::new(dname.clone());
ctx.dimensions.push(dname.clone());
let mut map = Unit::new();
map.insert(dname, 1);
ctx.aliases.insert(map, name.clone());
},
Def::Unit(ref expr) => match ctx.eval(expr) {
Ok(Value::Number(v)) => {
@ -797,7 +794,10 @@ impl Context {
},
Def::Quantity(ref expr) => match ctx.eval(expr) {
Ok(Value::Number(v)) => {
ctx.aliases.insert(v.1, name.clone());
let res = ctx.aliases.insert(v.1, name.clone());
if let Some(old) = res {
println!("Warning: Conflicting quantities {} and {}", name, old);
}
},
Ok(_) => println!("Quantity {} is not a number", name),
Err(e) => println!("Quantity {} is malformed: {}", name, e)