edit calculate
revise calculate.rb
Merge branch 'revise_calculate'