Skip to content

Use * instead of comprehension #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use * instead of comprehension #272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions ciw/import_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def create_network_from_dictionary(params_input):
number_of_classes = params["number_of_classes"]
number_of_nodes = params["number_of_nodes"]
if isinstance(params["priority_classes"], dict):
preempt_priorities = [False for _ in range(number_of_nodes)]
preempt_priorities = [False] * number_of_nodes
if isinstance(params["priority_classes"], tuple):
preempt_priorities = params["priority_classes"][1]
params["priority_classes"] = {
Expand All @@ -87,7 +87,7 @@ def create_network_from_dictionary(params_input):
}
class_change_matrices = params.get(
"class_change_matrices",
[None for nd in range(number_of_nodes)],
[None] * number_of_nodes,
)
class_change_time_distributions = {clss2: {clss1: None for clss1 in params['customer_class_names']} for clss2 in params['customer_class_names']}
if 'class_change_time_distributions' in params:
Expand Down Expand Up @@ -165,28 +165,29 @@ def fill_out_dictionary(params):
class_names = sorted(params["arrival_distributions"].keys())
params["customer_class_names"] = class_names

number_of_nodes = len(params["number_of_servers"])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be number_of_servers.

default_dict = {
"name": "Simulation",
"routing": {class_name: routing.TransitionMatrix(transition_matrix=[[0.0]]) for class_name in class_names},
"number_of_nodes": len(params["number_of_servers"]),
"number_of_nodes": number_of_nodes,
"number_of_classes": len(class_names),
"queue_capacities": [float("inf") for _ in range(len(params["number_of_servers"]))],
"queue_capacities": [float("inf")] * number_of_nodes,
"priority_classes": {class_name: 0 for class_name in class_names},
"baulking_functions": {class_name: [None for _ in range(len(params["number_of_servers"]))]for class_name in class_names},
"baulking_functions": {class_name: [None] * number_of_nodes for class_name in class_names},
"batching_distributions": {class_name: [
ciw.dists.Deterministic(1) for _ in range(len(params["number_of_servers"]))
] for class_name in class_names},
"ps_thresholds": [1 for _ in range(len(params["number_of_servers"]))],
ciw.dists.Deterministic(1)
] * number_of_nodes for class_name in class_names},
"ps_thresholds": [1] * number_of_nodes,
"server_priority_functions": [
None for _ in range(len(params["number_of_servers"]))
],
None
] * number_of_nodes,
"reneging_time_distributions": {
class_name: [None for _ in range(len(params["number_of_servers"]))]
class_name: [None] * number_of_nodes
for class_name in class_names
},
"service_disciplines": [
ciw.disciplines.FIFO for _ in range(len(params["number_of_servers"]))
],
ciw.disciplines.FIFO
] * number_of_nodes,
"system_capacity": float('inf')
}

Expand Down
Loading