fix caltrans bug, tableau clean up, write reduced clean up

skip ci
BayAreaMetro · Aug 8, 2023 · f637126 · f637126
1 parent b3976c8
commit f637126
Show file tree

Hide file tree

Showing 4 changed files with 1,874 additions and 1,925 deletions.
diff --git a/examples/observed_data.toml b/examples/observed_data.toml
@@ -20,7 +20,7 @@
     pems_traffic_count_file = "PeMS/pems_period.csv"
     pems_truck_count_file = "PeMS/pems_truck_period.csv"
     caltrans_count_file = "Travel Model Two Conversion/Link21 Roadway Counts/CaltransandAlameda/Link21EMME_Caltrans_AADT_Traffic_and_Truck_alsowithAlamadaCounts.csv"
-    reduced_pems_summaries_file = "PeMS/acceptance-criteria-reduced-traffic-counts.csv"
+    reduced_pems_summaries_file = "PeMS/acceptance-criteria-reduced-traffic-counts.pickle"
     bridge_transactions_file = "bridge-transactions/Typical Weekday Transactions Statistics.csv"
-    reduced_transactions_file = "bridge-transactions/acceptance-criteria-reduced_transactions.csv"
+    reduced_transactions_file = "bridge-transactions/acceptance-criteria-reduced_transactions.pickle"
 
diff --git a/notebooks/acceptance-dev-helper.ipynb b/notebooks/acceptance-dev-helper.ipynb
@@ -9,15 +9,7 @@
     "from tm2py.acceptance.acceptance import Acceptance\n",
     "from tm2py.acceptance.canonical import Canonical\n",
     "from tm2py.acceptance.simulated import Simulated\n",
-    "from tm2py.acceptance.observed import Observed\n",
-    "\n",
-    "from pathlib import Path\n",
-    "import itertools\n",
-    "import numpy as np\n",
-    "import pandas as pd\n",
-    "import geopandas as gpd\n",
-    "import os\n",
-    "import openmatrix as omx"
+    "from tm2py.acceptance.observed import Observed"
    ]
   },
   {
@@ -72,34 +64,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 39,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
     "a.make_acceptance(make_transit=False, make_roadway=True, make_other=False)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# TODO\n",
-    "# xxx 8. add commercial vehicle counts (likely none geocoded -- ask MTC)\n",
-    "# xxx 9. fix geojson i/o\n",
-    "# 10. need to add writes to traffic count reduction and transaction reductions\n",
-    "# 11. xxx add the Link21 counts\n",
-    "#     - change pems_station_id to just station_id in observed\n",
-    "#     - bringe in the station_id to acceptance\n",
-    "#     - bring in the `source` to acceptance\n",
-    "# xxx 12. go back to transit with Shimon's correspondence file\n",
-    "# 13. bring in Sijia's PeMS conflation methods\n",
-    "# xxx 14. use commercial vehicles from Caltrans counts\n",
-    "# xxx 15. map Caltrans counts to see what is going on -- correct link ID translations?\n",
-    "# xxx 16. add bridge links to transactions map"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,