Skip to content

Commit 8f714fd

Browse files
authored
Merge pull request #424 from SANDAG/remove_bike_skims
Remove unused bike skims in 2zoneSkim
2 parents 39c61a9 + d7a549d commit 8f714fd

1 file changed

Lines changed: 1 addition & 26 deletions

File tree

src/asim/scripts/resident/2zoneSkim.py

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
class SkimParameters:
1414
"""Configuration parameters for skim generation read from YAML file"""
1515
max_maz_maz_walk_dist_feet: int
16-
max_maz_maz_bike_dist_feet: int
1716
max_maz_local_bus_stop_walk_dist_feet: int
1817
max_maz_premium_transit_stop_walk_dist_feet: int
1918
walk_speed_mph: float
@@ -25,7 +24,6 @@ def from_yaml(cls, yaml_data: dict) -> 'SkimParameters':
2524
mmms = yaml_data['mmms']
2625
return cls(
2726
max_maz_maz_walk_dist_feet=int(mmms['max_maz_maz_walk_dist_feet']),
28-
max_maz_maz_bike_dist_feet=int(mmms['max_maz_maz_bike_dist_feet']),
2927
max_maz_local_bus_stop_walk_dist_feet=int(mmms['max_maz_local_bus_stop_walk_dist_feet']),
3028
max_maz_premium_transit_stop_walk_dist_feet=int(mmms['max_maz_premium_transit_stop_walk_dist_feet']),
3129
walk_speed_mph=float(mmms['walk_speed_mph']),
@@ -305,7 +303,7 @@ def process_transit_stops(cls, stops: pd.DataFrame, network: pdna.Network, nodes
305303
return stops
306304

307305
class SkimGenerator:
308-
"""Main class for generating walk, bike, and stop skims"""
306+
"""Main class for generating walk and stop skims"""
309307

310308
def __init__(self, network_builder: NetworkBuilder, params: SkimParameters, output_path: str):
311309
self.network_builder = network_builder
@@ -327,13 +325,6 @@ def generate_maz_maz_walk_skim(self) -> pd.DataFrame:
327325
walk_skim = self._convert_columns_to_type(walk_skim, {'OMAZ': 'uint16', 'DMAZ': 'uint16', 'i': 'uint16', 'j': 'uint16'})
328326
return walk_skim
329327

330-
def generate_maz_maz_bike_skim(self) -> pd.DataFrame:
331-
"""Generate MAZ to MAZ bike skims"""
332-
maz_pairs = self._create_maz_pairs(self.net_centroids)
333-
bike_skim = self._get_bike_distances(maz_pairs, self.params.max_maz_maz_bike_dist_feet)
334-
bike_skim = self._convert_columns_to_type(bike_skim, {'OMAZ': 'uint16', 'DMAZ': 'uint16'})
335-
return bike_skim
336-
337328
def generate_maz_stop_walk_skim(self) -> pd.DataFrame:
338329
"""Generate MAZ to stop walk skims"""
339330
maz_stop_pairs, maz_stop_output = self._create_maz_stop_pairs(self.net_centroids, self.stops)
@@ -424,18 +415,6 @@ def _get_walk_distances(self, pairs: pd.DataFrame, max_dist: float) -> pd.DataFr
424415

425416
return result
426417

427-
def _get_bike_distances(self, pairs: pd.DataFrame, max_dist: float) -> pd.DataFrame:
428-
"""Process bike distances between MAZ pairs"""
429-
filtered = pairs[pairs["DISTWALK"] <= max_dist / 5280.0].copy()
430-
filtered["DISTBIKE"] = self.network_builder.network.shortest_path_lengths(
431-
filtered["OMAZ_NODE"].values, filtered["DMAZ_NODE"].values)
432-
result = filtered[filtered["DISTBIKE"] <= max_dist / 5280.0]
433-
434-
# Add missing MAZs
435-
result = self._add_missing_mazs(self.net_centroids, result, pairs, 'DISTBIKE')
436-
437-
return result
438-
439418
def _get_stop_distances(self, pairs: pd.DataFrame) -> pd.DataFrame:
440419
"""Process stop distances between MAZ pairs"""
441420
filtered = pairs[(pairs["DISTANCE"] <= self.params.max_maz_local_bus_stop_walk_dist_feet / 5280.0) & (pairs['MODE'] == 'L') |
@@ -565,10 +544,6 @@ def main(path: str):
565544
walk_skim = skim_generator.generate_maz_maz_walk_skim()
566545
walk_skim.to_csv(os.path.join(output_path, config['mmms']['maz_maz_walk_output']), index=False)
567546

568-
print(f"{datetime.now().strftime('%H:%M:%S')} Generating MAZ-MAZ bike skims...")
569-
bike_skim = skim_generator.generate_maz_maz_bike_skim()
570-
bike_skim.to_csv(os.path.join(output_path, config['mmms']['maz_maz_bike_output']), index=False)
571-
572547
print(f"{datetime.now().strftime('%H:%M:%S')} Generating MAZ-stop walk skims...")
573548
stop_skim = skim_generator.generate_maz_stop_walk_skim()
574549
stop_skim.to_csv(os.path.join(output_path, "maz_stop_walk.csv"), index=False)

0 commit comments

Comments
 (0)