added function combine_expected to combine expected
added calc_estimates parameter to calc_expected and changed default of same parameter in calc_derived to F