2-opt

Small modifications in the output format to make testing permutations
easier