Skip to content

Commit 973d44a

Browse files
committed
indices to remove False doesn't work
1 parent 7dd657e commit 973d44a

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

rt_segment_speeds/scripts/model_speeds_every100.py

+16-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def grab_arrays_by_trip(df, meters_interval: int):
4747
def get_speeds_every_interval(
4848
one_trip_distance_arr,
4949
one_trip_timestamp_arr,
50-
intervaled_distance_cutoffs
50+
intervaled_distance_cutoffs,
5151
):
5252

5353
one_trip_speed_series = []
@@ -87,6 +87,8 @@ def grab_arrays_by_trip2(
8787

8888
one_trip_distance_arr = getattr(row, "interpolated_distances")
8989
one_trip_timestamp_arr = getattr(row, "resampled_timestamps")
90+
should_calculate = np.array(getattr(row, "stop_meters_increasing"))
91+
9092

9193
start_dist = int(np.floor(one_trip_distance_arr).min())
9294
end_dist = int(np.ceil(one_trip_distance_arr).max())
@@ -97,26 +99,32 @@ def grab_arrays_by_trip2(
9799

98100
elif distance_type == "stop_to_stop":
99101
intervaled_distance_cutoffs = getattr(row, intervaled_distance_column_or_meters)
100-
102+
#do_not_calculate_indices = np.where(should_calculate == False)[0]
103+
101104
speeds_for_trip = get_speeds_every_interval(
102105
one_trip_distance_arr,
103106
one_trip_timestamp_arr,
104-
intervaled_distance_cutoffs
107+
intervaled_distance_cutoffs,
105108
)
106-
speed_series.append(speeds_for_trip)
107-
109+
110+
#if len(do_not_calculate_indices) > 0:
111+
# speeds_for_trip[do_not_calculate_indices] = np.nan
112+
108113

109114
if distance_type == "equal_intervals":
110115
intervaled_cutoffs.append(intervaled_distance_cutoffs)
111116
keep_cols = ["intervaled_meters", "speeds"]
112117
elif distance_type == "stop_to_stop":
113118
keep_cols = ["speeds", "stop_sequence"]
114-
119+
120+
speed_series.append(speeds_for_trip)
121+
115122
if distance_type == "equal_intervals":
116123
df2 = df.assign(
117124
intervaled_meters = intervaled_cutoffs,
118125
speeds = speed_series
119126
)
127+
120128
elif distance_type == "stop_to_stop":
121129
df2 = df.assign(
122130
speeds = speed_series
@@ -166,7 +174,7 @@ def grab_arrays_by_trip2(
166174
stop_time_cutoffs = pd.read_parquet(
167175
f"{SEGMENT_GCS}stop_times_projected_{analysis_date}.parquet",
168176
filters = [[("trip_instance_key", "in", subset_trips)]],
169-
columns = ["trip_instance_key", "stop_sequence", "stop_meters"]
177+
columns = ["trip_instance_key", "stop_sequence", "stop_meters", "stop_meters_increasing"]
170178
)
171179

172180
gdf = pd.merge(
@@ -179,7 +187,7 @@ def grab_arrays_by_trip2(
179187
results = grab_arrays_by_trip2(
180188
gdf,
181189
distance_type = "stop_to_stop",
182-
intervaled_distance_column_or_meters = "stop_meters"
190+
intervaled_distance_column_or_meters = "stop_meters",
183191
)
184192

185193
results.to_parquet(

0 commit comments

Comments
 (0)