added MAP and GMAP to evaluator