Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
7824d88
implement HighwayNetwork for Time-Space Diagrams (#979)
liljonnystyle Jun 19, 2020
641f724
fixed h-baselines bug (#982)
AboudyKreidieh Jun 22, 2020
af0b4f6
Replicated changes in 867. Done bug (#980)
kjang96 Jun 22, 2020
b35d2a0
Merge branch 'master' of https://github.com/flow-project/flow into ak…
AboudyKreidieh Jul 6, 2020
51c192d
pydocstyle
AboudyKreidieh Jul 6, 2020
c02618f
removed crash attribute
AboudyKreidieh Jul 6, 2020
71d10de
temporary moved query
AboudyKreidieh Jul 6, 2020
c22c548
tensorflow 1.15.2
AboudyKreidieh Jul 6, 2020
805a665
bug fix
AboudyKreidieh Jul 6, 2020
dc503b4
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 7, 2020
3f439f1
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 7, 2020
98d59d2
some bug fixes
AboudyKreidieh Jul 7, 2020
c319a6c
merge custom output and failsafes to master (#981)
liljonnystyle Jul 8, 2020
baa28c7
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 8, 2020
d36da2e
add 210 edgestarts for backwards compatibility (#985)
liljonnystyle Jul 8, 2020
5e1a837
Merge branch 'master' of https://github.com/flow-project/flow into i2…
AboudyKreidieh Jul 8, 2020
b40e435
Requirements update (#963)
AboudyKreidieh Jul 8, 2020
a03a936
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
AboudyKreidieh Jul 8, 2020
4cbd750
minor
AboudyKreidieh Jul 8, 2020
cf032bd
fix merge conflict
liljonnystyle Jul 8, 2020
c5ec293
fix merge conflict
liljonnystyle Jul 8, 2020
dbfde82
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 9, 2020
0708307
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
AboudyKreidieh Jul 9, 2020
ce86fdd
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
liljonnystyle Jul 9, 2020
46c88c1
move all miles_per_* rewards to instantaneous_mpg
liljonnystyle Jul 9, 2020
e874dab
more bug fixes
AboudyKreidieh Jul 9, 2020
47ab4b7
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 9, 2020
a7d5697
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
AboudyKreidieh Jul 9, 2020
409ada3
move all miles_per_* rewards to instantaneous_mpg
liljonnystyle Jul 9, 2020
5e6b272
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
AboudyKreidieh Jul 9, 2020
1ea6898
removed irrelevant test
AboudyKreidieh Jul 9, 2020
40e2a29
re-implement energy_consumption and veh_energy_consumption with new e…
liljonnystyle Jul 9, 2020
036d9f1
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
liljonnystyle Jul 9, 2020
8866074
fix typo
liljonnystyle Jul 9, 2020
5095e17
update docstrings
liljonnystyle Jul 9, 2020
44daf06
update reward fns to new get_accel() method
liljonnystyle Jul 9, 2020
e50a211
bug fixes
AboudyKreidieh Jul 9, 2020
7a4c52d
made tests faster
AboudyKreidieh Jul 9, 2020
c08e8dc
more bug fixes
AboudyKreidieh Jul 9, 2020
9f4556c
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
AboudyKreidieh Jul 9, 2020
f6f48b9
more minor bug fixes
AboudyKreidieh Jul 9, 2020
fcb115d
some fixes to utils
AboudyKreidieh Jul 9, 2020
aad7183
Merge branch 'master' of https://github.com/flow-project/flow into ak…
AboudyKreidieh Jul 9, 2020
6946832
uncomment energy_consumption in multiagent_i210
liljonnystyle Jul 9, 2020
4582eb4
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
liljonnystyle Jul 9, 2020
b5c2b21
minor change; pass pdmcombustionengine parameters to super.init
liljonnystyle Jul 9, 2020
a59f65c
change the column order, modify the pipeline to use SUMO emission file
brentgryffindor Jul 9, 2020
e3e1f74
style fix
brentgryffindor Jul 9, 2020
df36258
style fix
brentgryffindor Jul 9, 2020
5d606a4
addressed review comments
AboudyKreidieh Jul 9, 2020
72a8208
address review comments
brentgryffindor Jul 9, 2020
69b8fee
write metadata to csv
brentgryffindor Jul 9, 2020
4d662c8
generate metadata only when to_aws
brentgryffindor Jul 9, 2020
4322f2e
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
liljonnystyle Jul 9, 2020
734419a
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
liljonnystyle Jul 9, 2020
c23cece
change apply_acceleration smoothness setting
liljonnystyle Jul 9, 2020
f93be19
reword apply_acceleration docstring
liljonnystyle Jul 9, 2020
916206c
refactor tsd to allow for axes offsets
liljonnystyle Jul 10, 2020
9d330fc
make save_csv return the file paths
brentgryffindor Jul 10, 2020
e0449f9
fix whitespace
liljonnystyle Jul 10, 2020
c53f175
revert to using edgestarts for some networks
liljonnystyle Jul 10, 2020
6022dfe
fix pydocstyle
liljonnystyle Jul 10, 2020
1e41cd7
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
liljonnystyle Jul 10, 2020
2dbdb56
fix refactor typo
liljonnystyle Jul 10, 2020
ea757d4
update time-space plotter unit tests
liljonnystyle Jul 10, 2020
9f41c72
Merge branch 'i210_dev' into ak/i210-master-merge
liljonnystyle Jul 10, 2020
32a3e87
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
liljonnystyle Jul 10, 2020
4447255
fix test_examples
brentgryffindor Jul 10, 2020
e4713bb
fix test_examples
brentgryffindor Jul 10, 2020
97faf65
update returns from import_data_from_trajectory() in tests
liljonnystyle Jul 11, 2020
0555e41
update deprecated InFlows attributes in i210 subnetwork
liljonnystyle Jul 11, 2020
c7bae51
Merge branch 'ak/i210-master-merge' of https://github.com/flow-projec…
liljonnystyle Jul 11, 2020
a781b34
pull i210_dev
liljonnystyle Jul 11, 2020
659bed8
update tsd unit test data
liljonnystyle Jul 11, 2020
a845349
update tsd unit test data
liljonnystyle Jul 11, 2020
2366239
move calculation of "start" to one place
liljonnystyle Jul 11, 2020
7d6fbf5
provide more flow params to calculate start time
liljonnystyle Jul 11, 2020
7f8a720
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
liljonnystyle Jul 11, 2020
44bc742
Merge branch 'i210_dev' of https://github.com/flow-project/flow into …
liljonnystyle Jul 11, 2020
4ca6b68
update returns from import_data_from_trajectory()
liljonnystyle Jul 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/exp_configs/non_rl/i210_subnetwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,33 +108,33 @@
veh_type="human",
edge=highway_start_edge,
vehs_per_hour=INFLOW_RATE * (1 - PENETRATION_RATE),
departLane=lane,
departSpeed=INFLOW_SPEED)
depart_lane=lane,
depart_speed=INFLOW_SPEED)

if PENETRATION_RATE > 0.0:
inflow.add(
veh_type="av",
edge=highway_start_edge,
vehs_per_hour=INFLOW_RATE * PENETRATION_RATE,
departLane=lane,
departSpeed=INFLOW_SPEED)
depart_lane=lane,
depart_speed=INFLOW_SPEED)

# on ramp
if ON_RAMP:
inflow.add(
veh_type="human",
edge="27414345",
vehs_per_hour=int(ON_RAMP_INFLOW_RATE * (1 - PENETRATION_RATE)),
departSpeed=10,
depart_speed=10,
)

if PENETRATION_RATE > 0.0:
inflow.add(
veh_type="av",
edge="27414345",
vehs_per_hour=int(ON_RAMP_INFLOW_RATE * PENETRATION_RATE),
departLane="random",
departSpeed=10)
depart_lane="random",
depart_speed=10)

# =========================================================================== #
# Generate the flow_params dict with all relevant simulation information. #
Expand Down
9 changes: 6 additions & 3 deletions flow/core/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,13 @@ def rl_actions(*_):
write_dict_to_csv(metadata_table_path, metadata, True)
tsd_main(
trajectory_table_path,
{'network': self.env.network.__class__},
{
'network': self.env.network.__class__,
'env': self.env.env_params,
'sim': self.env.sim_params
},
min_speed=0,
max_speed=10,
start=self.env.env_params.warmup_steps
max_speed=10
)
upload_to_s3(
'circles.data.pipeline',
Expand Down
Loading