renamed the calculation functions to be consistent with the order of independent, contour and fixed variables