Update calc.cpp

using branch Anjali ... Files merged