Follow-up of greedy_swap

The following discussion from !41 (merged) should be addressed:

• @eschoute started a discussion:

  I thought about this a little, would it be easier if it were symmetric? I.e. you also add the Δdistance for the new_position being swapped to current position? This would save you a second call to this function.

• maximal matching