TRB revisions

notebooks/cycle_sources.ipynb

@@ -156,6 +156,15 @@
     "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,
@@ -179,7 +188,7 @@
     "    axes[i].set_xticks([])\n",
     "    axes[i].set_yticks([])\n",
     "    axes[i].set_title(ax_titles[i])\n",
-    "    cx.add_basemap(ax=axes[i], crs=phone_gnss_trajectories[i].gdf.crs.to_string(), alpha=0.4, source=cx.providers.MapBox(accessToken=os.getenv(key=\"MAPBOX_TOKEN\")))\n",
+    "    # cx.add_basemap(ax=axes[i], crs=phone_gnss_trajectories[i].gdf.crs.to_string(), alpha=0.4, source=cx.providers.MapBox(accessToken=os.getenv(key=\"MAPBOX_TOKEN\")))\n",
     "fig.suptitle(\"Validation Trajectories Recorded with Phone and GNSS Receiver\", horizontalalignment='center', verticalalignment='top')\n",
     "fig.tight_layout()\n",
     "fig.savefig(Path(\"..\",\"plots\",\"gnss_maps.png\"))\n",
@@ -309,6 +318,28 @@
     "print(f\"Percent Reduction w/Smoothing (consumption): {100*(1-rmse_phone_gnss_smooth/rmse_phone_gnss_clip)}\")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Phone/Realtime, Phone/GNSS\n",
+    "print(signal_errors_clipped)\n",
+    "print(signal_errors_smoothed)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Phone/GNSS/Realtime\n",
+    "print(consumptions_clipped)\n",
+    "print(consumptions_smoothed)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,

notebooks/network_energy.ipynb

@@ -208,6 +208,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "sns.set_style(\"ticks\")\n",
     "fig, axes = plt.subplots(1,1, figsize=(8,5))\n",
     "axes2 = plt.twinx()\n",
     "\n",
@@ -232,7 +233,8 @@
     "fig.suptitle(\"Vehicle Status by Time of Day\")\n",
     "fig.tight_layout()\n",
     "plt.show()\n",
