diff --git a/ch04/calculatePi.go b/ch04/calculatePi.go index bfd0e33..37cb4b1 100644 --- a/ch04/calculatePi.go +++ b/ch04/calculatePi.go @@ -26,21 +26,21 @@ func Pi(accuracy uint) *big.Float { if k > int(accuracy) { break } - t1 := float64(float64(1) / float64(10*k+9)) - k1 := new(big.Float).SetPrec(precision).SetFloat64(t1) - t2 := float64(float64(64) / float64(10*k+3)) - k2 := new(big.Float).SetPrec(precision).SetFloat64(t2) - t3 := float64(float64(32) / float64(4*k+1)) - k3 := new(big.Float).SetPrec(precision).SetFloat64(t3) + k1 := new(big.Float).SetPrec(precision) + k1.Quo(big.NewFloat(1), big.NewFloat(float64(10*k+9))) + k2 := new(big.Float).SetPrec(precision) + k2.Quo(big.NewFloat(64), big.NewFloat(float64(10*k+3))) + k3 := new(big.Float).SetPrec(precision) + k3.Quo(big.NewFloat(32), big.NewFloat(float64(4*k+1))) k1k2k3.Sub(k1, k2) k1k2k3.Sub(k1k2k3, k3) - t4 := float64(float64(4) / float64(10*k+5)) - k4 := new(big.Float).SetPrec(precision).SetFloat64(t4) - t5 := float64(float64(4) / float64(10*k+7)) - k5 := new(big.Float).SetPrec(precision).SetFloat64(t5) - t6 := float64(float64(1) / float64(4*k+3)) - k6 := new(big.Float).SetPrec(precision).SetFloat64(t6) + k4 := new(big.Float).SetPrec(precision) + k4.Quo(big.NewFloat(4), big.NewFloat(float64(10*k+5))) + k5 := new(big.Float).SetPrec(precision) + k5.Quo(big.NewFloat(4), big.NewFloat(float64(10*k+7))) + k6 := new(big.Float).SetPrec(precision) + k6.Quo(big.NewFloat(1), big.NewFloat(float64(4*k+3))) k4k5k6.Add(k4, k5) k4k5k6.Add(k4k5k6, k6) k4k5k6 = k4k5k6.Mul(k4k5k6, minusOne) @@ -54,8 +54,8 @@ func Pi(accuracy uint) *big.Float { k8 := new(big.Float).SetPrec(precision).SetFloat64(0) k8.SetInt(k8temp) - t9 := float64(256) / float64(10*k+1) - k9 := new(big.Float).SetPrec(precision).SetFloat64(t9) + k9 := new(big.Float).SetPrec(precision) + k9.Quo(big.NewFloat(256), big.NewFloat(float64(10*k+1))) k9.Add(k9, temp) total.Mul(k9, k7) total.Quo(total, k8)