updated revenue function calculations
Merge branch 'master' of https://github.com/SIMProject/SIM.git