Added Calculator interface to CalcModel to group RevPolishCalc and StandardCalc evaluates toghether. This is the last feature of the model assembly.