Correct guard macro
Make TSP size configurable