Improve solver using a map instead of a vector and working Pareto extraction