avoid return statement

Expander · Jan 28, 2024 · 5569f1b · 5569f1b
1 parent 65d0f36
commit 5569f1b
Showing 1 changed file with 50 additions and 54 deletions.
diff --git a/src/li6.rs b/src/li6.rs
@@ -34,71 +34,67 @@ impl Li6<Complex<f64>> for Complex<f64> {
            -6.8408811719011698e-15,  4.8691178462005581e-15
         ];
 
-        if self.im == 0.0 {
-            if self.re == 0.0 {
-                return Complex::new(0.0, 0.0);
-            }
-            if self.re == 1.0 {
-                return Complex::new(z6, 0.0);
-            }
-            if self.re == -1.0 {
-                return Complex::new(-31.0/32.0*z6, 0.0);
-            }
-        }
-
-        let nz  = self.norm();
-        let pz  = self.arg();
-        let lnz = nz.ln();
+        if self.im == 0.0 && self.re == 0.0 {
+            Complex::new(0.0, 0.0)
+        } else if self.im == 0.0 && self.re == 1.0 {
+            Complex::new(z6, 0.0)
+        } else if self.im == 0.0 && self.re == -1.0 {
+            Complex::new(-31.0/32.0*z6, 0.0)
+        } else {
+            let nz  = self.norm();
+            let pz  = self.arg();
+            let lnz = nz.ln();
 
-        if lnz*lnz + pz*pz < 1.0 { // |log(z)| < 1
-            let u  = Complex::new(lnz, pz);
-            let u2 = u*u;
-            let c1 = 1.0369277551433699; // zeta(5)
-            let c2 = 0.54116161685556910;
-            let c3 = 0.20034281719326571;
-            let c4 = 0.068538919452009435;
-            let c5 = (137.0/60.0 - (-u).cln())/120.0;
-            let c6 = -1.0/1440.0;
+            if lnz*lnz + pz*pz < 1.0 { // |log(z)| < 1
+                let u  = Complex::new(lnz, pz);
+                let u2 = u*u;
+                let c1 = 1.0369277551433699; // zeta(5)
+                let c2 = 0.54116161685556910;
+                let c3 = 0.20034281719326571;
+                let c4 = 0.068538919452009435;
+                let c5 = (137.0/60.0 - (-u).cln())/120.0;
+                let c6 = -1.0/1440.0;
 
-            let cs = [
-                -1.6534391534391534e-05, 2.2964432686654909e-08,
-                -9.9413128513657614e-11, 6.6912682653423394e-13,
-                -5.7933058574392549e-15
-            ];
+                let cs = [
+                    -1.6534391534391534e-05, 2.2964432686654909e-08,
+                    -9.9413128513657614e-11, 6.6912682653423394e-13,
+                    -5.7933058574392549e-15
+                ];
 
-            return z6 + u * c1 +
+                z6 + u * c1 +
                 u2 * (c2 + u * c3 +
                 u2 * (c4 + u * c5 +
                 u2 * (c6 +
                 u * (cs[0] +
                 u2 * (cs[1] +
                 u2 * (cs[2] +
                 u2 * (cs[3] +
-                u2 * (cs[4]))))))));
-        }
-
-        let (u, rest, sgn) = if nz <= 1.0 {
-            (-(1.0 - self).cln(), Complex::new(0.0, 0.0), 1.0)
-        } else { // nz > 1.0
-            let pi4 = pi2*pi2;
-            let pi6 = pi2*pi4;
-            let arg = if pz > 0.0 { pz - pi } else { pz + pi };
-            let lmz = Complex::new(lnz, arg); // (-self).cln()
-            let lmz2 = lmz*lmz;
-            (-(1.0 - 1.0/self).cln(), -31.0*pi6/15120.0 + lmz2*(-7.0/720.0*pi4 + lmz2*(-1.0/144.0*pi2 - 1.0/720.0*lmz2)), -1.0)
-        };
+                u2 * (cs[4]))))))))
+            } else {
+                let (u, rest, sgn) = if nz <= 1.0 {
+                    (-(1.0 - self).cln(), Complex::new(0.0, 0.0), 1.0)
+                } else { // nz > 1.0
+                    let pi4 = pi2*pi2;
+                    let pi6 = pi2*pi4;
+                    let arg = if pz > 0.0 { pz - pi } else { pz + pi };
+                    let lmz = Complex::new(lnz, arg); // (-self).cln()
+                    let lmz2 = lmz*lmz;
+                    (-(1.0 - 1.0/self).cln(), -31.0*pi6/15120.0 + lmz2*(-7.0/720.0*pi4 + lmz2*(-1.0/144.0*pi2 - 1.0/720.0*lmz2)), -1.0)
+                };
 
-        let u2 = u*u;
-        let u4 = u2*u2;
-        let u8 = u4*u4;
+                let u2 = u*u;
+                let u4 = u2*u2;
+                let u8 = u4*u4;
 
-        rest + sgn * (
-           u*bf[0] +
-           u2*(bf[1] + u*bf[2]) +
-           u4*(bf[3] + u*bf[4] + u2*(bf[5] + u*bf[6])) +
-           u8*(bf[7] + u*bf[8] + u2*(bf[9] + u*bf[10]) +
-               u4*(bf[11] + u*bf[12] + u2*(bf[13] + u*bf[14]))) +
-           u8*u8*(bf[15] + u*bf[16] + u2*bf[17])
-        )
+                rest + sgn*(
+                   u*bf[0] +
+                   u2*(bf[1] + u*bf[2]) +
+                   u4*(bf[3] + u*bf[4] + u2*(bf[5] + u*bf[6])) +
+                   u8*(bf[7] + u*bf[8] + u2*(bf[9] + u*bf[10]) +
+                       u4*(bf[11] + u*bf[12] + u2*(bf[13] + u*bf[14]))) +
+                   u8*u8*(bf[15] + u*bf[16] + u2*bf[17])
+                )
+            }
+        }
     }
 }