Added option to subset2 of whether to load the maps from files or not.
subset2 now working properly. Not counting map initializations, subset2 performs ~ 20% faster than subset, because the map of neighbors only contains valid points so it is smaller. Can it be optimized further?
Minor change.