diff --git a/.vscode/launch.json b/.vscode/launch.json index e582557..80f4077 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,9 +12,9 @@ "console": "integratedTerminal", "justMyCode": true, "args": [ - "--exp", "test", + "--exp", "without_exp", "--reset_db", "True", - "--job", "1" + "--job", "24" ] } ] diff --git a/__pycache__/controller_db.cpython-38.pyc b/__pycache__/controller_db.cpython-38.pyc index d75a0e9..1ba225d 100644 Binary files a/__pycache__/controller_db.cpython-38.pyc and b/__pycache__/controller_db.cpython-38.pyc differ diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc index f35eab2..fa98168 100644 Binary files a/__pycache__/firm.cpython-38.pyc and b/__pycache__/firm.cpython-38.pyc differ diff --git a/__pycache__/model.cpython-38.pyc b/__pycache__/model.cpython-38.pyc index b7c8463..5a359a9 100644 Binary files a/__pycache__/model.cpython-38.pyc and b/__pycache__/model.cpython-38.pyc differ diff --git a/controller_db.py b/controller_db.py index bb1b520..2eeea65 100644 --- a/controller_db.py +++ b/controller_db.py @@ -82,7 +82,7 @@ class ControllerDB: # list_dct = [{'140': ['1.4.5.1']}] # list_dct = [{'133': ['1.4.4.1']}] # list_dct = [{'2': ['1.1.3']}] - list_dct = [{'135': ['1.3.2.1']}] + # list_dct = [{'135': ['1.3.2.1']}] # list_dct = [{'79': ['2.1.3.4']}] # list_dct = [{'99': ['1.3.3']}] # list_dct = [{'41': ['1.4.5']}] diff --git a/xv_with_exp.csv b/xv_with_exp.csv index e002363..3d75219 100644 --- a/xv_with_exp.csv +++ b/xv_with_exp.csv @@ -1,4 +1,4 @@ -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 -15,TRUE,TRUE,uniform,5,0.3,2,0.5,0.3,3,3 -10,FALSE,FALSE,normal,10,0.5,1,1,0.5,5,2 -5,,,,15,0.7,0.5,2,0.7,7,1 +n_max_trial,prf_size,prf_conn,cap_limit_prob_type,cap_limit_level,diff_new_conn,crit_supplier,proactive_ratio,remove_t,netw_prf_n +15,TRUE,TRUE,uniform,5,0.3,2,0.3,3,3 +10,FALSE,FALSE,normal,10,0.5,1,0.5,5,2 +5,,,,15,0.7,0.5,0.7,7,1 diff --git a/xv_without_exp.csv b/xv_without_exp.csv index 027114d..9131e86 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,proactive_ratio,remove_t,netw_prf_n -10,TRUE,TRUE,uniform,10,0.5,0.01,1,5,2 +10,TRUE,TRUE,uniform,10,0.5,1,0,5,2