rename 3 status into (Normal / Disrupted / Removed)
This commit is contained in:
18
model.py
18
model.py
@@ -226,8 +226,8 @@ class Model(ap.Model):
|
||||
assert product in firm.dct_prod_up_prod_stat.keys(), \
|
||||
f"product {product.code} not in firm {firm.code}"
|
||||
firm.dct_prod_up_prod_stat[
|
||||
product]['status'].append(('A', self.t))
|
||||
print(f"initial removal {firm.name} {product.code}")
|
||||
product]['status'].append(('D', self.t))
|
||||
print(f"initial disruption {firm.name} {product.code}")
|
||||
|
||||
# proactive strategy
|
||||
# get all the firm prod affected
|
||||
@@ -341,7 +341,7 @@ class Model(ap.Model):
|
||||
for firm in self.a_lst_total_firms:
|
||||
for prod in firm.dct_prod_up_prod_stat.keys():
|
||||
status, ts = firm.dct_prod_up_prod_stat[prod]['status'][-1]
|
||||
if status == 'A':
|
||||
if status == 'D':
|
||||
size = firm.size_stat[-1][0] - \
|
||||
firm.size_stat[0][0] \
|
||||
/ len(firm.dct_prod_up_prod_stat.keys()) \
|
||||
@@ -354,12 +354,12 @@ class Model(ap.Model):
|
||||
firm.dct_prod_up_prod_stat[
|
||||
prod]['status'].append(('R', self.t))
|
||||
|
||||
# stop simulation if any firm still in affected except inital removal
|
||||
# stop simulation if any firm still in disrupted except inital removal
|
||||
if self.t > 0:
|
||||
for firm in self.a_lst_total_firms:
|
||||
for prod in firm.dct_prod_up_prod_stat.keys():
|
||||
status, ts = firm.dct_prod_up_prod_stat[prod]['status'][-1]
|
||||
if status == 'A' and ts != 0:
|
||||
if status == 'D' and ts != 0:
|
||||
print("not stop because", firm.name, prod.code)
|
||||
break
|
||||
else:
|
||||
@@ -372,12 +372,12 @@ class Model(ap.Model):
|
||||
def step(self):
|
||||
print('\n', '=' * 20, 'step', self.t, '=' * 20)
|
||||
|
||||
# remove edge to customer and affect customer up product
|
||||
# remove edge to customer and disrupt customer up product
|
||||
for firm in self.a_lst_total_firms:
|
||||
for prod in firm.dct_prod_up_prod_stat.keys():
|
||||
status, ts = firm.dct_prod_up_prod_stat[prod]['status'][-1]
|
||||
if status == 'A' and ts == self.t-1:
|
||||
firm.remove_edge_to_cus_affect_cus_up_prod(prod)
|
||||
if status == 'D' and ts == self.t-1:
|
||||
firm.remove_edge_to_cus_disrupt_cus_up_prod(prod)
|
||||
|
||||
for n_trial in range(self.int_n_max_trial):
|
||||
print('=' * 10, 'trial', n_trial, '=' * 10)
|
||||
@@ -389,7 +389,7 @@ class Model(ap.Model):
|
||||
lst_seek_prod = []
|
||||
for prod in firm.dct_prod_up_prod_stat.keys():
|
||||
status = firm.dct_prod_up_prod_stat[prod]['status'][-1][0]
|
||||
if status == 'A':
|
||||
if status == 'D':
|
||||
for supply in firm.dct_prod_up_prod_stat[
|
||||
prod]['supply'].keys():
|
||||
if not firm.dct_prod_up_prod_stat[
|
||||
|
||||
Reference in New Issue
Block a user