SANDAG abm3 v15.0.0 contributions (#934)

* Reapply "fixing disaggregate accessibility bug in zone sampler"

This reverts commit de6d0ef.

* blacken

* update the proto disagg accessibility regress file

due to fixing the zone sampler bug

Author: i-am-sijia

activitysim/abm/models/disaggregate_accessibility.py

@@ -435,6 +435,12 @@ def zone_sampler(self):
                     maz_candidates = maz_candidates[
                         ~maz_candidates.MAZ.isin(maz_sample_idx)
                     ]
+
+                    # Need to make sure we sample from TAZs that still exist in the maz_candidates
+                    taz_candidates = taz_candidates[
+                        taz_candidates.index.isin(maz_candidates.TAZ)
+                    ]
+
                     # Calculate the remaining samples to collect
                     n_samples_remaining = n_samples - len(maz_sample_idx)
                     n_samples_remaining = (