diff --git a/docs/source/inputs.md b/docs/source/inputs.md index 85b88f71..3209b812 100644 --- a/docs/source/inputs.md +++ b/docs/source/inputs.md @@ -39,11 +39,6 @@ In addition to the scenario config yaml file, each scenario has several other fi ```{include} ../../nrel/hive/resources/scenarios/denver_downtown/fleets/README.md ``` -### Geofence - -```{include} ../../nrel/hive/resources/scenarios/denver_downtown/geofence/README.md -``` - ### Mechatronics ```{include} ../../nrel/hive/resources/scenarios/denver_downtown/mechatronics/README.md @@ -76,7 +71,7 @@ In addition to the scenario config yaml file, each scenario has several other fi ### Vehicles -```{include} ../../nrel/hive/resources/scenarios/denver_downtown/stations/README.md +```{include} ../../nrel/hive/resources/scenarios/denver_downtown/vehicles/README.md ``` ## Global Config diff --git a/nrel/hive/config/input.py b/nrel/hive/config/input.py index 1ddd5564..28480b98 100644 --- a/nrel/hive/config/input.py +++ b/nrel/hive/config/input.py @@ -25,7 +25,6 @@ class Input(NamedTuple): geofence_file: Optional[str] = None rate_structure_file: Optional[str] = None charging_price_file: Optional[str] = None - demand_forecast_file: Optional[str] = None fleets_file: Optional[str] = None @classmethod @@ -108,15 +107,6 @@ def from_dict(cls, d: Dict, scenario_file_path: Path, cache: Optional[Dict]) -> if d.get("charging_price_file") else None ) - demand_forecast_file = ( - fs.construct_scenario_asset_path( - d["demand_forecast_file"], - scenario_directory, - "demand_forecast", - ) - if d.get("demand_forecast_file") - else None - ) fleets_file = ( fs.construct_scenario_asset_path(d["fleets_file"], scenario_directory, "fleets") if d.get("fleets_file") @@ -137,7 +127,6 @@ def from_dict(cls, d: Dict, scenario_file_path: Path, cache: Optional[Dict]) -> "geofence_file": geofence_file, "rate_structure_file": rate_structure_file, "charging_price_file": charging_price_file, - "demand_forecast_file": demand_forecast_file, "fleets_file": fleets_file, } @@ -164,7 +153,6 @@ def from_dict(cls, d: Dict, scenario_file_path: Path, cache: Optional[Dict]) -> geofence_file=geofence_file, rate_structure_file=rate_structure_file, charging_price_file=charging_price_file, - demand_forecast_file=demand_forecast_file, fleets_file=fleets_file, ) diff --git a/nrel/hive/resources/defaults/hive_config.yaml b/nrel/hive/resources/defaults/hive_config.yaml index 28a7fe98..6a0488c3 100644 --- a/nrel/hive/resources/defaults/hive_config.yaml +++ b/nrel/hive/resources/defaults/hive_config.yaml @@ -4,7 +4,6 @@ input: geofence_file: null # default is to have no geofencing rate_structure_file: null # default is $0.00 for all services charging_price_file: null # default is $0.00 for any charging - demand_forecast_file: null # default is no demand forecasting sim: timestep_duration_seconds: 60 # default is to advance time 1 minute between dispatcher updates sim_h3_resolution: 15 # default is to store GeoIds at h3 resolution 15 (approx 1 meter hexes) diff --git a/nrel/hive/resources/mock_lobster.py b/nrel/hive/resources/mock_lobster.py index f11f84ec..f257da23 100644 --- a/nrel/hive/resources/mock_lobster.py +++ b/nrel/hive/resources/mock_lobster.py @@ -490,7 +490,6 @@ def mock_config( "rate_structure_file": "rate_structure.csv", "mechatronics_file": "mechatronics.yaml", "geofence_file": "downtown_denver.geojson", - "demand_forecast_file": "denver_demand.csv", } test_output_directory = tempfile.TemporaryDirectory() conf_without_temp_dir = HiveConfig.build( diff --git a/nrel/hive/resources/scenarios/denver_downtown/chargers/README.md b/nrel/hive/resources/scenarios/denver_downtown/chargers/README.md index 689312d0..99c29bb0 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/chargers/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/chargers/README.md @@ -1,4 +1,4 @@ -Chargers are specified as one charger per line with the following fields: +Chargers are specified as one charger per csv line with the following fields: - `charger_id`: the unique identifier of the charger type - `energy_type`: the type of energy (electric | gasoline) diff --git a/nrel/hive/resources/scenarios/denver_downtown/charging_prices/README.md b/nrel/hive/resources/scenarios/denver_downtown/charging_prices/README.md index 51c0eb54..508ce972 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/charging_prices/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/charging_prices/README.md @@ -1,4 +1,4 @@ -Charging prices can be specified in two different ways: +Charging prices are specified in a csv file and can be specified two different ways: 1. Price per station with the following fields: - `time`: the time when the price becomes valid (allows for varible price schemes) diff --git a/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/__init__.py b/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_demand.csv b/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_demand.csv deleted file mode 100644 index 4f1650b1..00000000 --- a/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_demand.csv +++ /dev/null @@ -1,1179 +0,0 @@ -sim_time,requests -1970-01-01T00:02:00,2 -1970-01-01T00:03:00,1 -1970-01-01T00:04:00,2 -1970-01-01T00:05:00,4 -1970-01-01T00:06:00,3 -1970-01-01T00:07:00,1 -1970-01-01T00:08:00,1 -1970-01-01T00:09:00,2 -1970-01-01T00:10:00,4 -1970-01-01T00:12:00,1 -1970-01-01T00:13:00,4 -1970-01-01T00:14:00,1 -1970-01-01T00:15:00,1 -1970-01-01T00:16:00,1 -1970-01-01T00:17:00,3 -1970-01-01T00:18:00,1 -1970-01-01T00:19:00,2 -1970-01-01T00:21:00,1 -1970-01-01T00:22:00,2 -1970-01-01T00:23:00,1 -1970-01-01T00:24:00,1 -1970-01-01T00:25:00,2 -1970-01-01T00:26:00,2 -1970-01-01T00:28:00,2 -1970-01-01T00:29:00,1 -1970-01-01T00:30:00,3 -1970-01-01T00:31:00,1 -1970-01-01T00:32:00,2 -1970-01-01T00:34:00,3 -1970-01-01T00:35:00,1 -1970-01-01T00:36:00,4 -1970-01-01T00:37:00,3 -1970-01-01T00:38:00,3 -1970-01-01T00:40:00,2 -1970-01-01T00:41:00,3 -1970-01-01T00:42:00,4 -1970-01-01T00:43:00,1 -1970-01-01T00:44:00,6 -1970-01-01T00:45:00,1 -1970-01-01T00:46:00,1 -1970-01-01T00:47:00,2 -1970-01-01T00:48:00,2 -1970-01-01T00:49:00,1 -1970-01-01T00:50:00,3 -1970-01-01T00:51:00,2 -1970-01-01T00:52:00,2 -1970-01-01T00:53:00,2 -1970-01-01T00:54:00,1 -1970-01-01T00:55:00,1 -1970-01-01T00:56:00,1 -1970-01-01T00:57:00,1 -1970-01-01T00:58:00,3 -1970-01-01T01:00:00,3 -1970-01-01T01:01:00,3 -1970-01-01T01:03:00,5 -1970-01-01T01:05:00,2 -1970-01-01T01:07:00,5 -1970-01-01T01:10:00,4 -1970-01-01T01:11:00,1 -1970-01-01T01:13:00,1 -1970-01-01T01:14:00,2 -1970-01-01T01:15:00,1 -1970-01-01T01:17:00,1 -1970-01-01T01:18:00,1 -1970-01-01T01:19:00,1 -1970-01-01T01:20:00,3 -1970-01-01T01:21:00,5 -1970-01-01T01:22:00,3 -1970-01-01T01:23:00,1 -1970-01-01T01:24:00,1 -1970-01-01T01:25:00,4 -1970-01-01T01:26:00,2 -1970-01-01T01:27:00,3 -1970-01-01T01:28:00,2 -1970-01-01T01:29:00,1 -1970-01-01T01:30:00,4 -1970-01-01T01:31:00,2 -1970-01-01T01:32:00,5 -1970-01-01T01:33:00,1 -1970-01-01T01:34:00,2 -1970-01-01T01:36:00,2 -1970-01-01T01:38:00,1 -1970-01-01T01:39:00,1 -1970-01-01T01:40:00,1 -1970-01-01T01:41:00,3 -1970-01-01T01:42:00,1 -1970-01-01T01:43:00,1 -1970-01-01T01:44:00,1 -1970-01-01T01:45:00,1 -1970-01-01T01:46:00,1 -1970-01-01T01:48:00,1 -1970-01-01T01:49:00,2 -1970-01-01T01:50:00,2 -1970-01-01T01:51:00,1 -1970-01-01T01:52:00,1 -1970-01-01T01:54:00,5 -1970-01-01T01:56:00,1 -1970-01-01T01:57:00,2 -1970-01-01T01:58:00,2 -1970-01-01T01:59:00,2 -1970-01-01T02:01:00,1 -1970-01-01T02:02:00,2 -1970-01-01T02:03:00,1 -1970-01-01T02:04:00,3 -1970-01-01T02:05:00,3 -1970-01-01T02:06:00,6 -1970-01-01T02:07:00,4 -1970-01-01T02:09:00,1 -1970-01-01T02:10:00,1 -1970-01-01T02:11:00,2 -1970-01-01T02:12:00,4 -1970-01-01T02:14:00,3 -1970-01-01T02:15:00,3 -1970-01-01T02:16:00,1 -1970-01-01T02:17:00,3 -1970-01-01T02:18:00,1 -1970-01-01T02:19:00,1 -1970-01-01T02:20:00,2 -1970-01-01T02:21:00,1 -1970-01-01T02:22:00,2 -1970-01-01T02:23:00,1 -1970-01-01T02:24:00,4 -1970-01-01T02:25:00,2 -1970-01-01T02:26:00,2 -1970-01-01T02:27:00,4 -1970-01-01T02:28:00,3 -1970-01-01T02:29:00,3 -1970-01-01T02:30:00,1 -1970-01-01T02:31:00,3 -1970-01-01T02:32:00,1 -1970-01-01T02:34:00,1 -1970-01-01T02:35:00,2 -1970-01-01T02:37:00,1 -1970-01-01T02:38:00,2 -1970-01-01T02:39:00,2 -1970-01-01T02:40:00,4 -1970-01-01T02:41:00,7 -1970-01-01T02:42:00,3 -1970-01-01T02:43:00,1 -1970-01-01T02:44:00,4 -1970-01-01T02:45:00,1 -1970-01-01T02:46:00,4 -1970-01-01T02:47:00,2 -1970-01-01T02:48:00,2 -1970-01-01T02:49:00,3 -1970-01-01T02:50:00,4 -1970-01-01T02:51:00,1 -1970-01-01T02:52:00,3 -1970-01-01T02:53:00,4 -1970-01-01T02:54:00,1 -1970-01-01T02:55:00,1 -1970-01-01T02:56:00,3 -1970-01-01T02:58:00,1 -1970-01-01T03:00:00,1 -1970-01-01T03:04:00,2 -1970-01-01T03:05:00,3 -1970-01-01T03:06:00,4 -1970-01-01T03:07:00,2 -1970-01-01T03:08:00,2 -1970-01-01T03:09:00,1 -1970-01-01T03:10:00,4 -1970-01-01T03:11:00,2 -1970-01-01T03:12:00,1 -1970-01-01T03:13:00,1 -1970-01-01T03:14:00,2 -1970-01-01T03:15:00,1 -1970-01-01T03:16:00,1 -1970-01-01T03:17:00,1 -1970-01-01T03:18:00,2 -1970-01-01T03:20:00,2 -1970-01-01T03:21:00,4 -1970-01-01T03:22:00,3 -1970-01-01T03:23:00,3 -1970-01-01T03:24:00,1 -1970-01-01T03:25:00,2 -1970-01-01T03:26:00,2 -1970-01-01T03:27:00,2 -1970-01-01T03:28:00,3 -1970-01-01T03:30:00,1 -1970-01-01T03:31:00,1 -1970-01-01T03:32:00,2 -1970-01-01T03:33:00,3 -1970-01-01T03:34:00,3 -1970-01-01T03:35:00,4 -1970-01-01T03:36:00,1 -1970-01-01T03:37:00,3 -1970-01-01T03:38:00,3 -1970-01-01T03:39:00,4 -1970-01-01T03:40:00,2 -1970-01-01T03:41:00,1 -1970-01-01T03:42:00,2 -1970-01-01T03:43:00,1 -1970-01-01T03:44:00,2 -1970-01-01T03:45:00,3 -1970-01-01T03:46:00,1 -1970-01-01T03:47:00,2 -1970-01-01T03:48:00,3 -1970-01-01T03:49:00,1 -1970-01-01T03:50:00,3 -1970-01-01T03:51:00,1 -1970-01-01T03:52:00,3 -1970-01-01T03:54:00,1 -1970-01-01T03:55:00,1 -1970-01-01T03:56:00,4 -1970-01-01T03:57:00,6 -1970-01-01T03:59:00,4 -1970-01-01T04:00:00,1 -1970-01-01T04:02:00,4 -1970-01-01T04:03:00,2 -1970-01-01T04:05:00,2 -1970-01-01T04:06:00,1 -1970-01-01T04:08:00,2 -1970-01-01T04:09:00,2 -1970-01-01T04:10:00,1 -1970-01-01T04:11:00,1 -1970-01-01T04:12:00,1 -1970-01-01T04:13:00,1 -1970-01-01T04:14:00,1 -1970-01-01T04:15:00,1 -1970-01-01T04:16:00,1 -1970-01-01T04:17:00,2 -1970-01-01T04:18:00,2 -1970-01-01T04:19:00,2 -1970-01-01T04:20:00,2 -1970-01-01T04:23:00,1 -1970-01-01T04:24:00,1 -1970-01-01T04:25:00,1 -1970-01-01T04:27:00,1 -1970-01-01T04:28:00,2 -1970-01-01T04:29:00,1 -1970-01-01T04:30:00,2 -1970-01-01T04:31:00,4 -1970-01-01T04:32:00,1 -1970-01-01T04:33:00,1 -1970-01-01T04:36:00,3 -1970-01-01T04:38:00,1 -1970-01-01T04:39:00,3 -1970-01-01T04:41:00,2 -1970-01-01T04:42:00,1 -1970-01-01T04:43:00,3 -1970-01-01T04:44:00,1 -1970-01-01T04:46:00,3 -1970-01-01T04:47:00,4 -1970-01-01T04:49:00,2 -1970-01-01T04:50:00,1 -1970-01-01T04:51:00,2 -1970-01-01T04:52:00,4 -1970-01-01T04:53:00,2 -1970-01-01T04:56:00,3 -1970-01-01T04:57:00,2 -1970-01-01T04:58:00,3 -1970-01-01T04:59:00,1 -1970-01-01T05:00:00,2 -1970-01-01T05:01:00,1 -1970-01-01T05:03:00,3 -1970-01-01T05:04:00,1 -1970-01-01T05:05:00,1 -1970-01-01T05:06:00,3 -1970-01-01T05:07:00,2 -1970-01-01T05:08:00,5 -1970-01-01T05:10:00,1 -1970-01-01T05:11:00,2 -1970-01-01T05:14:00,1 -1970-01-01T05:15:00,1 -1970-01-01T05:16:00,1 -1970-01-01T05:17:00,3 -1970-01-01T05:18:00,1 -1970-01-01T05:19:00,1 -1970-01-01T05:21:00,1 -1970-01-01T05:23:00,1 -1970-01-01T05:24:00,2 -1970-01-01T05:30:00,4 -1970-01-01T05:32:00,1 -1970-01-01T05:34:00,2 -1970-01-01T05:35:00,3 -1970-01-01T05:36:00,3 -1970-01-01T05:37:00,1 -1970-01-01T05:38:00,2 -1970-01-01T05:39:00,2 -1970-01-01T05:40:00,1 -1970-01-01T05:41:00,2 -1970-01-01T05:43:00,3 -1970-01-01T05:44:00,1 -1970-01-01T05:45:00,1 -1970-01-01T05:48:00,2 -1970-01-01T05:49:00,2 -1970-01-01T05:50:00,3 -1970-01-01T05:51:00,2 -1970-01-01T05:52:00,2 -1970-01-01T05:53:00,1 -1970-01-01T05:54:00,2 -1970-01-01T05:55:00,1 -1970-01-01T05:56:00,3 -1970-01-01T05:57:00,2 -1970-01-01T05:58:00,4 -1970-01-01T05:59:00,2 -1970-01-01T06:00:00,4 -1970-01-01T06:01:00,5 -1970-01-01T06:03:00,2 -1970-01-01T06:04:00,4 -1970-01-01T06:05:00,4 -1970-01-01T06:06:00,3 -1970-01-01T06:07:00,3 -1970-01-01T06:08:00,3 -1970-01-01T06:10:00,1 -1970-01-01T06:11:00,3 -1970-01-01T06:12:00,2 -1970-01-01T06:13:00,3 -1970-01-01T06:14:00,2 -1970-01-01T06:18:00,2 -1970-01-01T06:20:00,2 -1970-01-01T06:21:00,3 -1970-01-01T06:22:00,2 -1970-01-01T06:24:00,1 -1970-01-01T06:25:00,2 -1970-01-01T06:26:00,3 -1970-01-01T06:27:00,3 -1970-01-01T06:29:00,4 -1970-01-01T06:30:00,4 -1970-01-01T06:31:00,2 -1970-01-01T06:32:00,5 -1970-01-01T06:34:00,1 -1970-01-01T06:35:00,2 -1970-01-01T06:36:00,4 -1970-01-01T06:37:00,1 -1970-01-01T06:38:00,3 -1970-01-01T06:39:00,2 -1970-01-01T06:40:00,3 -1970-01-01T06:42:00,4 -1970-01-01T06:43:00,2 -1970-01-01T06:46:00,4 -1970-01-01T06:47:00,5 -1970-01-01T06:48:00,2 -1970-01-01T06:49:00,1 -1970-01-01T06:50:00,1 -1970-01-01T06:51:00,2 -1970-01-01T06:52:00,2 -1970-01-01T06:55:00,2 -1970-01-01T06:56:00,3 -1970-01-01T06:57:00,2 -1970-01-01T06:58:00,2 -1970-01-01T06:59:00,2 -1970-01-01T07:00:00,1 -1970-01-01T07:02:00,2 -1970-01-01T07:03:00,1 -1970-01-01T07:04:00,3 -1970-01-01T07:05:00,1 -1970-01-01T07:07:00,1 -1970-01-01T07:08:00,1 -1970-01-01T07:09:00,5 -1970-01-01T07:10:00,1 -1970-01-01T07:12:00,4 -1970-01-01T07:13:00,1 -1970-01-01T07:14:00,1 -1970-01-01T07:15:00,3 -1970-01-01T07:16:00,2 -1970-01-01T07:17:00,3 -1970-01-01T07:18:00,3 -1970-01-01T07:19:00,2 -1970-01-01T07:21:00,1 -1970-01-01T07:22:00,2 -1970-01-01T07:23:00,1 -1970-01-01T07:24:00,1 -1970-01-01T07:25:00,2 -1970-01-01T07:26:00,1 -1970-01-01T07:27:00,4 -1970-01-01T07:28:00,1 -1970-01-01T07:29:00,3 -1970-01-01T07:30:00,1 -1970-01-01T07:31:00,4 -1970-01-01T07:33:00,1 -1970-01-01T07:34:00,2 -1970-01-01T07:35:00,1 -1970-01-01T07:37:00,1 -1970-01-01T07:38:00,2 -1970-01-01T07:39:00,3 -1970-01-01T07:40:00,1 -1970-01-01T07:41:00,1 -1970-01-01T07:42:00,1 -1970-01-01T07:43:00,1 -1970-01-01T07:45:00,2 -1970-01-01T07:46:00,1 -1970-01-01T07:48:00,2 -1970-01-01T07:49:00,2 -1970-01-01T07:50:00,1 -1970-01-01T07:51:00,3 -1970-01-01T07:52:00,2 -1970-01-01T07:54:00,3 -1970-01-01T07:55:00,2 -1970-01-01T07:57:00,1 -1970-01-01T07:58:00,4 -1970-01-01T08:00:00,1 -1970-01-01T08:01:00,3 -1970-01-01T08:02:00,2 -1970-01-01T08:03:00,1 -1970-01-01T08:04:00,3 -1970-01-01T08:06:00,2 -1970-01-01T08:07:00,4 -1970-01-01T08:08:00,2 -1970-01-01T08:09:00,1 -1970-01-01T08:11:00,2 -1970-01-01T08:12:00,2 -1970-01-01T08:13:00,4 -1970-01-01T08:14:00,4 -1970-01-01T08:15:00,2 -1970-01-01T08:19:00,2 -1970-01-01T08:20:00,1 -1970-01-01T08:21:00,2 -1970-01-01T08:22:00,2 -1970-01-01T08:24:00,2 -1970-01-01T08:26:00,2 -1970-01-01T08:28:00,2 -1970-01-01T08:29:00,2 -1970-01-01T08:30:00,1 -1970-01-01T08:32:00,2 -1970-01-01T08:33:00,3 -1970-01-01T08:34:00,5 -1970-01-01T08:35:00,1 -1970-01-01T08:36:00,1 -1970-01-01T08:37:00,2 -1970-01-01T08:38:00,5 -1970-01-01T08:40:00,2 -1970-01-01T08:42:00,3 -1970-01-01T08:44:00,1 -1970-01-01T08:45:00,6 -1970-01-01T08:46:00,2 -1970-01-01T08:47:00,3 -1970-01-01T08:49:00,1 -1970-01-01T08:51:00,3 -1970-01-01T08:52:00,2 -1970-01-01T08:53:00,2 -1970-01-01T08:55:00,1 -1970-01-01T08:56:00,7 -1970-01-01T08:57:00,1 -1970-01-01T08:58:00,3 -1970-01-01T08:59:00,4 -1970-01-01T09:00:00,2 -1970-01-01T09:01:00,2 -1970-01-01T09:02:00,2 -1970-01-01T09:04:00,1 -1970-01-01T09:06:00,3 -1970-01-01T09:07:00,2 -1970-01-01T09:09:00,5 -1970-01-01T09:10:00,1 -1970-01-01T09:11:00,1 -1970-01-01T09:12:00,2 -1970-01-01T09:13:00,2 -1970-01-01T09:14:00,2 -1970-01-01T09:15:00,1 -1970-01-01T09:16:00,1 -1970-01-01T09:17:00,2 -1970-01-01T09:18:00,1 -1970-01-01T09:19:00,1 -1970-01-01T09:20:00,3 -1970-01-01T09:21:00,1 -1970-01-01T09:22:00,2 -1970-01-01T09:23:00,2 -1970-01-01T09:24:00,2 -1970-01-01T09:25:00,1 -1970-01-01T09:26:00,1 -1970-01-01T09:27:00,2 -1970-01-01T09:28:00,1 -1970-01-01T09:29:00,2 -1970-01-01T09:30:00,3 -1970-01-01T09:31:00,1 -1970-01-01T09:32:00,2 -1970-01-01T09:33:00,1 -1970-01-01T09:35:00,2 -1970-01-01T09:36:00,3 -1970-01-01T09:38:00,2 -1970-01-01T09:39:00,3 -1970-01-01T09:41:00,2 -1970-01-01T09:42:00,1 -1970-01-01T09:43:00,3 -1970-01-01T09:45:00,2 -1970-01-01T09:47:00,3 -1970-01-01T09:48:00,3 -1970-01-01T09:49:00,1 -1970-01-01T09:50:00,1 -1970-01-01T09:51:00,3 -1970-01-01T09:52:00,6 -1970-01-01T09:53:00,3 -1970-01-01T09:54:00,1 -1970-01-01T09:55:00,6 -1970-01-01T09:56:00,4 -1970-01-01T09:58:00,3 -1970-01-01T09:59:00,3 -1970-01-01T10:01:00,3 -1970-01-01T10:02:00,1 -1970-01-01T10:03:00,2 -1970-01-01T10:04:00,1 -1970-01-01T10:07:00,1 -1970-01-01T10:08:00,3 -1970-01-01T10:09:00,1 -1970-01-01T10:10:00,1 -1970-01-01T10:11:00,1 -1970-01-01T10:12:00,1 -1970-01-01T10:13:00,3 -1970-01-01T10:14:00,3 -1970-01-01T10:15:00,1 -1970-01-01T10:16:00,3 -1970-01-01T10:17:00,1 -1970-01-01T10:18:00,4 -1970-01-01T10:19:00,1 -1970-01-01T10:20:00,2 -1970-01-01T10:21:00,4 -1970-01-01T10:22:00,3 -1970-01-01T10:24:00,1 -1970-01-01T10:25:00,2 -1970-01-01T10:26:00,1 -1970-01-01T10:28:00,2 -1970-01-01T10:29:00,1 -1970-01-01T10:31:00,1 -1970-01-01T10:33:00,2 -1970-01-01T10:34:00,2 -1970-01-01T10:35:00,1 -1970-01-01T10:37:00,1 -1970-01-01T10:38:00,4 -1970-01-01T10:39:00,2 -1970-01-01T10:40:00,2 -1970-01-01T10:41:00,3 -1970-01-01T10:44:00,3 -1970-01-01T10:45:00,3 -1970-01-01T10:46:00,4 -1970-01-01T10:47:00,2 -1970-01-01T10:48:00,2 -1970-01-01T10:49:00,4 -1970-01-01T10:50:00,2 -1970-01-01T10:51:00,1 -1970-01-01T10:52:00,3 -1970-01-01T10:53:00,1 -1970-01-01T10:55:00,1 -1970-01-01T10:58:00,3 -1970-01-01T10:59:00,2 -1970-01-01T11:00:00,1 -1970-01-01T11:01:00,1 -1970-01-01T11:02:00,2 -1970-01-01T11:03:00,4 -1970-01-01T11:04:00,1 -1970-01-01T11:05:00,5 -1970-01-01T11:06:00,1 -1970-01-01T11:08:00,2 -1970-01-01T11:10:00,1 -1970-01-01T11:11:00,2 -1970-01-01T11:14:00,1 -1970-01-01T11:15:00,1 -1970-01-01T11:17:00,4 -1970-01-01T11:19:00,2 -1970-01-01T11:20:00,1 -1970-01-01T11:21:00,1 -1970-01-01T11:22:00,4 -1970-01-01T11:23:00,2 -1970-01-01T11:24:00,1 -1970-01-01T11:25:00,2 -1970-01-01T11:26:00,2 -1970-01-01T11:28:00,2 -1970-01-01T11:29:00,1 -1970-01-01T11:30:00,1 -1970-01-01T11:31:00,2 -1970-01-01T11:32:00,1 -1970-01-01T11:33:00,3 -1970-01-01T11:34:00,3 -1970-01-01T11:35:00,2 -1970-01-01T11:36:00,1 -1970-01-01T11:39:00,2 -1970-01-01T11:40:00,2 -1970-01-01T11:41:00,2 -1970-01-01T11:42:00,1 -1970-01-01T11:43:00,2 -1970-01-01T11:44:00,2 -1970-01-01T11:46:00,2 -1970-01-01T11:48:00,2 -1970-01-01T11:49:00,1 -1970-01-01T11:51:00,1 -1970-01-01T11:52:00,3 -1970-01-01T11:53:00,3 -1970-01-01T11:54:00,1 -1970-01-01T11:55:00,2 -1970-01-01T11:56:00,4 -1970-01-01T11:57:00,1 -1970-01-01T11:58:00,3 -1970-01-01T11:59:00,2 -1970-01-01T12:00:00,2 -1970-01-01T12:01:00,2 -1970-01-01T12:02:00,4 -1970-01-01T12:03:00,1 -1970-01-01T12:04:00,3 -1970-01-01T12:05:00,3 -1970-01-01T12:06:00,1 -1970-01-01T12:07:00,2 -1970-01-01T12:08:00,2 -1970-01-01T12:09:00,1 -1970-01-01T12:10:00,1 -1970-01-01T12:11:00,3 -1970-01-01T12:13:00,1 -1970-01-01T12:14:00,3 -1970-01-01T12:15:00,3 -1970-01-01T12:16:00,1 -1970-01-01T12:17:00,3 -1970-01-01T12:18:00,2 -1970-01-01T12:20:00,2 -1970-01-01T12:21:00,1 -1970-01-01T12:22:00,2 -1970-01-01T12:23:00,4 -1970-01-01T12:24:00,1 -1970-01-01T12:25:00,1 -1970-01-01T12:26:00,2 -1970-01-01T12:28:00,1 -1970-01-01T12:29:00,1 -1970-01-01T12:30:00,2 -1970-01-01T12:31:00,3 -1970-01-01T12:32:00,1 -1970-01-01T12:33:00,4 -1970-01-01T12:35:00,2 -1970-01-01T12:36:00,3 -1970-01-01T12:37:00,3 -1970-01-01T12:38:00,3 -1970-01-01T12:39:00,1 -1970-01-01T12:40:00,2 -1970-01-01T12:41:00,2 -1970-01-01T12:42:00,1 -1970-01-01T12:43:00,1 -1970-01-01T12:44:00,2 -1970-01-01T12:45:00,2 -1970-01-01T12:46:00,1 -1970-01-01T12:49:00,4 -1970-01-01T12:50:00,4 -1970-01-01T12:51:00,3 -1970-01-01T12:52:00,2 -1970-01-01T12:53:00,1 -1970-01-01T12:54:00,2 -1970-01-01T12:55:00,2 -1970-01-01T12:56:00,1 -1970-01-01T12:58:00,3 -1970-01-01T12:59:00,4 -1970-01-01T13:00:00,2 -1970-01-01T13:01:00,2 -1970-01-01T13:02:00,1 -1970-01-01T13:04:00,4 -1970-01-01T13:05:00,2 -1970-01-01T13:06:00,2 -1970-01-01T13:07:00,1 -1970-01-01T13:08:00,3 -1970-01-01T13:09:00,4 -1970-01-01T13:10:00,2 -1970-01-01T13:11:00,2 -1970-01-01T13:14:00,2 -1970-01-01T13:15:00,2 -1970-01-01T13:16:00,3 -1970-01-01T13:17:00,3 -1970-01-01T13:18:00,2 -1970-01-01T13:19:00,4 -1970-01-01T13:21:00,2 -1970-01-01T13:22:00,2 -1970-01-01T13:23:00,3 -1970-01-01T13:24:00,1 -1970-01-01T13:25:00,1 -1970-01-01T13:26:00,1 -1970-01-01T13:27:00,1 -1970-01-01T13:29:00,2 -1970-01-01T13:30:00,3 -1970-01-01T13:31:00,3 -1970-01-01T13:33:00,3 -1970-01-01T13:34:00,2 -1970-01-01T13:35:00,1 -1970-01-01T13:36:00,2 -1970-01-01T13:37:00,2 -1970-01-01T13:38:00,4 -1970-01-01T13:40:00,1 -1970-01-01T13:42:00,3 -1970-01-01T13:43:00,2 -1970-01-01T13:44:00,1 -1970-01-01T13:46:00,2 -1970-01-01T13:47:00,3 -1970-01-01T13:48:00,3 -1970-01-01T13:49:00,1 -1970-01-01T13:50:00,2 -1970-01-01T13:51:00,2 -1970-01-01T13:52:00,2 -1970-01-01T13:53:00,1 -1970-01-01T13:54:00,4 -1970-01-01T13:55:00,1 -1970-01-01T13:56:00,2 -1970-01-01T13:57:00,3 -1970-01-01T13:58:00,2 -1970-01-01T13:59:00,3 -1970-01-01T14:00:00,3 -1970-01-01T14:01:00,3 -1970-01-01T14:02:00,6 -1970-01-01T14:03:00,6 -1970-01-01T14:04:00,4 -1970-01-01T14:05:00,1 -1970-01-01T14:06:00,1 -1970-01-01T14:07:00,1 -1970-01-01T14:08:00,2 -1970-01-01T14:09:00,3 -1970-01-01T14:10:00,1 -1970-01-01T14:11:00,1 -1970-01-01T14:12:00,1 -1970-01-01T14:13:00,1 -1970-01-01T14:14:00,3 -1970-01-01T14:15:00,2 -1970-01-01T14:16:00,2 -1970-01-01T14:17:00,1 -1970-01-01T14:18:00,1 -1970-01-01T14:19:00,2 -1970-01-01T14:20:00,2 -1970-01-01T14:21:00,2 -1970-01-01T14:22:00,1 -1970-01-01T14:23:00,1 -1970-01-01T14:24:00,3 -1970-01-01T14:26:00,1 -1970-01-01T14:27:00,2 -1970-01-01T14:28:00,1 -1970-01-01T14:29:00,1 -1970-01-01T14:31:00,3 -1970-01-01T14:32:00,2 -1970-01-01T14:33:00,1 -1970-01-01T14:34:00,1 -1970-01-01T14:35:00,2 -1970-01-01T14:36:00,1 -1970-01-01T14:37:00,2 -1970-01-01T14:39:00,1 -1970-01-01T14:40:00,1 -1970-01-01T14:41:00,2 -1970-01-01T14:42:00,4 -1970-01-01T14:44:00,1 -1970-01-01T14:45:00,1 -1970-01-01T14:46:00,1 -1970-01-01T14:47:00,1 -1970-01-01T14:48:00,4 -1970-01-01T14:49:00,2 -1970-01-01T14:50:00,2 -1970-01-01T14:51:00,3 -1970-01-01T14:53:00,5 -1970-01-01T14:54:00,3 -1970-01-01T14:55:00,2 -1970-01-01T14:56:00,1 -1970-01-01T14:57:00,1 -1970-01-01T14:58:00,3 -1970-01-01T15:01:00,1 -1970-01-01T15:02:00,3 -1970-01-01T15:03:00,2 -1970-01-01T15:04:00,3 -1970-01-01T15:05:00,1 -1970-01-01T15:06:00,3 -1970-01-01T15:07:00,2 -1970-01-01T15:08:00,5 -1970-01-01T15:09:00,2 -1970-01-01T15:10:00,3 -1970-01-01T15:11:00,3 -1970-01-01T15:12:00,3 -1970-01-01T15:14:00,5 -1970-01-01T15:15:00,1 -1970-01-01T15:16:00,1 -1970-01-01T15:17:00,1 -1970-01-01T15:18:00,3 -1970-01-01T15:19:00,3 -1970-01-01T15:20:00,2 -1970-01-01T15:22:00,2 -1970-01-01T15:23:00,2 -1970-01-01T15:25:00,3 -1970-01-01T15:27:00,1 -1970-01-01T15:28:00,4 -1970-01-01T15:29:00,3 -1970-01-01T15:30:00,2 -1970-01-01T15:31:00,1 -1970-01-01T15:33:00,2 -1970-01-01T15:35:00,3 -1970-01-01T15:36:00,1 -1970-01-01T15:37:00,3 -1970-01-01T15:38:00,1 -1970-01-01T15:39:00,2 -1970-01-01T15:40:00,3 -1970-01-01T15:42:00,1 -1970-01-01T15:45:00,1 -1970-01-01T15:49:00,1 -1970-01-01T15:50:00,1 -1970-01-01T15:51:00,1 -1970-01-01T15:52:00,1 -1970-01-01T15:53:00,4 -1970-01-01T15:54:00,1 -1970-01-01T15:55:00,1 -1970-01-01T15:56:00,1 -1970-01-01T15:57:00,1 -1970-01-01T15:58:00,1 -1970-01-01T15:59:00,2 -1970-01-01T16:01:00,2 -1970-01-01T16:02:00,1 -1970-01-01T16:04:00,1 -1970-01-01T16:05:00,2 -1970-01-01T16:06:00,2 -1970-01-01T16:08:00,1 -1970-01-01T16:09:00,2 -1970-01-01T16:10:00,1 -1970-01-01T16:11:00,1 -1970-01-01T16:15:00,3 -1970-01-01T16:17:00,3 -1970-01-01T16:19:00,1 -1970-01-01T16:20:00,1 -1970-01-01T16:21:00,5 -1970-01-01T16:22:00,2 -1970-01-01T16:23:00,3 -1970-01-01T16:26:00,3 -1970-01-01T16:27:00,5 -1970-01-01T16:28:00,3 -1970-01-01T16:29:00,2 -1970-01-01T16:30:00,1 -1970-01-01T16:31:00,3 -1970-01-01T16:32:00,1 -1970-01-01T16:34:00,1 -1970-01-01T16:35:00,1 -1970-01-01T16:36:00,1 -1970-01-01T16:37:00,3 -1970-01-01T16:38:00,2 -1970-01-01T16:41:00,1 -1970-01-01T16:42:00,2 -1970-01-01T16:43:00,1 -1970-01-01T16:44:00,1 -1970-01-01T16:45:00,1 -1970-01-01T16:47:00,2 -1970-01-01T16:48:00,2 -1970-01-01T16:49:00,2 -1970-01-01T16:51:00,3 -1970-01-01T16:52:00,1 -1970-01-01T16:53:00,1 -1970-01-01T16:54:00,3 -1970-01-01T16:56:00,2 -1970-01-01T16:57:00,1 -1970-01-01T16:59:00,2 -1970-01-01T17:00:00,1 -1970-01-01T17:01:00,3 -1970-01-01T17:03:00,1 -1970-01-01T17:04:00,1 -1970-01-01T17:05:00,1 -1970-01-01T17:06:00,9 -1970-01-01T17:08:00,5 -1970-01-01T17:10:00,2 -1970-01-01T17:12:00,4 -1970-01-01T17:13:00,1 -1970-01-01T17:14:00,2 -1970-01-01T17:15:00,1 -1970-01-01T17:16:00,2 -1970-01-01T17:18:00,2 -1970-01-01T17:19:00,2 -1970-01-01T17:20:00,2 -1970-01-01T17:22:00,3 -1970-01-01T17:23:00,1 -1970-01-01T17:24:00,1 -1970-01-01T17:26:00,2 -1970-01-01T17:27:00,3 -1970-01-01T17:28:00,2 -1970-01-01T17:29:00,2 -1970-01-01T17:30:00,2 -1970-01-01T17:31:00,2 -1970-01-01T17:32:00,2 -1970-01-01T17:33:00,2 -1970-01-01T17:34:00,3 -1970-01-01T17:36:00,3 -1970-01-01T17:37:00,8 -1970-01-01T17:40:00,2 -1970-01-01T17:42:00,1 -1970-01-01T17:43:00,1 -1970-01-01T17:44:00,1 -1970-01-01T17:45:00,1 -1970-01-01T17:46:00,2 -1970-01-01T17:47:00,3 -1970-01-01T17:49:00,1 -1970-01-01T17:50:00,2 -1970-01-01T17:51:00,4 -1970-01-01T17:52:00,2 -1970-01-01T17:53:00,5 -1970-01-01T17:55:00,2 -1970-01-01T17:58:00,2 -1970-01-01T17:59:00,1 -1970-01-01T18:00:00,2 -1970-01-01T18:01:00,1 -1970-01-01T18:02:00,1 -1970-01-01T18:03:00,1 -1970-01-01T18:04:00,3 -1970-01-01T18:06:00,2 -1970-01-01T18:07:00,3 -1970-01-01T18:08:00,2 -1970-01-01T18:11:00,4 -1970-01-01T18:12:00,2 -1970-01-01T18:13:00,1 -1970-01-01T18:15:00,2 -1970-01-01T18:16:00,2 -1970-01-01T18:17:00,2 -1970-01-01T18:18:00,2 -1970-01-01T18:19:00,3 -1970-01-01T18:20:00,5 -1970-01-01T18:21:00,3 -1970-01-01T18:23:00,4 -1970-01-01T18:25:00,1 -1970-01-01T18:28:00,4 -1970-01-01T18:29:00,2 -1970-01-01T18:30:00,1 -1970-01-01T18:31:00,2 -1970-01-01T18:33:00,1 -1970-01-01T18:34:00,1 -1970-01-01T18:36:00,2 -1970-01-01T18:37:00,2 -1970-01-01T18:38:00,4 -1970-01-01T18:39:00,1 -1970-01-01T18:40:00,3 -1970-01-01T18:41:00,4 -1970-01-01T18:44:00,3 -1970-01-01T18:45:00,1 -1970-01-01T18:46:00,2 -1970-01-01T18:48:00,1 -1970-01-01T18:49:00,2 -1970-01-01T18:50:00,2 -1970-01-01T18:51:00,2 -1970-01-01T18:52:00,1 -1970-01-01T18:53:00,2 -1970-01-01T18:54:00,1 -1970-01-01T18:55:00,4 -1970-01-01T18:56:00,1 -1970-01-01T18:57:00,2 -1970-01-01T18:59:00,2 -1970-01-01T19:00:00,3 -1970-01-01T19:02:00,2 -1970-01-01T19:03:00,1 -1970-01-01T19:04:00,4 -1970-01-01T19:05:00,1 -1970-01-01T19:06:00,2 -1970-01-01T19:07:00,2 -1970-01-01T19:08:00,3 -1970-01-01T19:09:00,1 -1970-01-01T19:10:00,1 -1970-01-01T19:11:00,2 -1970-01-01T19:12:00,3 -1970-01-01T19:13:00,2 -1970-01-01T19:14:00,3 -1970-01-01T19:15:00,3 -1970-01-01T19:18:00,1 -1970-01-01T19:19:00,2 -1970-01-01T19:20:00,1 -1970-01-01T19:21:00,1 -1970-01-01T19:22:00,3 -1970-01-01T19:23:00,2 -1970-01-01T19:24:00,1 -1970-01-01T19:25:00,2 -1970-01-01T19:26:00,1 -1970-01-01T19:28:00,2 -1970-01-01T19:29:00,2 -1970-01-01T19:31:00,1 -1970-01-01T19:32:00,5 -1970-01-01T19:33:00,2 -1970-01-01T19:35:00,2 -1970-01-01T19:36:00,1 -1970-01-01T19:37:00,3 -1970-01-01T19:38:00,3 -1970-01-01T19:39:00,2 -1970-01-01T19:40:00,1 -1970-01-01T19:41:00,4 -1970-01-01T19:42:00,1 -1970-01-01T19:43:00,2 -1970-01-01T19:44:00,5 -1970-01-01T19:45:00,3 -1970-01-01T19:46:00,4 -1970-01-01T19:47:00,1 -1970-01-01T19:48:00,2 -1970-01-01T19:51:00,4 -1970-01-01T19:52:00,1 -1970-01-01T19:53:00,3 -1970-01-01T19:54:00,3 -1970-01-01T19:55:00,1 -1970-01-01T19:56:00,3 -1970-01-01T19:57:00,1 -1970-01-01T19:58:00,3 -1970-01-01T19:59:00,3 -1970-01-01T20:01:00,2 -1970-01-01T20:02:00,3 -1970-01-01T20:03:00,1 -1970-01-01T20:04:00,1 -1970-01-01T20:05:00,2 -1970-01-01T20:06:00,2 -1970-01-01T20:07:00,1 -1970-01-01T20:08:00,3 -1970-01-01T20:09:00,2 -1970-01-01T20:11:00,5 -1970-01-01T20:12:00,3 -1970-01-01T20:13:00,4 -1970-01-01T20:15:00,1 -1970-01-01T20:16:00,1 -1970-01-01T20:17:00,2 -1970-01-01T20:18:00,2 -1970-01-01T20:19:00,1 -1970-01-01T20:20:00,2 -1970-01-01T20:21:00,1 -1970-01-01T20:22:00,1 -1970-01-01T20:24:00,5 -1970-01-01T20:25:00,2 -1970-01-01T20:26:00,3 -1970-01-01T20:27:00,1 -1970-01-01T20:30:00,1 -1970-01-01T20:31:00,2 -1970-01-01T20:32:00,1 -1970-01-01T20:33:00,1 -1970-01-01T20:34:00,3 -1970-01-01T20:35:00,3 -1970-01-01T20:36:00,2 -1970-01-01T20:37:00,3 -1970-01-01T20:38:00,2 -1970-01-01T20:39:00,1 -1970-01-01T20:40:00,1 -1970-01-01T20:41:00,1 -1970-01-01T20:42:00,1 -1970-01-01T20:44:00,2 -1970-01-01T20:45:00,1 -1970-01-01T20:46:00,1 -1970-01-01T20:47:00,3 -1970-01-01T20:48:00,2 -1970-01-01T20:49:00,1 -1970-01-01T20:50:00,2 -1970-01-01T20:51:00,1 -1970-01-01T20:52:00,2 -1970-01-01T20:53:00,1 -1970-01-01T20:54:00,3 -1970-01-01T20:55:00,2 -1970-01-01T20:56:00,1 -1970-01-01T20:57:00,1 -1970-01-01T20:58:00,1 -1970-01-01T20:59:00,1 -1970-01-01T21:01:00,3 -1970-01-01T21:02:00,1 -1970-01-01T21:03:00,1 -1970-01-01T21:04:00,2 -1970-01-01T21:06:00,1 -1970-01-01T21:07:00,4 -1970-01-01T21:08:00,1 -1970-01-01T21:09:00,3 -1970-01-01T21:10:00,2 -1970-01-01T21:12:00,2 -1970-01-01T21:13:00,4 -1970-01-01T21:14:00,3 -1970-01-01T21:15:00,1 -1970-01-01T21:16:00,1 -1970-01-01T21:17:00,2 -1970-01-01T21:18:00,1 -1970-01-01T21:19:00,3 -1970-01-01T21:20:00,2 -1970-01-01T21:21:00,1 -1970-01-01T21:23:00,4 -1970-01-01T21:25:00,1 -1970-01-01T21:26:00,4 -1970-01-01T21:27:00,3 -1970-01-01T21:28:00,2 -1970-01-01T21:29:00,2 -1970-01-01T21:31:00,1 -1970-01-01T21:32:00,5 -1970-01-01T21:33:00,1 -1970-01-01T21:34:00,2 -1970-01-01T21:35:00,2 -1970-01-01T21:36:00,2 -1970-01-01T21:37:00,2 -1970-01-01T21:38:00,2 -1970-01-01T21:39:00,2 -1970-01-01T21:40:00,1 -1970-01-01T21:41:00,2 -1970-01-01T21:42:00,5 -1970-01-01T21:43:00,1 -1970-01-01T21:44:00,2 -1970-01-01T21:45:00,1 -1970-01-01T21:46:00,2 -1970-01-01T21:48:00,4 -1970-01-01T21:49:00,1 -1970-01-01T21:51:00,2 -1970-01-01T21:52:00,2 -1970-01-01T21:53:00,5 -1970-01-01T21:54:00,4 -1970-01-01T21:55:00,2 -1970-01-01T21:56:00,1 -1970-01-01T21:57:00,1 -1970-01-01T21:58:00,3 -1970-01-01T21:59:00,1 -1970-01-01T22:00:00,3 -1970-01-01T22:01:00,2 -1970-01-01T22:02:00,2 -1970-01-01T22:03:00,2 -1970-01-01T22:04:00,1 -1970-01-01T22:05:00,1 -1970-01-01T22:06:00,7 -1970-01-01T22:07:00,2 -1970-01-01T22:09:00,2 -1970-01-01T22:10:00,2 -1970-01-01T22:11:00,4 -1970-01-01T22:12:00,1 -1970-01-01T22:13:00,3 -1970-01-01T22:14:00,2 -1970-01-01T22:15:00,1 -1970-01-01T22:16:00,2 -1970-01-01T22:17:00,2 -1970-01-01T22:18:00,1 -1970-01-01T22:19:00,5 -1970-01-01T22:20:00,4 -1970-01-01T22:21:00,1 -1970-01-01T22:23:00,2 -1970-01-01T22:24:00,2 -1970-01-01T22:25:00,4 -1970-01-01T22:26:00,2 -1970-01-01T22:27:00,1 -1970-01-01T22:28:00,1 -1970-01-01T22:30:00,2 -1970-01-01T22:31:00,1 -1970-01-01T22:32:00,2 -1970-01-01T22:33:00,4 -1970-01-01T22:35:00,2 -1970-01-01T22:36:00,4 -1970-01-01T22:37:00,4 -1970-01-01T22:38:00,1 -1970-01-01T22:39:00,1 -1970-01-01T22:40:00,1 -1970-01-01T22:41:00,2 -1970-01-01T22:45:00,2 -1970-01-01T22:46:00,2 -1970-01-01T22:47:00,2 -1970-01-01T22:48:00,4 -1970-01-01T22:49:00,2 -1970-01-01T22:51:00,1 -1970-01-01T22:52:00,2 -1970-01-01T22:53:00,2 -1970-01-01T22:54:00,4 -1970-01-01T22:55:00,3 -1970-01-01T22:57:00,3 -1970-01-01T22:58:00,1 -1970-01-01T22:59:00,2 -1970-01-01T23:00:00,3 -1970-01-01T23:01:00,3 -1970-01-01T23:02:00,4 -1970-01-01T23:03:00,1 -1970-01-01T23:04:00,1 -1970-01-01T23:05:00,2 -1970-01-01T23:08:00,1 -1970-01-01T23:09:00,2 -1970-01-01T23:11:00,1 -1970-01-01T23:12:00,2 -1970-01-01T23:13:00,1 -1970-01-01T23:14:00,1 -1970-01-01T23:15:00,1 -1970-01-01T23:16:00,3 -1970-01-01T23:17:00,3 -1970-01-01T23:18:00,3 -1970-01-01T23:20:00,2 -1970-01-01T23:21:00,2 -1970-01-01T23:22:00,1 -1970-01-01T23:23:00,1 -1970-01-01T23:24:00,1 -1970-01-01T23:26:00,1 -1970-01-01T23:27:00,1 -1970-01-01T23:28:00,3 -1970-01-01T23:29:00,1 -1970-01-01T23:30:00,2 -1970-01-01T23:31:00,3 -1970-01-01T23:32:00,2 -1970-01-01T23:34:00,2 -1970-01-01T23:36:00,3 -1970-01-01T23:37:00,3 -1970-01-01T23:38:00,2 -1970-01-01T23:39:00,3 -1970-01-01T23:41:00,1 -1970-01-01T23:42:00,2 -1970-01-01T23:43:00,2 -1970-01-01T23:44:00,1 -1970-01-01T23:45:00,1 -1970-01-01T23:48:00,4 -1970-01-01T23:50:00,1 -1970-01-01T23:51:00,1 -1970-01-01T23:52:00,1 -1970-01-01T23:53:00,4 -1970-01-01T23:54:00,1 -1970-01-01T23:55:00,3 -1970-01-01T23:56:00,5 -1970-01-01T23:57:00,1 -1970-01-01T23:58:00,3 -1970-01-01T23:59:00,3 diff --git a/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_rl_toy_demand.csv b/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_rl_toy_demand.csv deleted file mode 100644 index 70c99b53..00000000 --- a/nrel/hive/resources/scenarios/denver_downtown/demand_forecast/denver_rl_toy_demand.csv +++ /dev/null @@ -1,2 +0,0 @@ -sim_time,requests -900,20 \ No newline at end of file diff --git a/nrel/hive/resources/scenarios/denver_downtown/denver_demo.yaml b/nrel/hive/resources/scenarios/denver_downtown/denver_demo.yaml index dbabd634..fc80478b 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/denver_demo.yaml +++ b/nrel/hive/resources/scenarios/denver_downtown/denver_demo.yaml @@ -49,18 +49,12 @@ input: # (optional) only used with `network_type: osm_network` road_network_file: downtown_denver_network.json - # (optional) outline a geofence for control purposes - geofence_file: downtown_denver.geojson - # (optional) defaults to zero cost if not specified rate_structure_file: rate_structure.csv # (optional) defaults to zero cost if not specified charging_price_file: denver_charging_prices_by_geoid.csv - # (optional) default is no demand forecasting - demand_forecast_file: denver_demand.csv - dispatcher: diff --git a/nrel/hive/resources/scenarios/denver_downtown/denver_demo_constrained_charging.yaml b/nrel/hive/resources/scenarios/denver_downtown/denver_demo_constrained_charging.yaml index b85344ad..5e590abb 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/denver_demo_constrained_charging.yaml +++ b/nrel/hive/resources/scenarios/denver_downtown/denver_demo_constrained_charging.yaml @@ -16,8 +16,6 @@ input: mechatronics_file: mechatronics.yaml charging_price_file: denver_constrained_prices.csv rate_structure_file: rate_structure.csv - geofence_file: downtown_denver.geojson - demand_forecast_file: denver_demand.csv road_network_file: downtown_denver_network.json dispatcher: valid_dispatch_states: diff --git a/nrel/hive/resources/scenarios/denver_downtown/denver_demo_fleets.yaml b/nrel/hive/resources/scenarios/denver_downtown/denver_demo_fleets.yaml index 69e2b8dd..ab6e056e 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/denver_demo_fleets.yaml +++ b/nrel/hive/resources/scenarios/denver_downtown/denver_demo_fleets.yaml @@ -13,10 +13,8 @@ input: stations_file: denver_demo_fleets_stations.csv fleets_file: denver_duel_fleets.yaml road_network_file: downtown_denver_network.json - geofence_file: downtown_denver.geojson rate_structure_file: rate_structure.csv charging_price_file: denver_charging_prices_by_geoid.csv - demand_forecast_file: denver_demand.csv dispatcher: valid_dispatch_states: - Idle diff --git a/nrel/hive/resources/scenarios/denver_downtown/denver_no_stations.yaml b/nrel/hive/resources/scenarios/denver_downtown/denver_no_stations.yaml index 4bc8ac16..d4bbfca1 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/denver_no_stations.yaml +++ b/nrel/hive/resources/scenarios/denver_downtown/denver_no_stations.yaml @@ -49,18 +49,12 @@ input: # (optional) only used with `network_type: osm_network` road_network_file: downtown_denver_network.json - # (optional) outline a geofence for control purposes - geofence_file: downtown_denver.geojson - # (optional) defaults to zero cost if not specified rate_structure_file: rate_structure.csv # (optional) defaults to zero cost if not specified charging_price_file: denver_charging_prices_by_geoid.csv - # (optional) default is no demand forecasting - demand_forecast_file: denver_demand.csv - dispatcher: # (optional) how often should we issue dispatching instructions? default_update_interval_seconds: 600 diff --git a/nrel/hive/resources/scenarios/denver_downtown/denver_rl_toy.yaml b/nrel/hive/resources/scenarios/denver_downtown/denver_rl_toy.yaml index 9f7e212c..7a31ed85 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/denver_rl_toy.yaml +++ b/nrel/hive/resources/scenarios/denver_downtown/denver_rl_toy.yaml @@ -15,8 +15,6 @@ input: mechatronics_file: denver_rl_toy_mechatronics.yaml charging_price_file: denver_charging_prices_by_geoid.csv rate_structure_file: denver_rl_toy_rate_structure.csv - demand_forecast_file: denver_rl_toy_demand.csv - geofence_file: downtown_denver.geojson dispatcher: matching_range_km_threshold: 0 diff --git a/nrel/hive/resources/scenarios/denver_downtown/fleets/README.md b/nrel/hive/resources/scenarios/denver_downtown/fleets/README.md index b3be4431..9bc3423c 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/fleets/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/fleets/README.md @@ -2,7 +2,7 @@ Fleets are specified with a yaml file. Each key represents the identifies of a fleet and then each sub key represents which entities are part of that fleet. -For example, let's say we have the fleet file: +For example, let's say we have this fleet file: ```yaml tnc_1: diff --git a/nrel/hive/resources/scenarios/denver_downtown/mechatronics/README.md b/nrel/hive/resources/scenarios/denver_downtown/mechatronics/README.md index d12b1275..49bcff63 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/mechatronics/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/mechatronics/README.md @@ -1,3 +1,46 @@ Mechatronics refers to the vehicle level parameters and is specified with a yaml file. Each key in this file refers to a mechatronics id and each sub key is a specific parameter of that mechatronics type. + +For example, let’s say we have this mechatronics file: + + +```yaml +leaf_50: + mechatronics_type: bev + powercurve_file: 'normalized.yaml' + powertrain_file: 'normalized-electric.yaml' + battery_capacity_kwh: 50 + nominal_max_charge_kw: 50 + charge_taper_cutoff_kw: 10 + nominal_watt_hour_per_mile: 225 + idle_kwh_per_hour: 0.8 + +toyota_corolla: + mechatronics_type: ice + tank_capacity_gallons: 10 + idle_gallons_per_hour: 0.2 + powertrain_file: 'normalized-gasoline.yaml' + nominal_miles_per_gallon: 30 +``` + +There are currently two supported mechatronics types: `bev` (battery electric vehicle) and `ice` (internal combustion engine). In this case, the `leaf_50` is a `bev` and requires the following sub keys: + +- `mechatronics_type`: the mechatronics type for this vehicle is `bev` +- `powercurve_file`: the powercurve file that contains the power curve for this vehicle +- `powertrain_file`: the powertrain file that contains the energy consumption model for this vehicle +- `battery_capacity_kwh`: the battery capacity in kilowatt-hours +- `nominal_max_charge_kw`: the nominal max charge in kilowatts +- `charge_taper_cutoff_kw`: the charge taper cuttoff in kilowatts +- `nominal_watt_hour_per_mile`: the nominal watt-hours per mile +- `idle_kwh_per_hour`: the amount of kilowatt-hours used per hour while idling + +The `toyota_corolla` in this case is an `ice` and requires the following sub keys: + +- `mechatronics_type`: the mechatronics type for this vehicle is `ice` +- `tank_capacity_gallons`: the vehicle's tank capacity in gallons +- `idle_gallons_per_hour`: the amount of gallons used per hour while the vehicle is idling +- `powertrain_file`: the powertrain file that contains the energy consumption model for this vehicle +- `nominal_miles_per_gallon`: the nominal miles per gallon + +A scenario can have multiple mechatronics types and each vehicle in the simulation can be assigned a mechatronics type in the vehicles file. diff --git a/nrel/hive/resources/scenarios/denver_downtown/requests/README.md b/nrel/hive/resources/scenarios/denver_downtown/requests/README.md index 2db22e16..9a86c61e 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/requests/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/requests/README.md @@ -1,4 +1,4 @@ -Requests are specified as one request per line with the following fields: +Requests are specified as one request per csv line with the following fields: - `request_id`: the unique request identifier - `o_lat`: the latitude of the request origin diff --git a/nrel/hive/resources/scenarios/denver_downtown/service_prices/README.md b/nrel/hive/resources/scenarios/denver_downtown/service_prices/README.md index be695214..05c7ced5 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/service_prices/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/service_prices/README.md @@ -1,6 +1,6 @@ Service prices are optional (the default is zero price for all requests). -If specified, the following fields are required: +Service prices are specified in a csv file and if specified, the following fields are required: - `base_price`: the base price of a request (dollars) - `price_per_mile`: an additional price per mile (dollars) - `minimum_price`: the minimum request price (dollars) \ No newline at end of file diff --git a/nrel/hive/resources/scenarios/denver_downtown/stations/README.md b/nrel/hive/resources/scenarios/denver_downtown/stations/README.md index 03df5a4a..9bf79a23 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/stations/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/stations/README.md @@ -1,4 +1,4 @@ -Stations are specified as one station per line in the file with the following fields: +Stations are specified as one station per csv line in the file with the following fields: - `station_id`: a unique identifier for the station - `lat`: the latitude of the station location diff --git a/nrel/hive/resources/scenarios/denver_downtown/vehicles/README.md b/nrel/hive/resources/scenarios/denver_downtown/vehicles/README.md index 69674932..8db86783 100644 --- a/nrel/hive/resources/scenarios/denver_downtown/vehicles/README.md +++ b/nrel/hive/resources/scenarios/denver_downtown/vehicles/README.md @@ -1,4 +1,4 @@ -Vehicles are specified as one vehicle per line with the following fields: +Vehicles are specified as one vehicle per csv line with the following fields: - `vehicle_id`: a unique id for the vehicle - `lat`: the latitude of the vehicle starting location diff --git a/nrel/hive/resources/scenarios/manhattan/demand_forecast/__init__.py b/nrel/hive/resources/scenarios/manhattan/demand_forecast/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/nrel/hive/resources/scenarios/manhattan/demand_forecast/nyc_demand.csv b/nrel/hive/resources/scenarios/manhattan/demand_forecast/nyc_demand.csv deleted file mode 100644 index a471fb93..00000000 --- a/nrel/hive/resources/scenarios/manhattan/demand_forecast/nyc_demand.csv +++ /dev/null @@ -1,1534 +0,0 @@ -sim_time,requests -0,12 -6,1 -9,1 -10,1 -11,1 -15,1 -17,1 -18,3 -20,2 -21,1 -28,1 -29,1 -32,2 -33,3 -34,1 -35,1 -36,1 -37,2 -39,4 -41,1 -43,1 -44,1 -45,1 -47,1 -48,2 -50,2 -51,1 -54,2 -57,1 -60,13 -120,9 -180,12 -240,16 -283,1 -285,1 -286,1 -287,1 -289,1 -295,2 -296,2 -297,2 -299,1 -300,8 -301,1 -302,1 -303,1 -304,1 -307,1 -309,1 -311,1 -314,2 -315,3 -317,1 -319,2 -320,1 -321,2 -322,1 -323,1 -324,1 -326,1 -329,1 -330,1 -336,1 -338,2 -339,1 -340,2 -342,2 -343,1 -345,3 -348,1 -349,1 -351,1 -352,1 -355,1 -356,2 -360,8 -361,1 -362,1 -363,2 -365,2 -366,1 -367,1 -369,1 -370,1 -371,1 -372,1 -373,1 -374,1 -377,2 -378,1 -380,2 -382,1 -384,1 -385,3 -386,1 -388,1 -391,2 -395,1 -401,1 -403,1 -404,1 -407,1 -409,2 -420,7 -480,6 -540,9 -600,8 -660,10 -720,11 -780,8 -840,8 -900,6 -960,7 -1020,11 -1080,8 -1140,11 -1200,13 -1260,5 -1320,6 -1380,14 -1440,5 -1500,9 -1560,5 -1620,12 -1680,8 -1740,10 -1800,10 -1860,8 -1920,8 -1980,8 -2040,9 -2100,3 -2160,8 -2220,7 -2280,8 -2340,6 -2400,7 -2460,10 -2520,10 -2580,5 -2640,19 -2700,8 -2760,9 -2820,10 -2880,2 -2940,6 -3000,10 -3060,12 -3120,4 -3180,15 -3240,8 -3300,10 -3360,4 -3420,7 -3480,4 -3540,4 -3600,7 -3660,11 -3720,6 -3780,8 -3840,7 -3900,7 -3960,7 -4020,7 -4080,7 -4140,4 -4200,4 -4260,5 -4320,7 -4380,11 -4440,6 -4500,6 -4560,8 -4620,5 -4680,7 -4740,5 -4800,6 -4860,9 -4920,9 -4980,7 -5040,10 -5100,11 -5160,5 -5220,6 -5280,8 -5340,7 -5400,4 -5460,6 -5520,7 -5580,9 -5640,3 -5700,8 -5760,5 -5820,2 -5880,7 -5940,6 -6000,5 -6060,7 -6120,5 -6180,3 -6240,7 -6300,5 -6360,8 -6420,7 -6480,8 -6540,5 -6600,5 -6660,4 -6720,3 -6780,5 -6840,6 -6900,10 -6960,3 -7020,5 -7080,5 -7140,2 -7200,6 -7260,7 -7320,10 -7380,6 -7440,4 -7500,6 -7560,5 -7620,7 -7680,3 -7740,6 -7860,4 -7920,4 -7980,4 -8040,6 -8100,10 -8160,4 -8220,5 -8280,6 -8340,5 -8400,1 -8460,5 -8520,8 -8580,9 -8640,4 -8700,7 -8760,7 -8820,3 -8880,1 -8940,4 -9000,7 -9060,6 -9120,9 -9180,3 -9240,2 -9300,1 -9360,4 -9420,7 -9480,7 -9540,4 -9600,4 -9660,1 -9720,3 -9780,7 -9840,4 -9900,7 -9960,2 -10020,4 -10080,6 -10140,7 -10200,3 -10260,3 -10320,2 -10380,3 -10440,4 -10500,5 -10560,3 -10620,2 -10680,6 -10740,1 -10800,7 -10860,2 -10920,6 -10980,6 -11040,3 -11100,3 -11160,4 -11220,7 -11280,2 -11340,4 -11460,2 -11520,4 -11580,6 -11640,5 -11700,2 -11760,5 -11820,1 -11880,7 -11940,4 -12000,3 -12060,3 -12120,2 -12180,4 -12240,5 -12300,2 -12360,8 -12420,4 -12480,2 -12540,3 -12600,5 -12660,6 -12720,3 -12780,2 -12840,9 -12900,8 -12960,4 -13020,3 -13080,4 -13140,4 -13200,3 -13260,1 -13320,3 -13380,4 -13440,2 -13500,5 -13560,8 -13620,3 -13680,4 -13740,1 -13800,2 -13860,2 -13920,5 -13980,4 -14040,6 -14100,3 -14160,7 -14220,6 -14280,2 -14340,9 -14400,5 -14460,6 -14520,6 -14580,5 -14640,3 -14700,9 -14760,6 -14820,2 -14880,7 -14940,2 -15000,3 -15060,6 -15120,5 -15180,4 -15240,3 -15300,4 -15360,5 -15420,5 -15480,7 -15540,2 -15600,2 -15660,3 -15720,1 -15780,6 -15840,4 -15900,3 -16020,5 -16080,1 -16140,5 -16200,3 -16260,2 -16320,3 -16380,1 -16440,3 -16500,3 -16560,1 -16620,3 -16680,9 -16740,1 -16800,3 -16860,7 -16920,3 -16980,3 -17040,2 -17100,2 -17160,3 -17220,1 -17280,1 -17340,1 -17400,3 -17460,1 -17520,2 -17580,2 -17640,1 -17700,4 -17760,2 -17820,5 -17880,1 -17940,1 -18000,2 -18060,2 -18120,3 -18180,1 -18240,2 -18300,3 -18360,1 -18420,1 -18480,3 -18540,2 -18600,2 -18660,4 -18720,4 -18780,3 -18840,2 -18900,1 -18960,2 -19020,1 -19080,2 -19140,1 -19260,1 -19320,3 -19380,2 -19440,1 -19500,4 -19560,4 -19620,1 -19680,2 -19740,3 -19800,3 -19860,1 -19920,4 -19980,2 -20040,5 -20100,3 -20160,4 -20280,5 -20340,4 -20400,3 -20460,2 -20520,4 -20640,4 -20700,2 -20760,2 -20820,5 -20880,3 -20940,2 -21060,4 -21120,3 -21180,5 -21240,2 -21300,2 -21360,1 -21420,2 -21480,4 -21600,3 -21660,1 -21720,2 -21840,4 -21900,1 -21960,4 -22020,4 -22080,2 -22140,7 -22200,6 -22260,4 -22320,5 -22380,5 -22440,5 -22500,4 -22560,5 -22620,7 -22680,5 -22740,4 -22800,5 -22860,1 -22920,7 -22980,4 -23040,4 -23100,2 -23160,3 -23220,3 -23280,3 -23340,2 -23400,8 -23460,4 -23520,2 -23580,7 -23640,9 -23700,4 -23760,6 -23820,4 -23880,2 -23940,4 -24000,7 -24060,4 -24120,5 -24180,9 -24240,9 -24300,6 -24360,10 -24420,12 -24480,8 -24540,6 -24600,9 -24660,7 -24720,6 -24780,10 -24840,12 -24900,7 -24960,7 -25020,8 -25080,6 -25140,6 -25200,7 -25260,11 -25320,10 -25380,5 -25440,7 -25500,7 -25560,2 -25620,4 -25680,4 -25740,11 -25800,6 -25860,9 -25920,6 -25980,5 -26040,3 -26100,6 -26160,7 -26220,6 -26280,8 -26340,8 -26400,8 -26460,10 -26520,7 -26580,14 -26640,7 -26700,9 -26760,2 -26820,10 -26880,10 -26940,7 -27000,7 -27060,12 -27120,8 -27180,8 -27240,7 -27300,9 -27360,5 -27420,8 -27480,8 -27540,5 -27600,13 -27660,8 -27720,9 -27780,6 -27840,9 -27900,11 -27960,11 -28020,11 -28080,13 -28140,5 -28200,15 -28260,9 -28320,5 -28380,12 -28440,9 -28500,6 -28560,12 -28620,12 -28680,7 -28740,7 -28800,11 -28860,11 -28920,11 -28980,5 -29040,2 -29100,4 -29160,12 -29220,13 -29280,12 -29340,5 -29400,15 -29460,9 -29520,11 -29580,12 -29640,10 -29700,8 -29760,11 -29820,12 -29880,9 -29940,5 -30000,13 -30060,7 -30120,7 -30180,15 -30240,6 -30300,10 -30360,13 -30420,16 -30480,8 -30540,6 -30600,9 -30660,8 -30720,13 -30780,12 -30840,17 -30900,11 -30960,7 -31020,11 -31080,16 -31140,13 -31200,16 -31260,8 -31320,16 -31380,11 -31440,13 -31500,9 -31560,15 -31620,10 -31680,11 -31740,13 -31800,11 -31860,11 -31920,8 -31980,7 -32040,23 -32100,12 -32160,8 -32220,11 -32280,8 -32340,12 -32400,17 -32460,16 -32520,18 -32580,6 -32640,7 -32700,10 -32760,10 -32820,8 -32880,14 -32940,11 -33000,8 -33060,9 -33120,8 -33180,17 -33240,16 -33300,14 -33360,9 -33420,12 -33480,14 -33540,13 -33600,11 -33660,14 -33720,10 -33780,9 -33840,10 -33900,8 -33960,13 -34020,10 -34080,12 -34140,10 -34200,10 -34260,9 -34320,10 -34380,8 -34440,9 -34500,11 -34560,11 -34620,14 -34680,9 -34740,14 -34800,8 -34860,6 -34920,9 -34980,8 -35040,9 -35100,11 -35160,8 -35220,14 -35280,10 -35340,13 -35400,13 -35460,12 -35520,10 -35580,9 -35640,12 -35700,8 -35760,6 -35820,4 -35880,8 -35940,9 -36000,7 -36060,10 -36120,13 -36180,10 -36240,10 -36300,9 -36360,14 -36420,6 -36480,9 -36540,9 -36600,9 -36660,13 -36720,9 -36780,12 -36840,12 -36900,10 -36960,14 -37020,11 -37080,10 -37140,12 -37200,8 -37260,8 -37320,7 -37380,10 -37440,10 -37500,17 -37560,12 -37620,10 -37680,8 -37740,14 -37800,16 -37860,7 -37920,12 -37980,12 -38040,4 -38100,8 -38160,9 -38220,10 -38280,9 -38340,8 -38400,10 -38460,10 -38520,13 -38580,10 -38640,10 -38700,10 -38760,11 -38820,13 -38880,12 -38940,8 -39000,14 -39060,15 -39120,16 -39180,9 -39240,9 -39300,16 -39360,15 -39420,5 -39480,10 -39540,14 -39600,11 -39660,12 -39720,10 -39780,14 -39840,9 -39900,9 -39960,13 -40020,11 -40080,15 -40140,11 -40200,11 -40260,6 -40320,5 -40380,9 -40440,10 -40500,12 -40560,16 -40620,16 -40680,8 -40740,11 -40800,13 -40860,7 -40920,7 -40980,17 -41040,10 -41100,16 -41160,8 -41220,15 -41280,14 -41340,11 -41400,7 -41460,13 -41520,14 -41580,12 -41640,12 -41700,11 -41760,13 -41820,6 -41880,11 -41940,7 -42000,11 -42060,14 -42120,16 -42180,14 -42240,11 -42300,12 -42360,17 -42420,15 -42480,13 -42540,10 -42600,15 -42660,11 -42720,19 -42780,15 -42840,9 -42900,10 -42960,7 -43020,6 -43080,5 -43140,15 -43200,9 -43260,7 -43320,8 -43380,9 -43440,6 -43500,17 -43560,15 -43620,8 -43680,9 -43740,16 -43800,17 -43860,12 -43920,6 -43980,7 -44040,13 -44100,11 -44160,11 -44220,13 -44280,8 -44340,17 -44400,14 -44460,12 -44520,15 -44580,16 -44640,9 -44700,8 -44760,6 -44820,17 -44880,18 -44940,6 -45000,13 -45060,11 -45120,15 -45180,10 -45240,8 -45300,10 -45360,13 -45420,12 -45480,13 -45540,16 -45600,10 -45660,7 -45720,17 -45780,14 -45840,6 -45900,11 -45960,10 -46020,11 -46080,12 -46140,10 -46200,14 -46260,9 -46320,10 -46380,7 -46440,10 -46500,11 -46560,10 -46620,2 -46680,13 -46740,12 -46800,13 -46860,11 -46920,6 -46980,10 -47040,11 -47100,8 -47160,13 -47220,15 -47280,14 -47340,8 -47400,11 -47460,10 -47520,16 -47580,10 -47640,9 -47700,11 -47760,13 -47820,15 -47880,10 -47940,7 -48000,14 -48060,11 -48120,7 -48180,13 -48240,10 -48300,12 -48360,13 -48420,11 -48480,17 -48540,13 -48600,9 -48660,7 -48720,14 -48780,10 -48840,12 -48900,6 -48960,17 -49020,5 -49080,11 -49140,13 -49200,9 -49260,10 -49320,13 -49380,18 -49440,12 -49500,12 -49560,12 -49620,10 -49680,13 -49740,11 -49800,12 -49860,13 -49920,7 -49980,12 -50040,18 -50100,9 -50160,16 -50220,12 -50280,9 -50340,16 -50400,17 -50460,12 -50520,11 -50580,17 -50640,17 -50700,8 -50760,15 -50820,9 -50880,17 -50940,14 -51000,13 -51060,12 -51120,11 -51180,11 -51240,10 -51300,11 -51360,17 -51420,11 -51480,12 -51540,10 -51600,9 -51660,14 -51720,16 -51780,7 -51840,20 -51900,17 -51960,13 -52020,13 -52080,8 -52140,12 -52200,14 -52260,11 -52320,18 -52380,18 -52440,15 -52500,12 -52560,13 -52620,14 -52680,9 -52740,16 -52800,9 -52860,16 -52920,12 -52980,12 -53040,11 -53100,12 -53160,11 -53220,9 -53280,15 -53340,16 -53400,17 -53460,12 -53520,9 -53580,14 -53640,14 -53700,17 -53760,4 -53820,12 -53880,4 -53940,10 -54000,15 -54060,11 -54120,9 -54180,12 -54240,18 -54300,12 -54360,16 -54420,16 -54480,4 -54540,17 -54600,9 -54660,13 -54720,16 -54780,16 -54840,12 -54900,20 -54960,5 -55020,9 -55080,8 -55140,8 -55200,14 -55260,5 -55320,12 -55380,8 -55440,11 -55500,10 -55560,11 -55620,12 -55680,8 -55740,9 -55800,15 -55860,10 -55920,16 -55980,12 -56040,16 -56100,15 -56160,8 -56220,13 -56280,19 -56340,5 -56400,12 -56460,17 -56520,11 -56580,12 -56640,12 -56700,10 -56760,11 -56820,17 -56880,13 -56940,19 -57000,11 -57060,9 -57120,15 -57180,8 -57240,13 -57300,4 -57360,11 -57420,11 -57480,11 -57540,6 -57600,9 -57660,15 -57720,15 -57780,11 -57840,11 -57900,11 -57960,10 -58020,11 -58080,10 -58140,11 -58200,13 -58260,9 -58320,11 -58380,10 -58440,10 -58500,8 -58560,6 -58620,10 -58680,9 -58740,8 -58800,4 -58860,16 -58920,9 -58980,5 -59040,7 -59100,6 -59160,3 -59220,14 -59280,5 -59340,11 -59400,13 -59460,15 -59520,9 -59580,3 -59640,8 -59700,14 -59760,8 -59820,6 -59880,8 -59940,11 -60000,4 -60060,6 -60120,5 -60180,12 -60240,8 -60300,7 -60360,10 -60420,10 -60480,9 -60540,11 -60600,11 -60660,8 -60720,9 -60780,6 -60840,9 -60900,6 -60960,11 -61020,9 -61080,7 -61140,3 -61200,6 -61260,12 -61320,12 -61380,11 -61440,12 -61500,11 -61560,20 -61620,16 -61680,10 -61740,14 -61800,11 -61860,11 -61920,9 -61980,10 -62040,13 -62100,10 -62160,16 -62220,7 -62280,11 -62340,16 -62400,16 -62460,11 -62520,12 -62580,3 -62640,15 -62700,12 -62760,11 -62820,11 -62880,13 -62940,16 -63000,17 -63060,8 -63120,12 -63180,7 -63240,8 -63300,12 -63360,16 -63420,12 -63480,8 -63540,18 -63600,7 -63660,6 -63720,14 -63780,17 -63840,10 -63900,15 -63905,1 -63960,13 -64020,13 -64080,15 -64140,15 -64200,10 -64260,13 -64320,14 -64380,19 -64440,5 -64500,11 -64560,12 -64620,13 -64680,10 -64740,18 -64800,5 -64860,17 -64920,14 -64980,15 -65040,12 -65100,10 -65160,15 -65220,19 -65280,11 -65340,15 -65400,15 -65460,10 -65520,9 -65580,18 -65640,10 -65700,13 -65760,10 -65820,22 -65880,9 -65940,8 -66000,14 -66060,11 -66120,18 -66180,10 -66240,11 -66300,8 -66360,14 -66420,10 -66480,16 -66540,14 -66600,15 -66660,14 -66720,16 -66780,16 -66840,17 -66900,7 -66960,23 -67020,15 -67080,16 -67140,9 -67200,14 -67260,11 -67320,16 -67380,20 -67440,13 -67500,14 -67560,13 -67620,21 -67680,13 -67740,19 -67800,12 -67860,16 -67920,15 -67980,11 -68040,21 -68100,13 -68160,10 -68220,17 -68280,17 -68340,18 -68400,18 -68460,17 -68520,9 -68580,9 -68640,17 -68700,19 -68760,19 -68820,13 -68880,13 -68940,17 -69000,8 -69060,18 -69120,8 -69180,23 -69240,17 -69300,8 -69360,12 -69420,14 -69480,10 -69540,17 -69600,16 -69660,16 -69720,19 -69780,14 -69840,12 -69900,19 -69960,13 -70020,13 -70080,11 -70140,10 -70200,11 -70260,14 -70320,16 -70380,11 -70440,10 -70500,17 -70560,10 -70620,13 -70680,19 -70740,13 -70800,16 -70860,12 -70920,11 -70980,17 -71040,13 -71100,18 -71160,21 -71220,13 -71280,14 -71340,12 -71400,17 -71460,14 -71520,23 -71580,20 -71640,13 -71700,16 -71760,10 -71820,21 -71880,10 -71940,12 -72000,13 -72060,13 -72120,22 -72180,14 -72240,10 -72300,17 -72360,17 -72420,21 -72480,19 -72540,22 -72600,14 -72660,12 -72720,12 -72780,11 -72840,18 -72900,13 -72960,15 -73020,24 -73080,13 -73122,1 -73140,14 -73200,6 -73260,12 -73320,18 -73380,18 -73440,19 -73500,21 -73560,28 -73620,29 -73680,27 -73740,24 -73800,30 -73860,25 -73920,21 -73980,26 -74040,25 -74100,35 -74160,29 -74220,36 -74280,28 -74340,52 -74400,26 -74460,33 -74520,34 -74580,34 -74640,34 -74700,35 -74760,40 -74820,28 -74880,20 -74940,39 -75000,39 -75060,31 -75120,44 -75180,43 -75240,52 -75300,51 -75360,59 -75420,62 -75480,70 -75540,78 -75600,78 -75660,76 -75720,86 -75780,91 -75840,60 -75900,68 -75960,77 -76020,75 -76080,77 -76140,63 -76200,102 -76260,82 -76320,87 -76380,81 -76440,81 -76500,87 -76560,72 -76620,73 -76680,90 -76740,61 -76800,63 -76860,75 -76920,74 -76980,82 -77040,86 -77100,93 -77160,81 -77220,74 -77280,66 -77340,72 -77400,55 -77460,64 -77520,58 -77580,47 -77640,25 -77700,24 -77760,22 -77820,16 -77880,8 -77940,18 -78000,11 -78060,12 -78120,26 -78180,17 -78240,9 -78300,18 -78360,18 -78420,21 -78480,21 -78540,20 -78600,19 -78660,32 -78720,16 -78780,22 -78840,23 -78900,20 -78960,22 -78974,1 -79020,38 -79080,39 -79140,30 -79200,28 -79260,19 -79320,23 -79380,17 -79440,18 -79500,7 -79560,21 -79620,16 -79680,14 -79740,15 -79800,17 -79860,16 -79920,12 -79980,10 -80040,16 -80100,12 -80160,18 -80220,14 -80280,17 -80340,11 -80400,12 -80460,16 -80520,24 -80580,20 -80640,17 -80700,22 -80760,15 -80778,1 -80820,25 -80880,25 -80940,35 -81000,28 -81060,46 -81120,26 -81180,34 -81240,27 -81300,40 -81360,37 -81420,35 -81480,37 -81523,1 -81540,32 -81600,51 -81660,36 -81720,34 -81780,30 -81840,21 -81900,34 -81960,30 -82020,36 -82080,27 -82140,42 -82200,41 -82260,32 -82320,35 -82342,1 -82380,48 -82440,57 -82500,38 -82560,50 -82620,56 -82680,50 -82740,36 -82800,55 -82860,43 -82920,50 -82980,48 -83040,44 -83100,55 -83160,47 -83220,44 -83280,48 -83340,31 -83400,38 -83460,24 -83520,31 -83580,25 -83640,22 -83700,18 -83760,23 -83820,19 -83880,23 -83940,20 -84000,23 -84060,23 -84120,27 -84180,23 -84240,29 -84300,27 -84360,34 -84420,44 -84480,36 -84540,26 -84600,32 -84660,46 -84720,49 -84780,50 -84840,53 -84900,48 -84960,69 -85020,66 -85080,57 -85140,67 -85200,69 -85260,68 -85320,62 -85380,58 -85440,58 -85500,52 -85560,50 -85620,48 -85680,39 -85740,47 -85800,42 -85860,48 -85920,44 -85980,39 -86040,42 -86100,32 -86160,34 -86220,22 -86280,36 -86340,37 \ No newline at end of file diff --git a/nrel/hive/resources/scenarios/manhattan/manhattan.yaml b/nrel/hive/resources/scenarios/manhattan/manhattan.yaml index ec8f7df0..c4a91b16 100644 --- a/nrel/hive/resources/scenarios/manhattan/manhattan.yaml +++ b/nrel/hive/resources/scenarios/manhattan/manhattan.yaml @@ -13,10 +13,8 @@ input: bases_file: nyc_bases.csv stations_file: nyc_stations.csv road_network_file: manhattan_network.json - geofence_file: nyc_single_polygon.geojson rate_structure_file: rate_structure.csv charging_price_file: nyc_fixed.csv - demand_forecast_file: nyc_demand.csv dispatcher: valid_dispatch_states: - idle