diff --git a/examples/observed_data.toml b/examples/observed_data.toml
index fbe4abe6..b822586a 100644
--- 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
index 19f0e372..e68cc239 100644
--- 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,
diff --git a/notebooks/acceptance-roadway.twb b/notebooks/acceptance-roadway.twb
index 12eab605..06668666 100644
--- a/notebooks/acceptance-roadway.twb
+++ b/notebooks/acceptance-roadway.twb
@@ -582,9 +582,6 @@
-
-
-
@@ -604,7 +601,7 @@
-
+
@@ -619,7 +616,7 @@
-
+
@@ -833,17 +830,6 @@
"81250.0-inf"
-
-
-
-
-
+
+
+
+
+
@@ -1178,6 +1175,7 @@
+
@@ -1209,7 +1207,8 @@
-
+
+
@@ -1425,10 +1424,7 @@
-
-
-
-
+
[federated.0u3lcsj12sliw51gvvfvc1enpi25].[none:time_period:nk]
@@ -1456,6 +1452,7 @@
+
@@ -1519,6 +1516,7 @@
+
@@ -1668,6 +1666,7 @@
+
@@ -1699,14 +1698,14 @@
-
+
]]>
Æ
Observed Flow:
- ]]>
+ ]]>
Æ
Simulated Flow:
]]>
@@ -2860,14 +2859,11 @@
-
-
-
-
+
@@ -2876,7 +2872,7 @@
-
+
@@ -3057,11 +3053,8 @@
-
-
-
-
+
@@ -3085,7 +3078,6 @@
-
@@ -3100,8 +3092,8 @@
-
+
@@ -3110,12 +3102,12 @@
- "[federated.0u3lcsj12sliw51gvvfvc1enpi25].[sum:Calculation_5914352234885140490:qk]"
"[federated.0u3lcsj12sliw51gvvfvc1enpi25].[sum:Calculation_2298806161870290945:qk]"
+ "[federated.0u3lcsj12sliw51gvvfvc1enpi25].[sum:Calculation_5914352234885140490:qk]"
"[federated.0u3lcsj12sliw51gvvfvc1enpi25].[sum:Error VMT (copy)_2298806161870655490:qk]"
"[federated.0u3lcsj12sliw51gvvfvc1enpi25].[usr:Calculation_1474084509196955650:qk]"
"[federated.0u3lcsj12sliw51gvvfvc1enpi25].[avg:Calculation_2298806161870094336:qk]"
- "[federated.0u3lcsj12sliw51gvvfvc1enpi25].[sum:simulated_flow_lrgt:qk]"
+ "[federated.0u3lcsj12sliw51gvvfvc1enpi25].[avg:simulated_flow_lrgt:qk]"
@@ -3207,9 +3199,6 @@
-
-
-
@@ -3220,7 +3209,7 @@
-
+
@@ -4396,9 +4385,6 @@
-
-
-
@@ -4406,7 +4392,7 @@
-
+
@@ -4467,7 +4453,7 @@