Revised multi-choice goal programming