Mercurial > mercurial > hgweb_golang.cgi
diff src/entai/entai.go @ 4:4c6bfc90d75c
rate fix & not consider last date
author | pyon@macmini |
---|---|
date | Tue, 18 Oct 2016 21:28:25 +0900 |
parents | ca866a38a6a0 |
children | e4066309b04f |
line wrap: on
line diff
--- a/src/entai/entai.go Sun Oct 16 09:54:33 2016 +0900 +++ b/src/entai/entai.go Tue Oct 18 21:28:25 2016 +0900 @@ -1,6 +1,6 @@ /****************************************************************************/ /* Entai.go ( ver 0.3 ) */ -/* Last Change: 2016-10-16 Sun 09:50:13. */ +/* Last Change: 2016-10-18 Tue 21:26:15. */ /* By T.Mutoh */ /****************************************************************************/ @@ -33,8 +33,8 @@ // 1カ月まで, 1カ月経過後, 元旦 createRates( 4.3, 14.6, "20120101" ) // H24 createRates( 4.3, 14.6, "20130101" ) // H25 - createRates( 4.3, 14.6, "20140101" ) // H26 - createRates( 2.9, 9.2, "20150101" ) // H27 + createRates( 2.9, 9.2, "20140101" ) // H26 + createRates( 2.8, 9.1, "20150101" ) // H27 createRates( 2.8, 9.1, "20160101" ) // H28 createRates( 2.8, 9.1, "20170101" ) // H29 ***** @@ -115,8 +115,9 @@ for j, _ := range nyds { e.yd1[j] -= e.yd0[j] } - e.yd1[len(e.yd1)-1]-- - e.ed = i - 1 + e.ed = i + //e.yd1[len(e.yd1)-1]-- // コメントアウト:最終日を参入しない + //e.ed-- // 同上 break } } @@ -156,7 +157,7 @@ for i, _ := range nyds { tmp1 := float64( e.yd0[i] ) * rate0s[i] * float64( e.tax ) / 365.0 tmp2 := float64( e.yd1[i] ) * rate1s[i] * float64( e.tax ) / 365.0 - detail += fmt.Sprintf( ": %d %d (%.0f+%.0f=%.0f)", e.yd0[i], e.yd1[i], tmp1, tmp2, tmp1 + tmp2 ) + detail += fmt.Sprintf( ": %d %d (%.1f+%.1f=%.1f)", e.yd0[i], e.yd1[i], tmp1, tmp2, tmp1 + tmp2 ) } return intrst, detail