Added versions of the metric for discrete problems.
Added test for UCI Wine benchmark set