shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use static strings inside unit conversion table

Browse Source
This commit is contained in:
ConnorSkees 2020-05-06 11:55:49 -04:00
parent 6729f24b17
commit 01858ff543
3 changed files with 139 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
src/unit/conversion.rs
View File

@ -4,156 +4,156 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::f64::consts::PI; use std::f64::consts::PI;
use std::string::ToString;
use num_traits::One; use num_traits::One;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use crate::value::Number; use crate::value::Number;
pub(crate) static UNIT_CONVERSION_TABLE: Lazy<HashMap<String, HashMap<String, Number>>> = pub(crate) static UNIT_CONVERSION_TABLE: Lazy<
Lazy::new(|| { HashMap<&'static str, HashMap<&'static str, Number>>,
> = Lazy::new(|| {
let mut from_in = HashMap::new(); let mut from_in = HashMap::new();
from_in.insert("in".to_string(), Number::one()); from_in.insert("in", Number::one());
from_in.insert("cm".to_string(), Number::one() / Number::from(2.54)); from_in.insert("cm", Number::one() / Number::from(2.54));
from_in.insert("pc".to_string(), Number::ratio(1, 6)); from_in.insert("pc", Number::ratio(1, 6));
from_in.insert("mm".to_string(), Number::one() / Number::from(25.4)); from_in.insert("mm", Number::one() / Number::from(25.4));
from_in.insert("q".to_string(), Number::one() / Number::from(101.6)); from_in.insert("q", Number::one() / Number::from(101.6));
from_in.insert("pt".to_string(), Number::ratio(1, 72)); from_in.insert("pt", Number::ratio(1, 72));
from_in.insert("px".to_string(), Number::ratio(1, 96)); from_in.insert("px", Number::ratio(1, 96));
let mut from_cm = HashMap::new(); let mut from_cm = HashMap::new();
from_cm.insert("in".to_string(), Number::from(2.54)); from_cm.insert("in", Number::from(2.54));
from_cm.insert("cm".to_string(), Number::one()); from_cm.insert("cm", Number::one());
from_cm.insert("pc".to_string(), Number::from(2.54) / Number::from(6)); from_cm.insert("pc", Number::from(2.54) / Number::from(6));
from_cm.insert("mm".to_string(), Number::ratio(1, 10)); from_cm.insert("mm", Number::ratio(1, 10));
from_cm.insert("q".to_string(), Number::ratio(1, 40)); from_cm.insert("q", Number::ratio(1, 40));
from_cm.insert("pt".to_string(), Number::from(2.54) / Number::from(72)); from_cm.insert("pt", Number::from(2.54) / Number::from(72));
from_cm.insert("px".to_string(), Number::from(2.54) / Number::from(96)); from_cm.insert("px", Number::from(2.54) / Number::from(96));
let mut from_pc = HashMap::new(); let mut from_pc = HashMap::new();
from_pc.insert("in".to_string(), Number::from(6)); from_pc.insert("in", Number::from(6));
from_pc.insert("cm".to_string(), Number::from(6) / Number::from(2.54)); from_pc.insert("cm", Number::from(6) / Number::from(2.54));
from_pc.insert("pc".to_string(), Number::one()); from_pc.insert("pc", Number::one());
from_pc.insert("mm".to_string(), Number::from(6) / Number::from(25.4)); from_pc.insert("mm", Number::from(6) / Number::from(25.4));
from_pc.insert("q".to_string(), Number::from(6) / Number::from(101.6)); from_pc.insert("q", Number::from(6) / Number::from(101.6));
from_pc.insert("pt".to_string(), Number::ratio(1, 12)); from_pc.insert("pt", Number::ratio(1, 12));
from_pc.insert("px".to_string(), Number::ratio(1, 16)); from_pc.insert("px", Number::ratio(1, 16));
let mut from_mm = HashMap::new(); let mut from_mm = HashMap::new();
from_mm.insert("in".to_string(), Number::from(25.4)); from_mm.insert("in", Number::from(25.4));
from_mm.insert("cm".to_string(), Number::from(10)); from_mm.insert("cm", Number::from(10));
from_mm.insert("pc".to_string(), Number::from(25.4) / Number::from(6)); from_mm.insert("pc", Number::from(25.4) / Number::from(6));
from_mm.insert("mm".to_string(), Number::one()); from_mm.insert("mm", Number::one());
from_mm.insert("q".to_string(), Number::ratio(1, 4)); from_mm.insert("q", Number::ratio(1, 4));
from_mm.insert("pt".to_string(), Number::from(25.4) / Number::from(72)); from_mm.insert("pt", Number::from(25.4) / Number::from(72));
from_mm.insert("px".to_string(), Number::from(25.4) / Number::from(96)); from_mm.insert("px", Number::from(25.4) / Number::from(96));
let mut from_q = HashMap::new(); let mut from_q = HashMap::new();
from_q.insert("in".to_string(), Number::from(101.6)); from_q.insert("in", Number::from(101.6));
from_q.insert("cm".to_string(), Number::from(40)); from_q.insert("cm", Number::from(40));
from_q.insert("pc".to_string(), Number::from(101.6) / Number::from(6)); from_q.insert("pc", Number::from(101.6) / Number::from(6));
from_q.insert("mm".to_string(), Number::from(4)); from_q.insert("mm", Number::from(4));
from_q.insert("q".to_string(), Number::one()); from_q.insert("q", Number::one());
from_q.insert("pt".to_string(), Number::from(101.6) / Number::from(72)); from_q.insert("pt", Number::from(101.6) / Number::from(72));
from_q.insert("px".to_string(), Number::from(101.6) / Number::from(96)); from_q.insert("px", Number::from(101.6) / Number::from(96));
let mut from_pt = HashMap::new(); let mut from_pt = HashMap::new();
from_pt.insert("in".to_string(), Number::from(72)); from_pt.insert("in", Number::from(72));
from_pt.insert("cm".to_string(), Number::from(72) / Number::from(2.54)); from_pt.insert("cm", Number::from(72) / Number::from(2.54));
from_pt.insert("pc".to_string(), Number::from(12)); from_pt.insert("pc", Number::from(12));
from_pt.insert("mm".to_string(), Number::from(72) / Number::from(25.4)); from_pt.insert("mm", Number::from(72) / Number::from(25.4));
from_pt.insert("q".to_string(), Number::from(72) / Number::from(101.6)); from_pt.insert("q", Number::from(72) / Number::from(101.6));
from_pt.insert("pt".to_string(), Number::one()); from_pt.insert("pt", Number::one());
from_pt.insert("px".to_string(), Number::ratio(3, 4)); from_pt.insert("px", Number::ratio(3, 4));
let mut from_px = HashMap::new(); let mut from_px = HashMap::new();
from_px.insert("in".to_string(), Number::from(96)); from_px.insert("in", Number::from(96));
from_px.insert("cm".to_string(), Number::from(96) / Number::from(2.54)); from_px.insert("cm", Number::from(96) / Number::from(2.54));
from_px.insert("pc".to_string(), Number::from(16)); from_px.insert("pc", Number::from(16));
from_px.insert("mm".to_string(), Number::from(96) / Number::from(25.4)); from_px.insert("mm", Number::from(96) / Number::from(25.4));
from_px.insert("q".to_string(), Number::from(96) / Number::from(101.6)); from_px.insert("q", Number::from(96) / Number::from(101.6));
from_px.insert("pt".to_string(), Number::ratio(4, 3)); from_px.insert("pt", Number::ratio(4, 3));
from_px.insert("px".to_string(), Number::one()); from_px.insert("px", Number::one());
let mut from_deg = HashMap::new(); let mut from_deg = HashMap::new();
from_deg.insert("deg".to_string(), Number::one()); from_deg.insert("deg", Number::one());
from_deg.insert("grad".to_string(), Number::ratio(9, 10)); from_deg.insert("grad", Number::ratio(9, 10));
from_deg.insert("rad".to_string(), Number::from(180) / Number::from(PI)); from_deg.insert("rad", Number::from(180) / Number::from(PI));
from_deg.insert("turn".to_string(), Number::from(360)); from_deg.insert("turn", Number::from(360));
let mut from_grad = HashMap::new(); let mut from_grad = HashMap::new();
from_grad.insert("deg".to_string(), Number::ratio(10, 9)); from_grad.insert("deg", Number::ratio(10, 9));
from_grad.insert("grad".to_string(), Number::one()); from_grad.insert("grad", Number::one());
from_grad.insert("rad".to_string(), Number::from(200) / Number::from(PI)); from_grad.insert("rad", Number::from(200) / Number::from(PI));
from_grad.insert("turn".to_string(), Number::from(400)); from_grad.insert("turn", Number::from(400));
let mut from_rad = HashMap::new(); let mut from_rad = HashMap::new();
from_rad.insert("deg".to_string(), Number::from(PI) / Number::from(180)); from_rad.insert("deg", Number::from(PI) / Number::from(180));
from_rad.insert("grad".to_string(), Number::from(PI) / Number::from(200)); from_rad.insert("grad", Number::from(PI) / Number::from(200));
from_rad.insert("rad".to_string(), Number::one()); from_rad.insert("rad", Number::one());
from_rad.insert("turn".to_string(), Number::from(2.0 * PI)); from_rad.insert("turn", Number::from(2.0 * PI));
let mut from_turn = HashMap::new(); let mut from_turn = HashMap::new();
from_turn.insert("deg".to_string(), Number::ratio(1, 360)); from_turn.insert("deg", Number::ratio(1, 360));
from_turn.insert("grad".to_string(), Number::ratio(1, 400)); from_turn.insert("grad", Number::ratio(1, 400));
from_turn.insert("rad".to_string(), Number::one() / Number::from(2.0 * PI)); from_turn.insert("rad", Number::one() / Number::from(2.0 * PI));
from_turn.insert("turn".to_string(), Number::one()); from_turn.insert("turn", Number::one());
let mut from_s = HashMap::new(); let mut from_s = HashMap::new();
from_s.insert("s".to_string(), Number::one()); from_s.insert("s", Number::one());
from_s.insert("ms".to_string(), Number::ratio(1, 1000)); from_s.insert("ms", Number::ratio(1, 1000));
let mut from_ms = HashMap::new(); let mut from_ms = HashMap::new();
from_ms.insert("s".to_string(), Number::from(1000)); from_ms.insert("s", Number::from(1000));
from_ms.insert("ms".to_string(), Number::one()); from_ms.insert("ms", Number::one());
let mut from_hz = HashMap::new(); let mut from_hz = HashMap::new();
from_hz.insert("Hz".to_string(), Number::one()); from_hz.insert("Hz", Number::one());
from_hz.insert("kHz".to_string(), Number::from(1000)); from_hz.insert("kHz", Number::from(1000));
let mut from_khz = HashMap::new(); let mut from_khz = HashMap::new();
from_khz.insert("Hz".to_string(), Number::ratio(1, 1000)); from_khz.insert("Hz", Number::ratio(1, 1000));
from_khz.insert("kHz".to_string(), Number::one()); from_khz.insert("kHz", Number::one());
let mut from_dpi = HashMap::new(); let mut from_dpi = HashMap::new();
from_dpi.insert("dpi".to_string(), Number::one()); from_dpi.insert("dpi", Number::one());
from_dpi.insert("dpcm".to_string(), Number::from(2.54)); from_dpi.insert("dpcm", Number::from(2.54));
from_dpi.insert("dppx".to_string(), Number::from(96)); from_dpi.insert("dppx", Number::from(96));
let mut from_dpcm = HashMap::new(); let mut from_dpcm = HashMap::new();
from_dpcm.insert("dpi".to_string(), Number::one() / Number::from(2.54)); from_dpcm.insert("dpi", Number::one() / Number::from(2.54));
from_dpcm.insert("dpcm".to_string(), Number::one()); from_dpcm.insert("dpcm", Number::one());
from_dpcm.insert("dppx".to_string(), Number::from(96) / Number::from(2.54)); from_dpcm.insert("dppx", Number::from(96) / Number::from(2.54));
let mut from_dppx = HashMap::new(); let mut from_dppx = HashMap::new();
from_dppx.insert("dpi".to_string(), Number::ratio(1, 96)); from_dppx.insert("dpi", Number::ratio(1, 96));
from_dppx.insert("dpcm".to_string(), Number::from(2.54) / Number::from(96)); from_dppx.insert("dpcm", Number::from(2.54) / Number::from(96));
from_dppx.insert("dppx".to_string(), Number::one()); from_dppx.insert("dppx", Number::one());
let mut m = HashMap::new(); let mut m = HashMap::new();
m.insert("in".to_string(), from_in); m.insert("in", from_in);
m.insert("cm".to_string(), from_cm); m.insert("cm", from_cm);
m.insert("pc".to_string(), from_pc); m.insert("pc", from_pc);
m.insert("mm".to_string(), from_mm); m.insert("mm", from_mm);
m.insert("q".to_string(), from_q); m.insert("q", from_q);
m.insert("pt".to_string(), from_pt); m.insert("pt", from_pt);
m.insert("px".to_string(), from_px); m.insert("px", from_px);
m.insert("deg".to_string(), from_deg); m.insert("deg", from_deg);
m.insert("grad".to_string(), from_grad); m.insert("grad", from_grad);
m.insert("rad".to_string(), from_rad); m.insert("rad", from_rad);
m.insert("turn".to_string(), from_turn); m.insert("turn", from_turn);
m.insert("s".to_string(), from_s); m.insert("s", from_s);
m.insert("ms".to_string(), from_ms); m.insert("ms", from_ms);
m.insert("Hz".to_string(), from_hz); m.insert("Hz", from_hz);
m.insert("kHz".to_string(), from_khz); m.insert("kHz", from_khz);
m.insert("dpi".to_string(), from_dpi); m.insert("dpi", from_dpi);
m.insert("dpcm".to_string(), from_dpcm); m.insert("dpcm", from_dpcm);
m.insert("dppx".to_string(), from_dppx); m.insert("dppx", from_dppx);
m m
}); });