-    "fig.savefig(Path(\"..\",\"plots\",\"kcm_veh_status.png\"))"
+    "fig.savefig(Path(\"..\",\"plots\",\"kcm_veh_status.png\"))\n",
+    "sns.set_style('darkgrid')"
    ]
   },
   {

requirements.txt

@@ -1,237 +1,132 @@
 about-time==4.2.1
-absl-py==2.1.0
 affine==2.4.0
-aiohttp==3.9.3
+aiohttp==3.9.5
 aiosignal==1.3.1
 alive-progress==3.1.5
-anyio==4.3.0
-argon2-cffi==23.1.0
-argon2-cffi-bindings==21.2.0
-arrow==1.3.0
-astropy==6.0.0
-astropy-iers-data==0.2024.2.19.0.28.47
+appnope==0.1.4
 asttokens==2.4.1
-async-lru==2.0.4
 async-timeout==4.0.3
 attrs==23.2.0
 autograd==1.6.2
-Babel==2.14.0
-beautifulsoup4==4.12.3
-bleach==6.1.0
-boto3==1.34.45
-botocore==1.34.45
-branca==0.7.1
-certifi==2024.2.2
-cffi==1.16.0
-cftime==1.6.3
+branca==0.7.2
+certifi==2024.6.2
 charset-normalizer==3.3.2
 click==8.1.7
 click-plugins==1.1.1
 cligj==0.7.2
 cma==3.2.2
-comm==0.2.1
-contextily==1.5.0
-contourpy==1.2.0
+comm==0.2.2
+contextily==1.6.0
+contourpy==1.2.1
 cycler==0.12.1
 debugpy==1.8.1
 decorator==5.1.1
-defusedxml==0.7.1
 Deprecated==1.2.14
 dill==0.3.8
-duckdb==0.9.2
 et-xmlfile==1.1.0
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
 executing==2.0.1
-fastjsonschema==2.19.1
 fastsim==2.1.2
-filelock==3.13.1
-fiona==1.9.5
-folium==0.15.1
-fonttools==4.49.0
-fqdn==1.5.1
+filelock==3.14.0
+fiona==1.9.6
+folium==0.16.0
+fonttools==4.53.0
 frozenlist==1.4.1
-fsspec==2024.2.0
-future==0.18.3
-geoarrow-c==0.1.2
-geoarrow-pyarrow==0.1.2
+fsspec==2024.6.0
+future==1.0.0
 geographiclib==2.0
-geojson==3.1.0
-geopandas==0.14.3
+geopandas==0.14.4
 geoparquet==0.0.3
 geopy==2.4.1
 grapheme==0.6.0
-grpcio==1.60.1
 gtfs_kit==6.1.0
-h11==0.14.0
-h3==4.0.0b2
-h3ronpy==0.20.0
-hatanaka==2.8.1
-haversine==2.8.1
-httpcore==1.0.3
-httpx==0.26.0
-idna==3.6
-importlib-metadata==7.0.1
-importlib-resources==6.1.1
+h3==4.0.0b5
+h3ronpy==0.20.2
+idna==3.7
+importlib_metadata==7.1.0
+importlib_resources==6.4.0
 iniconfig==2.0.0
-ipykernel==6.29.2
+ipykernel==6.29.4
 ipython==8.18.1
-ipywidgets==8.1.2
-isoduration==20.11.0
 jedi==0.19.1
-Jinja2==3.1.3
-jmespath==1.0.1
-joblib==1.3.2
+Jinja2==3.1.4
+joblib==1.4.2
 json2html==1.3.0
-json5==0.9.14
-jsonpointer==2.4
-jsonschema==4.21.1
-jsonschema-specifications==2023.12.1
-jupyter==1.0.0
-jupyter-console==6.6.3
-jupyter-events==0.9.0
-jupyter-lsp==2.2.2
-jupyter_client==8.6.0
-jupyter_core==5.7.1
-jupyter_server==2.12.5
-jupyter_server_terminals==0.5.2
-jupyterlab==4.1.1
-jupyterlab_pygments==0.3.0
-jupyterlab_server==2.25.3
-jupyterlab_widgets==3.0.10
-kaleido==0.2.1
+jupyter_client==8.6.2
+jupyter_core==5.7.2
 kiwisolver==1.4.5
-lightning==2.2.0.post0
-lightning-utilities==0.10.1
-mapclassify==2.6.1
-Markdown==3.5.2
+lightning==2.2.5
+lightning-utilities==0.11.2
 MarkupSafe==2.1.5
-matplotlib==3.8.3
-matplotlib-inline==0.1.6
+matplotlib==3.9.0
+matplotlib-inline==0.1.7
 mercantile==1.2.1
-mistune==3.0.2
 mpmath==1.3.0
 multidict==6.0.5
-nbclient==0.9.0
-nbconvert==7.16.1
-nbformat==5.9.2
-ncompress==1.0.2
 nest-asyncio==1.6.0
-netCDF4==1.6.5
 networkx==3.2.1
-notebook==7.1.0
-notebook_shim==0.2.4
 numpy==1.26.4
-nvidia-cublas-cu12==12.1.3.1
-nvidia-cuda-cupti-cu12==12.1.105
-nvidia-cuda-nvrtc-cu12==12.1.105
-nvidia-cuda-runtime-cu12==12.1.105
-nvidia-cudnn-cu12==8.9.2.26
-nvidia-cufft-cu12==11.0.2.54
-nvidia-curand-cu12==10.3.2.106
-nvidia-cusolver-cu12==11.4.5.107
-nvidia-cusparse-cu12==12.1.0.106
-nvidia-nccl-cu12==2.19.3
-nvidia-nvjitlink-cu12==12.3.101
-nvidia-nvtx-cu12==12.1.105
-openpyxl==3.1.2
-osmnx==1.9.1
-overpass==0.7
-overrides==7.7.0
-packaging==23.2
-pandas==2.2.0
-pandocfilters==1.5.1
-parso==0.8.3
+openpyxl==3.1.3
+osmnx==1.9.3
+packaging==24.0
+pandas==2.2.2
+parso==0.8.4
 patsy==0.5.6
 pexpect==4.9.0
-pillow==10.2.0
-platformdirs==4.2.0
+pillow==10.3.0
+platformdirs==4.2.2
 plotly==5.18.0
-pluggy==1.4.0
-pooch==1.8.0
-prometheus_client==0.20.0
-prompt-toolkit==3.0.43
-protobuf==4.25.3
+pluggy==1.5.0
+prompt_toolkit==3.0.46
 psutil==5.9.8
 ptyprocess==0.7.0
 pure-eval==0.2.2
-pyarrow==15.0.0
-pyarrow-hotfix==0.6
-pyarrow_ops==0.0.8
-pycountry==23.12.11
-pycparser==2.21
-pyerfa==2.0.1.1
-pyfunctional==1.4.3
-Pygments==2.17.2
-pymap3d==3.1.0
+pyarrow==16.1.0
+pycountry==24.6.1
+pyfunctional==1.5.0
+Pygments==2.18.0
 pymoo==0.6.1.1
-pyparsing==3.1.1
+pyparsing==3.1.2
 pyproj==3.6.1
-pytest==8.0.2
-python-dateutil==2.8.2
+pytest==8.2.2
+python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
-python-json-logger==2.0.7
-pytorch-lightning==2.2.0.post0
+pytorch-lightning==2.2.5
 pytz==2024.1
 PyYAML==6.0.1
-pyzmq==25.1.2
-qtconsole==5.5.1
-QtPy==2.4.1
-QuackOSM==0.4.4
-rasterio==1.3.9
-referencing==0.33.0
-requests==2.31.0
-rfc3339-validator==0.1.4
-rfc3986-validator==0.1.1
-rpds-py==0.18.0
+pyzmq==26.0.3
+rasterio==1.3.10
+requests==2.32.3
 Rtree==1.2.0
 s2==0.1.9
 s2sphere==0.2.5
-s3transfer==0.10.0
-scikit-learn==1.4.1.post1
-scipy==1.12.0
+scikit-learn==1.5.0
+scipy==1.13.1
 seaborn==0.13.2
-Send2Trash==1.8.2
-shapely==2.0.3
+shapely==2.0.4
 six==1.16.0
-sniffio==1.3.0
 snuggs==1.4.7
-soupsieve==2.5
-spherical-geometry==1.3.1
-srai==0.7.0
+srai==0.7.5
 stack-data==0.6.3
-statsmodels==0.14.1
-sympy==1.12
+statsmodels==0.14.2
+sympy==1.12.1
 tabulate==0.9.0
-tenacity==8.2.3
-tensorboard==2.16.2
-tensorboard-data-server==0.7.2
-terminado==0.18.0
-threadpoolctl==3.3.0
-tinycss2==1.2.1
+tenacity==8.3.0
+threadpoolctl==3.5.0
 tomli==2.0.1
-topojson==1.7
-torch==2.2.0
-torch-tb-profiler==0.4.3
-torchmetrics==1.3.1
-tornado==6.4
-tqdm==4.66.2
-traitlets==5.14.1
-triton==2.2.0
-typeguard==4.1.5
-types-python-dateutil==2.8.19.20240106
-typing_extensions==4.9.0
+topojson==1.9
+torch==2.3.1
+torchmetrics==1.4.0.post0
+tornado==6.4.1
+tqdm==4.66.4
+traitlets==5.14.3
+typeguard==4.3.0
+typing_extensions==4.12.1
 tzdata==2024.1
-uri-template==1.3.0
-urllib3==1.26.18
+urllib3==2.2.1
 utm==0.7.0
 wcwidth==0.2.13
-webcolors==1.13
-webencodings==0.5.1
-websocket-client==1.7.0
-Werkzeug==3.0.1
-widgetsnbextension==4.0.10
 wrapt==1.16.0
-xarray==2024.2.0
-xyzservices==2023.10.1
+xyzservices==2024.6.0
 yarl==1.9.4
-zipp==3.17.0
+zipp==3.19.2