Small changes.

This commit is contained in:
2017-02-08 16:51:52 +01:00
parent 3c0ac96a69
commit 2e7d5b0214

View File

@@ -1,18 +1,18 @@
pub fn get_byte(id: i32) -> u8 { pub fn get_byte(id: i32) -> u8 {
let pid : f64 = 4.0 * series(1, id) - 2.0 * series(4, id) - series(5, id) - series(6, id); let pid: f64 = 4.0 * series(1, id) - 2.0 * series(4, id) - series(5, id) - series(6, id);
let y : f64 = (pid - (pid as i32) as f64 + 1.0).abs(); let y: f64 = (pid - (pid as i32) as f64 + 1.0).abs();
let y = 16.0 * (y - y.floor()); let y = 16.0 * (y - y.floor());
((y as u8) << 4) | (16.0 * (y - y.floor())) as u8 ((y as u8) << 4) | (16.0 * (y - y.floor())) as u8
} }
fn series(m: i32, id: i32) -> f64 { fn series(m: i32, id: i32) -> f64 {
const EPS : f64 = 1e-17; const EPS: f64 = 1e-17;
let mut ak : f64; let mut ak: f64;
let mut t : f64; let mut t: f64;
let mut s : f64 = 0.0; let mut s: f64 = 0.0;
for k in 0..id { for k in 0..id {
ak = (8 * k + m) as f64; ak = (8 * k + m) as f64;
@@ -42,7 +42,7 @@ fn expm(p: f64, ak: f64) -> f64 {
return 0.0; return 0.0;
} }
const NTP : usize = 25; const NTP: usize = 25;
lazy_static! { lazy_static! {
static ref TP: [f64; NTP] = { static ref TP: [f64; NTP] = {
@@ -56,7 +56,7 @@ fn expm(p: f64, ak: f64) -> f64 {
}; };
} }
let mut i : usize = 0; let mut i: usize = 0;
while TP[i] <= p { while TP[i] <= p {
i += 1; i += 1;
@@ -64,7 +64,7 @@ fn expm(p: f64, ak: f64) -> f64 {
let mut pt = TP[i - 1]; let mut pt = TP[i - 1];
let mut p = p; let mut p = p;
let mut r : f64 = 1.0; let mut r: f64 = 1.0;
for _ in 1..i + 1 { for _ in 1..i + 1 {
if p >= pt { if p >= pt {