Merge pull request #578 from flow-project/remove_internal_links

Remove no_internal_links
flow-project · Jul 23, 2019 · 800cbba · 800cbba
2 parents f7c9797 + a9c102d
commit 800cbba
Show file tree

Hide file tree

Showing 69 changed files with 114 additions and 224 deletions.
diff --git a/examples/aimsun/bottlenecks.py b/examples/aimsun/bottlenecks.py
@@ -81,7 +81,6 @@ def bottleneck_example(flow_rate, horizon, restart_instance=False,
     additional_net_params = {"scaling": SCALING, "speed_limit": 30/3.6}
     net_params = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     initial_config = InitialConfig(

diff --git a/examples/aimsun/grid.py b/examples/aimsun/grid.py
@@ -97,8 +97,7 @@ def grid_example(render=None):
         "horizontal_lanes": 1,
         "vertical_lanes": 1
     }
-    net_params = NetParams(
-        no_internal_links=False, additional_params=additional_net_params)
+    net_params = NetParams(additional_params=additional_net_params)
 
     initial_config = InitialConfig(spacing='custom')
 

diff --git a/examples/aimsun/merge.py b/examples/aimsun/merge.py
@@ -73,7 +73,6 @@ def merge_example(render=None):
     additional_net_params["pre_merge_length"] = 500
     net_params = params.NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     initial_config = params.InitialConfig()

diff --git a/examples/rllab/cooperative_merge.py b/examples/rllab/cooperative_merge.py
@@ -81,8 +81,7 @@ def run_task(*_):
     additional_net_params["inner_lanes"] = 1
     additional_net_params["outer_lanes"] = 1
     additional_net_params["lane_length"] = 75
-    net_params = NetParams(
-        no_internal_links=False, additional_params=additional_net_params)
+    net_params = NetParams(additional_params=additional_net_params)
 
     initial_config = InitialConfig(x0=50, spacing="uniform")
 

diff --git a/examples/rllab/figure_eight.py b/examples/rllab/figure_eight.py
@@ -57,8 +57,7 @@ def run_task(*_):
         "speed_limit": 30,
         "resolution": 40
     }
-    net_params = NetParams(
-        no_internal_links=False, additional_params=additional_net_params)
+    net_params = NetParams(additional_params=additional_net_params)
 
     initial_config = InitialConfig(spacing="uniform")
 

diff --git a/examples/rllab/green_wave.py b/examples/rllab/green_wave.py
@@ -90,7 +90,6 @@ def get_flow_params(v_enter, vehs_per_hour, col_num, row_num, add_net_params):
 
     net_params = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=add_net_params)
 
     return initial_config, net_params
@@ -121,8 +120,7 @@ def get_non_flow_params(enter_speed, add_net_params):
     additional_init_params = {'enter_speed': enter_speed}
     initial_config = InitialConfig(
         spacing='custom', additional_params=additional_init_params)
-    net_params = NetParams(
-        no_internal_links=False, additional_params=add_net_params)
+    net_params = NetParams(additional_params=add_net_params)
 
     return initial_config, net_params
 

