From e6a2f942e097d2dc4d32cd39cb5a78163970b872 Mon Sep 17 00:00:00 2001
From: HaoYizhi <haoyizhi@agentlab.cn>
Date: Sun, 18 Jun 2023 23:01:28 +0800
Subject: [PATCH] proactive choice replace = False

---
 __pycache__/controller_db.cpython-38.pyc | Bin 7932 -> 7932 bytes
 __pycache__/firm.cpython-38.pyc          | Bin 8364 -> 8364 bytes
 __pycache__/model.cpython-38.pyc         | Bin 12917 -> 13002 bytes
 model.py                                 |  11 ++++++-----
 xv_without_exp.csv                       |   2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/__pycache__/controller_db.cpython-38.pyc b/__pycache__/controller_db.cpython-38.pyc
index d282dbe8092e0c336186aee67169a85c25ca0d7e..803f4c06ad2b52066022be691af91430b5f3430f 100644
GIT binary patch
delta 19
Zcmexk`^T0ml$V!_0SJDHZ{+$U2LL_41=0Wj

delta 19
Zcmexk`^T0ml$V!_0SI0QY~=bR2LL@V1-SqK

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index 7e83b77c7342343627af0addbfaa2fc0ec22d32f..7880f57c04ca297851f387ff2a288beccd4dd7f9 100644
GIT binary patch
delta 49
zcmZ4ExW<tyl$V!_0SIo3Z{%7i$#`q?8p+ozj0Kx#$ki}%7Xl@Uia<p1WO;>N0AYg;
A0ssI2

delta 49
zcmZ4ExW<tyl$V!_0SFEVY~)%f$r!bHjpS<<#{A7Q<Z2kX3xE<ug&?A6vb;hs08S1K
ATmS$7

diff --git a/__pycache__/model.cpython-38.pyc b/__pycache__/model.cpython-38.pyc
index 91c1e07bf149bda0189f169117001d68f500106f..9165efb5541e73891aa1364bc41b53892b086fc2 100644
GIT binary patch
delta 614
zcmYL_&ubGw6vy+jNt&i?t%#UFHLE$;O-qx;9|%dCOM6f#crjvZx?MYybZe81vy-I8
z6p;v4YpFW)qUc3DdXPDb2kWH>9)%vn{t<%o<h<nIz<lO?->-Qyf5<-7Z|Hi&r`F%-
z4%z#pPeNo^DNSwfx}1ZH1IM*ebiw~LxDoHfXMHcUQb;@t|J3}YF-ZpJ0Dg(zgE8?n
zvXSQVB-=@?mfrYCt~1s<r#Ce+67wm~jIwmJ-iEsXK9#p9W`|73%i7Q-{akyv&Rlz$
zJ56fXgc$9B!Cj*rG|DbBj=(T2`62p43$hDpGRa2|{je$v@fE)onh44-XSV^GVm>i?
zt*zqh0pg58G3+wO@|-qhF8VCQI^sS8o3RX{jJTz65b(HLH-oGzW#UkSO}Tsi8=U-K
z)5OgFEy6X&6Aw`@VC8_f(kPeLXusJS`l|?6d^WdIi)hw+d5xN*o>gV{lroR8E=KZ*
zEkq9ST(pwoup{0l3-C%FC36tQ5lm2X%}jiUAiJrg)F%rNdW;2JIH`}YBu=G`&~0>h
zVmckmK2l~e;x@QNXoXSQ|C-)xyDD^`RqcB5M1^vTk_xqK&Y5$k!Kueu;$`{@bj5yp
vZ{!I!+(u*(uf@BmtEZQ-K2*1B#P%3bq8P4G-g4R9b+#k|nJKWv<xKt`AULON

delta 532
zcmX?=`Za|&l$V!_0SKJM`cuwq<ke&3;sNrQfw)*@vn!(syC75Sn;51})>`=*c^8HW
zOtH5ncX3>2W{mx_Ifc`ek#W=H2b_|V4|CPB)aYl$PA=fqWVGHqi`$f!Ni%NqM~U;y
zn~%yoWMa(Nyj(tmiIID=kWw!rW9j4t$}(P+KwFBcK!hBSh~mgE%8W10tV%7)1Bu0f
zh;k570V0e+gb|2H1rZTI;ucGBNq&JQYf;l?HkF6WjP09Ws2^n%Md&F7sf5@v`H-fz
zavg{t4bsV8oKc#VmXiuGEE^=A10wP!3utxg$AXyoV0EQ=nQ8e&xkUv)o+f`$6G+A$
zM09}&8xYYw`IMG6W8dU&T49V6H~VVaFmiyLpveey*F>E&jLg3n6*ed7g)y=<gOnFf
z-lxBoF@AE6fr51uNT3KvL<y&-mc-}fr=-RwmXs7_CY6??78f;uWVrH6OX5>f(~DA5
zA%O*U?Uc#K4dfWhCO<Q<U~HN!Z+Jws4P;gih_D6`GeN|f$rFskC-WQW$|eE1x7Z32
i^HLIvi;{tyD2}|;lJfkb?24lJ$&p5ej0uywjqCw`Qj@Fz

diff --git a/model.py b/model.py
index 132ca26..f7032c6 100644
--- a/model.py
+++ b/model.py
@@ -255,7 +255,8 @@ class Model(ap.Model):
                     [lst_affected[i] for i in
                      self.nprandom.choice(range(len(lst_affected)),
                                           round(len(lst_affected) *
-                                                self.proactive_ratio))]
+                                                self.proactive_ratio),
+                                          replace=False)]
 
                 for firm_code, prod_code in lst_firm_proactive:
                     pro_firm_prod_code = \
@@ -321,10 +322,10 @@ class Model(ap.Model):
                                     'Product': di_supp_prod.code
                                 })
                             ])
-                            # print(f"proactive add {select_cand.code} to "
-                            #       f"{pro_firm.code} "
-                            #       f"for {di_supp_node['Firm_Code']} "
-                            #       f"{di_supp_node['Product_Code']}")
+                            print(f"proactive add {select_cand.name} to "
+                                  f"{pro_firm.name} "
+                                  f"for {di_supp_node['Firm_Code']} "
+                                  f"{di_supp_node['Product_Code']}")
                             # change capacity
                             select_cand.dct_prod_capacity[di_supp_prod] -= 1
                             break
diff --git a/xv_without_exp.csv b/xv_without_exp.csv
index 22d96de..f73357a 100644
--- a/xv_without_exp.csv
+++ b/xv_without_exp.csv
@@ -1,2 +1,2 @@
 n_max_trial,prf_size,prf_conn,cap_limit_prob_type,cap_limit_level,diff_new_conn,crit_supplier,diff_disrupt,proactive_ratio,remove_t,netw_prf_n
-10,TRUE,TRUE,uniform,10,0.1,1,0.01,0,5,2
+10,TRUE,TRUE,uniform,10,0.1,1,0.01,1,5,2