Models of optimal avian migration: state time and predation