diff --git a/examples/rllab/stabilizing_highway.py b/examples/rllab/stabilizing_highway.py
@@ -102,7 +102,6 @@ def run_task(_):
     additional_net_params["pre_merge_length"] = 500
     net_params = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     initial_config = InitialConfig(

diff --git a/examples/rllab/velocity_bottleneck.py b/examples/rllab/velocity_bottleneck.py
@@ -113,7 +113,6 @@
 additional_net_params = {"scaling": SCALING, "speed_limit": 23}
 net_params = NetParams(
     inflows=inflow,
-    no_internal_links=False,
     additional_params=additional_net_params)
 
 initial_config = InitialConfig(

diff --git a/examples/rllib/cooperative_merge.py b/examples/rllib/cooperative_merge.py
@@ -113,7 +113,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params={
             'ring_radius': 50,
             'lane_length': 75,

diff --git a/examples/rllib/figure_eight.py b/examples/rllib/figure_eight.py
@@ -81,7 +81,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params=ADDITIONAL_NET_PARAMS.copy(),
     ),
 

diff --git a/examples/rllib/green_wave.py b/examples/rllib/green_wave.py
@@ -88,7 +88,6 @@ def get_flow_params(col_num, row_num, additional_net_params):
 
     net = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     return initial, net
@@ -119,8 +118,7 @@ def get_non_flow_params(enter_speed, add_net_params):
     additional_init_params = {'enter_speed': enter_speed}
     initial = InitialConfig(
         spacing='custom', additional_params=additional_init_params)
-    net = NetParams(
-        no_internal_links=False, additional_params=add_net_params)
+    net = NetParams(additional_params=add_net_params)
 
     return initial, net
 

diff --git a/examples/rllib/multiagent_exps/multiagent_figure_eight.py b/examples/rllib/multiagent_exps/multiagent_figure_eight.py
@@ -95,7 +95,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params=deepcopy(ADDITIONAL_NET_PARAMS),
     ),
 

diff --git a/examples/rllib/multiagent_exps/multiagent_traffic_light_grid.py b/examples/rllib/multiagent_exps/multiagent_traffic_light_grid.py
@@ -116,7 +116,6 @@ def make_flow_params(n_rows, n_columns, edge_inflow):
         # scenario's documentation or ADDITIONAL_NET_PARAMS component)
         net=NetParams(
             inflows=inflow,
-            no_internal_links=False,
             additional_params={
                 "speed_limit": V_ENTER + 5,  # inherited from grid0 benchmark
                 "grid_array": {

diff --git a/examples/rllib/stabilizing_highway.py b/examples/rllib/stabilizing_highway.py
@@ -126,7 +126,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/examples/rllib/velocity_bottleneck.py b/examples/rllib/velocity_bottleneck.py
@@ -104,7 +104,6 @@
 additional_net_params = {"scaling": SCALING, "speed_limit": 23}
 net_params = NetParams(
     inflows=inflow,
-    no_internal_links=False,
     additional_params=additional_net_params)
 
 flow_params = dict(
@@ -140,7 +139,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/examples/sumo/bay_bridge.py b/examples/sumo/bay_bridge.py
@@ -160,7 +160,7 @@ def bay_bridge_example(render=None,
             departLane="0",
             departSpeed=20)  # no data for this
 
-    net_params = NetParams(inflows=inflow, no_internal_links=False)
+    net_params = NetParams(inflows=inflow)
     net_params.template = TEMPLATE
 
     # download the template from AWS

diff --git a/examples/sumo/bay_bridge_toll.py b/examples/sumo/bay_bridge_toll.py
@@ -90,8 +90,7 @@ def bay_bridge_toll_example(render=None, use_traffic_lights=False):
         departLane="random",
         departSpeed=10)
 
-    net_params = NetParams(
-        inflows=inflow, no_internal_links=False, template=TEMPLATE)
+    net_params = NetParams(inflows=inflow, template=TEMPLATE)
 
     # download the template from AWS
     if use_traffic_lights:

diff --git a/examples/sumo/bottlenecks.py b/examples/sumo/bottlenecks.py
@@ -175,7 +175,6 @@ def bottleneck_example(flow_rate, horizon, restart_instance=False,
     additional_net_params = {"scaling": SCALING, "speed_limit": 23}
     net_params = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     initial_config = InitialConfig(

diff --git a/examples/sumo/figure_eight.py b/examples/sumo/figure_eight.py
@@ -49,8 +49,7 @@ def figure_eight_example(render=None):
     env_params = EnvParams(additional_params=ADDITIONAL_ENV_PARAMS)
 
     additional_net_params = ADDITIONAL_NET_PARAMS.copy()
-    net_params = NetParams(
-        no_internal_links=False, additional_params=additional_net_params)
+    net_params = NetParams(additional_params=additional_net_params)
 
     scenario = Figure8Scenario(
         name="figure8",

diff --git a/examples/sumo/grid.py b/examples/sumo/grid.py
@@ -75,7 +75,6 @@ def get_flow_params(col_num, row_num, additional_net_params):
 
     net = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     return initial, net
@@ -106,8 +105,7 @@ def get_non_flow_params(enter_speed, add_net_params):
     additional_init_params = {'enter_speed': enter_speed}
     initial = InitialConfig(
         spacing='custom', additional_params=additional_init_params)
-    net = NetParams(
-        no_internal_links=False, additional_params=add_net_params)
+    net = NetParams(additional_params=add_net_params)
 
     return initial, net
 

diff --git a/examples/sumo/loop_merge.py b/examples/sumo/loop_merge.py
@@ -67,8 +67,7 @@ def loop_merge_example(render=None):
     additional_net_params["inner_lanes"] = 1
     additional_net_params["outer_lanes"] = 1
     additional_net_params["lane_length"] = 75
-    net_params = NetParams(
-        no_internal_links=False, additional_params=additional_net_params)
+    net_params = NetParams(additional_params=additional_net_params)
 
     initial_config = InitialConfig(
         x0=50, spacing="uniform", additional_params={"merge_bunching": 0})

diff --git a/examples/sumo/merge.py b/examples/sumo/merge.py
@@ -77,7 +77,6 @@ def merge_example(render=None):
     additional_net_params["pre_merge_length"] = 500
     net_params = NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params)
 
     initial_config = InitialConfig(spacing="uniform", perturbation=5.0)

diff --git a/examples/sumo/minicity.py b/examples/sumo/minicity.py
@@ -65,7 +65,7 @@ def minicity_example(render=None,
 
     env_params = EnvParams(additional_params=ADDITIONAL_ENV_PARAMS)
 
-    net_params = NetParams(no_internal_links=False)
+    net_params = NetParams()
 
     initial_config = InitialConfig(
         spacing="random",

diff --git a/flow/benchmarks/bottleneck0.py b/flow/benchmarks/bottleneck0.py
@@ -91,7 +91,6 @@
 additional_net_params = {"scaling": SCALING, "speed_limit": 23}
 net_params = NetParams(
     inflows=inflow,
-    no_internal_links=False,
     additional_params=additional_net_params)
 
 flow_params = dict(
@@ -127,7 +126,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/flow/benchmarks/bottleneck1.py b/flow/benchmarks/bottleneck1.py
@@ -91,7 +91,6 @@
 additional_net_params = {"scaling": SCALING, "speed_limit": 23}
 net_params = NetParams(
     inflows=inflow,
-    no_internal_links=False,
     additional_params=additional_net_params)
 
 flow_params = dict(
@@ -127,7 +126,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/flow/benchmarks/bottleneck2.py b/flow/benchmarks/bottleneck2.py
@@ -91,7 +91,6 @@
 additional_net_params = {"scaling": SCALING, "speed_limit": 23}
 net_params = NetParams(
     inflows=inflow,
-    no_internal_links=False,
     additional_params=additional_net_params)
 
 flow_params = dict(
@@ -127,7 +126,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/flow/benchmarks/figureeight0.py b/flow/benchmarks/figureeight0.py
@@ -74,7 +74,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params=deepcopy(ADDITIONAL_NET_PARAMS),
     ),
 

diff --git a/flow/benchmarks/figureeight1.py b/flow/benchmarks/figureeight1.py
@@ -75,7 +75,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params=deepcopy(ADDITIONAL_NET_PARAMS),
     ),
 

diff --git a/flow/benchmarks/figureeight2.py b/flow/benchmarks/figureeight2.py
@@ -63,7 +63,6 @@
     # network-related parameters (see flow.core.params.NetParams and the
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
-        no_internal_links=False,
         additional_params=deepcopy(ADDITIONAL_NET_PARAMS),
     ),
 

diff --git a/flow/benchmarks/grid0.py b/flow/benchmarks/grid0.py
@@ -98,7 +98,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params={
             "speed_limit": V_ENTER + 5,
             "grid_array": {

diff --git a/flow/benchmarks/grid1.py b/flow/benchmarks/grid1.py
@@ -98,7 +98,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params={
             "speed_limit": V_ENTER + 5,
             "grid_array": {

diff --git a/flow/benchmarks/merge0.py b/flow/benchmarks/merge0.py
@@ -108,7 +108,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/flow/benchmarks/merge1.py b/flow/benchmarks/merge1.py
@@ -108,7 +108,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),
 

diff --git a/flow/benchmarks/merge2.py b/flow/benchmarks/merge2.py
@@ -108,7 +108,6 @@
     # scenario's documentation or ADDITIONAL_NET_PARAMS component)
     net=NetParams(
         inflows=inflow,
-        no_internal_links=False,
         additional_params=additional_net_params,
     ),