Update enumeration and greedy method

by Marco