|
1 | 1 | from __future__ import division
|
2 | 2 | import os
|
3 |
| -from random import (random, expovariate, uniform, triangular, |
4 |
| - gammavariate, gauss, lognormvariate, weibullvariate) |
| 3 | +import tqdm |
| 4 | +from random import (expovariate, uniform, triangular, gammavariate, |
| 5 | + lognormvariate, weibullvariate) |
5 | 6 | from csv import writer, reader
|
6 |
| -import copy |
7 |
| -from decimal import Decimal, getcontext |
| 7 | +from decimal import getcontext |
8 | 8 | from collections import namedtuple
|
9 | 9 |
|
10 |
| -import tqdm |
11 |
| -import yaml |
12 | 10 | import numpy.random as nprandom
|
13 | 11 |
|
14 | 12 | from .node import Node
|
15 | 13 | from .exactnode import ExactNode, ExactArrivalNode
|
16 | 14 | from .arrival_node import ArrivalNode
|
17 | 15 | from .exit_node import ExitNode
|
18 |
| -from .server import Server |
19 |
| -from .individual import Individual |
20 |
| -from .data_record import DataRecord |
21 | 16 | from .state_tracker import *
|
22 | 17 | from .deadlock_detector import *
|
23 | 18 |
|
@@ -86,31 +81,6 @@ def choose_tracker(self, tracker, deadlock_detector):
|
86 | 81 | return NaiveTracker(self)
|
87 | 82 | return StateTracker(self)
|
88 | 83 |
|
89 |
| - def detect_deadlock(self): |
90 |
| - """ |
91 |
| - Detects whether the system is in a deadlocked state, |
92 |
| - that is, is there a knot. Note that this code is taken |
93 |
| - and adapted from the NetworkX Developer Zone Ticket |
94 |
| - #663 knot.py (09/06/2015) |
95 |
| - """ |
96 |
| - knots = [] |
97 |
| - for subgraph in nx.strongly_connected_component_subgraphs(self.digraph): |
98 |
| - nodes = set(subgraph.nodes()) |
99 |
| - if len(nodes) == 1: |
100 |
| - n = nodes.pop() |
101 |
| - nodes.add(n) |
102 |
| - if set(self.digraph.successors(n)) == nodes: |
103 |
| - knots.append(subgraph) |
104 |
| - else: |
105 |
| - for n in nodes: |
106 |
| - successors = nx.descendants(self.digraph, n) |
107 |
| - if successors <= nodes: |
108 |
| - knots.append(subgraph) |
109 |
| - break |
110 |
| - if len(knots) > 0: |
111 |
| - return True |
112 |
| - return False |
113 |
| - |
114 | 84 | def choose_deadlock_detection(self, deadlock_detector):
|
115 | 85 | """
|
116 | 86 | Chooses the deadlock detection mechanism to use for the
|
|
0 commit comments