Add year as a data item, and do the calculation with an if statement.
if ([year]=2015) then ( your 2015 calc ) else ( your 2016 calc)
if ([year]=2015) then ( your 2015 calc ) else ( your 2016 calc)
