Update calc.cpp

using branch Shweta  Files merged.