7
src/value/mod.rs
View File

@ -329,7 +329,9 @@ impl Value {
false false
} else { } else {
n == (n2 n == (n2
* UNIT_CONVERSION_TABLE[&unit.to_string()][&unit2.to_string()].clone()) * UNIT_CONVERSION_TABLE[unit.to_string().as_str()]
[unit2.to_string().as_str()]
.clone())
} }
} }
_ => false, _ => false,
@ -405,7 +407,8 @@ impl Value {
} else { } else {
num.cmp( num.cmp(
&(num2.clone() &(num2.clone()
* UNIT_CONVERSION_TABLE[&unit.to_string()][&unit2.to_string()] * UNIT_CONVERSION_TABLE[unit.to_string().as_str()]
[unit2.to_string().as_str()]
.clone()), .clone()),
) )
} }

9
src/value/ops.rs
View File

@ -50,7 +50,8 @@ impl Value {
} else { } else {
Value::Dimension( Value::Dimension(
num + num2 num + num2
* UNIT_CONVERSION_TABLE[&unit.to_string()][&unit2.to_string()] * UNIT_CONVERSION_TABLE[unit.to_string().as_str()]
[unit2.to_string().as_str()]
.clone(), .clone(),
unit, unit,
) )
@ -161,7 +162,8 @@ impl Value {
} else { } else {
Value::Dimension( Value::Dimension(
num - num2 num - num2
* UNIT_CONVERSION_TABLE[&unit.to_string()][&unit2.to_string()] * UNIT_CONVERSION_TABLE[unit.to_string().as_str()]
[unit2.to_string().as_str()]
.clone(), .clone(),
unit, unit,
) )
@ -353,7 +355,8 @@ impl Value {
} else { } else {
Value::Dimension( Value::Dimension(
num / (num2 num / (num2
* UNIT_CONVERSION_TABLE[&unit.to_string()][&unit2.to_string()] * UNIT_CONVERSION_TABLE[unit.to_string().as_str()]
[unit2.to_string().as_str()]
.clone()), .clone()),
Unit::None, Unit::None,
) )