logaritmisk/piar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleaning.

Browse Source
This commit is contained in:
logaritmisk
2016-05-29 11:07:41 +02:00
parent 892ece05cf
commit 9be1d3a064
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.rs
View File

@@ -18,19 +18,17 @@ fn get_byte(id: i32) -> u8 {
(first << 4) | second (first << 4) | second
} }
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 p : f64;
let mut s : f64 = 0.0; let mut s : f64 = 0.0;
let mut t : f64; let mut t : f64;
for k in 0..id { for k in 0..id {
ak = (8 * k + m) as f64; ak = (8 * k + m) as f64;
p = (id - k) as f64; t = expm((id - k) as f64, ak);
t = expm(p, ak);
s = s + t / ak; s = s + t / ak;
s = s - (s as i32) as f64; s = s - (s as i32) as f64;
} }
@@ -55,9 +53,9 @@ fn expm(p: f64, ak: f64) -> f64 {
let mut tp = vec![1f64; NTP]; let mut tp = vec![1f64; NTP];
let mut i : i32 = 0; let mut i : i32 = 0;
let mut p1 : f64; let mut p1 : f64 = p;
let mut pt : f64; let mut pt : f64;
let mut r : f64; let mut r : f64 = 1.0;
for n in 1..NTP { for n in 1..NTP {
tp[n] = 2.0 * tp[n - 1]; tp[n] = 2.0 * tp[n - 1];
@@ -75,13 +73,12 @@ fn expm(p: f64, ak: f64) -> f64 {
} }
pt = tp[(i - 1) as usize]; pt = tp[(i - 1) as usize];
p1 = p;
r = 1.0;
for _ in 1..i + 1 { for _ in 1..i + 1 {
if p1 >= pt { if p1 >= pt {
r = 16.0 * r; r = 16.0 * r;
r = r - ((r / ak) as i32) as f64 * ak; r = r - ((r / ak) as i32) as f64 * ak;
p1 = p1 - pt; p1 = p1 - pt;
} }