Skip to content

Commit

Permalink
TRB Revisions
Browse files Browse the repository at this point in the history
  • Loading branch information
@zackAemmer
zackAemmer committed Jun 7, 2024
1 parent 81eebfe commit f89da40
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 25 deletions.
35 changes: 13 additions & 22 deletions notebooks/cycle_sources.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,6 @@
"print(len(phone_realtime_trajectories[0].gdf))"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"phone_gnss_trajectories"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -360,7 +351,7 @@
" # Completely unprocessed trajectories\n",
" sns.lineplot(x=phone_trajectories[traj_n].gdf[\"cumul_time_s\"], y=phone_trajectories[traj_n].gdf[\"calc_speed_m_s\"]*2.23, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=phone_gnss_trajectories[traj_n].gdf[\"cumul_time_s\"], y=phone_gnss_trajectories[traj_n].gdf[\"calc_speed_m_s\"]*2.23, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=phone_realtime_trajectories[traj_n].gdf[\"cumul_time_s\"], y=phone_realtime_trajectories[traj_n].gdf[\"calc_speed_m_s\"]*2.23, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=phone_realtime_trajectories[traj_n].gdf[\"cumul_time_s\"], y=phone_realtime_trajectories[traj_n].gdf[\"calc_speed_m_s\"]*2.23, ax=ax, label=\"GTFS-RT\")\n",
"for traj_n in range(3):\n",
" ax = axes[traj_n,1]\n",
" ax.set_ylabel(\"Speed (mph)\")\n",
Expand All @@ -370,7 +361,7 @@
" # Trajectories post-processed, post-fastsim\n",
" sns.lineplot(x=sim_drive_phone.cyc.time_s, y=sim_drive_phone.cyc.mph, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_drive_gnss.cyc.time_s, y=sim_drive_gnss.cyc.mph, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_drive_realtime.cyc.time_s, y=sim_drive_realtime.cyc.mph, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_drive_realtime.cyc.time_s, y=sim_drive_realtime.cyc.mph, ax=ax, label=\"GTFS-RT\")\n",
"axes[0,0].set_title(\"Input Trip Cycles\")\n",
"axes[0,1].set_title(\"Filtered Trip Cycles\")\n",
"\n",
Expand Down Expand Up @@ -438,7 +429,7 @@
"axes = axes.flatten()\n",
"\n",
"sns.lineplot(x=phone_trajectories[2].gdf[\"cumul_time_s\"], y=phone_trajectories[2].gdf[\"calc_elev_m\"], label=\"Phone\", ax=axes[1])\n",
"sns.lineplot(x=phone_realtime_trajectories[2].gdf[\"cumul_time_s\"], y=phone_realtime_trajectories[2].gdf[\"calc_elev_m\"], label=\"Realtime\", ax=axes[1])\n",
"sns.lineplot(x=phone_realtime_trajectories[2].gdf[\"cumul_time_s\"], y=phone_realtime_trajectories[2].gdf[\"calc_elev_m\"], label=\"GTFS-RT\", ax=axes[1])\n",
"axes[1].set_ylabel(\"Elevation (m)\")\n",
"axes[1].set_xlabel(\"Time (s)\")\n",
"\n",
Expand All @@ -463,7 +454,7 @@
"\n",
"sim_phone, sim_gnss, sim_realtime = plot_res_smoothed[2]\n",
"sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.ascent_kw.cumsum() / 3600, label=\"Phone\", ax=axes)\n",
"sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ascent_kw.cumsum() / 3600, label=\"Realtime\", ax=axes)\n",
"sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ascent_kw.cumsum() / 3600, label=\"GTFS-RT\", ax=axes)\n",
"axes.set_ylabel(\"Cumulative Ascent Load (kWh)\")\n",
"axes.set_xlabel(\"Time (s)\")\n",
"fig.tight_layout()\n",
Expand All @@ -483,39 +474,39 @@
" ax = axes[0,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.ess_kw_out_ach.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.ess_kw_out_ach.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ess_kw_out_ach.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ess_kw_out_ach.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[1,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.rr_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.rr_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.rr_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.rr_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[2,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.drag_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.drag_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.drag_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.drag_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[3,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.ascent_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.ascent_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ascent_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ascent_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[4,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.aux_in_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.aux_in_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.aux_in_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.aux_in_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[5,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.ess_loss_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.ess_loss_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ess_loss_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.ess_loss_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[6,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.accel_kw.cumsum() / 3600, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.accel_kw.cumsum() / 3600, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.accel_kw.cumsum() / 3600, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.accel_kw.cumsum() / 3600, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[7,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.mph_ach, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.mph_ach, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.mph_ach, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.mph_ach, ax=ax, label=\"GTFS-RT\")\n",
" ax = axes[8,traj_n]\n",
" sns.lineplot(x=sim_phone.cyc.time_s, y=sim_phone.cyc.grade, ax=ax, label=\"Phone\")\n",
" sns.lineplot(x=sim_gnss.cyc.time_s, y=sim_gnss.cyc.grade, ax=ax, label=\"GNSS\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.cyc.grade, ax=ax, label=\"Realtime\")\n",
" sns.lineplot(x=sim_realtime.cyc.time_s, y=sim_realtime.cyc.grade, ax=ax, label=\"GTFS-RT\")\n",
"axes[0,0].set_ylabel(\"ESS Energy Consumption\")\n",
"axes[1,0].set_ylabel(\"Rolling Resistance\")\n",
"axes[2,0].set_ylabel(\"Drag\")\n",
Expand Down
6 changes: 3 additions & 3 deletions notebooks/network_energy.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,14 @@
"fig, axes = plt.subplots(1,1, figsize=(8,5))\n",
"axes2 = plt.twinx()\n",
"\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_veh_active', ax=axes, color=sns.color_palette()[0], label=\"Active\")\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_veh_inactive', ax=axes, color=sns.color_palette()[1], label=\"Inactive\")\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_veh_active', ax=axes, color=sns.color_palette()[0], label=\"Active Vehicles\")\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_veh_inactive', ax=axes, color=sns.color_palette()[1], label=\"Inactive Vehicles\")\n",
"axes.set_ylim(0,1500)\n",
"axes.set_xlabel(\"Time of Day (minutes)\")\n",
"axes.set_ylabel(\"Number of Vehicles\")\n",
"axes.legend().remove()\n",
"\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_power', ax=axes2, color=sns.color_palette()[2], label=\"Power Unmanaged\")\n",
"sns.lineplot(veh_status, x='t_min_of_day', y='tot_power', ax=axes2, color=sns.color_palette()[2], label=\"Unmanaged Power\")\n",
"axes2.axhline(y=veh_status['tot_power'].max(), linestyle='dashed', color='red')\n",
"axes2.text(x=160, y=veh_status['tot_power'].max()-.1*veh_status['tot_power'].max(), s=f\"Peak Demand: {veh_status['tot_power'].max()/1000:.1f} MW\")\n",
"axes2.set_xlabel(\"Time of Day (minutes)\")\n",
Expand Down

0 comments on commit f89da40

Please sign in to comment.