diff --git a/CG_Files/Employee_ABC/dmca.nm b/CG_Files/Employee_ABC/dmca.nm index 821d2ea..37b9914 100644 --- a/CG_Files/Employee_ABC/dmca.nm +++ b/CG_Files/Employee_ABC/dmca.nm @@ -16,9 +16,7 @@ network model = illicit_sw_C_2; illicit_sw_C_3; illicit_sw_C_4; - illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; + illicit_sw_C_5; facts: quality:torrent_prog_B,prog_B_is_installed=true; @@ -41,8 +39,6 @@ network model = quality:illicit_sw_C_3,sw_C_3_is_installed=true; quality:illicit_sw_C_4,sw_C_4_is_installed=true; quality:illicit_sw_C_5,sw_C_5_is_installed=true; - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - quality:illicit_sw_C_7,sw_C_7_is_installed=true; topology:illicit_sw_B_3->illicit_sw_B_4,org; . diff --git a/CG_Files/Employee_ABC/dmca.xp b/CG_Files/Employee_ABC/dmca.xp index 7fb7139..8f7c90e 100644 --- a/CG_Files/Employee_ABC/dmca.xp +++ b/CG_Files/Employee_ABC/dmca.xp @@ -102,17 +102,3 @@ exploit remove_illicit_sw_C_5(illicit_sw_C_5)= postconditions: update quality:illicit_sw_C_5,sw_C_5_is_installed=false; . - -exploit remove_illicit_sw_C_6(illicit_sw_C_6)= - preconditions: - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - postconditions: - update quality:illicit_sw_C_6,sw_C_6_is_installed=false; -. - -exploit remove_illicit_sw_C_7(illicit_sw_C_7)= - preconditions: - quality:illicit_sw_C_7,sw_C_7_is_installed=true; - postconditions: - update quality:illicit_sw_C_7,sw_C_7_is_installed=false; -. diff --git a/CG_Files/Employee_ABC/sync_dmca.nm b/CG_Files/Employee_ABC/sync_dmca.nm index e7eac67..5299b6e 100644 --- a/CG_Files/Employee_ABC/sync_dmca.nm +++ b/CG_Files/Employee_ABC/sync_dmca.nm @@ -17,8 +17,7 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; + facts: quality:torrent_prog_B,B_is_installed=true; @@ -41,8 +40,6 @@ network model = quality:illicit_sw_C_3,C_is_installed=true; quality:illicit_sw_C_4,C_is_installed=true; quality:illicit_sw_C_5,C_is_installed=true; - quality:illicit_sw_C_6,C_is_installed=true; - quality:illicit_sw_C_7,C_is_installed=true; topology:illicit_sw_B_3->illicit_sw_B_4,org; . diff --git a/CG_Files/Employee_ABC/sync_dmca.xp b/CG_Files/Employee_ABC/sync_dmca.xp index ac81c16..3a914d9 100644 --- a/CG_Files/Employee_ABC/sync_dmca.xp +++ b/CG_Files/Employee_ABC/sync_dmca.xp @@ -1,20 +1,46 @@ -uninstallB group exploit remove_all_B(b)= +uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)= preconditions: - quality:b,B_is_installed=true; + quality:torrent_prog_B,B_is_installed=true; + quality:illicit_sw_B_1,B_is_installed=true; + quality:illicit_sw_B_2,B_is_installed=true; + quality:illicit_sw_B_3,B_is_installed=true; + quality:illicit_sw_B_4,B_is_installed=true; postconditions: - update quality:b,B_is_installed=false; + update quality:torrent_prog_B,B_is_installed=false; + update quality:illicit_sw_B_1,B_is_installed=false; + update quality:illicit_sw_B_2,B_is_installed=false; + update quality:illicit_sw_B_3,B_is_installed=false; + update quality:illicit_sw_B_4,B_is_installed=false; . -uninstallA group exploit remove_all_A(a)= + +uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)= preconditions: - quality:a,A_is_installed=true; + quality:torrent_prog_A,A_is_installed=true; + quality:illicit_sw_A_1,A_is_installed=true; + quality:illicit_sw_A_2,A_is_installed=true; + quality:illicit_sw_A_3,A_is_installed=true; postconditions: - update quality:a,A_is_installed=false; + update quality:torrent_prog_A,A_is_installed=false; + update quality:illicit_sw_A_1,A_is_installed=false; + update quality:illicit_sw_A_2,A_is_installed=false; + update quality:illicit_sw_A_3,A_is_installed=false; . -uninstallC group exploit remove_all_C(c)= +uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5)= preconditions: - quality:c,C_is_installed=true; + quality:torrent_prog_C,C_is_installed=true; + quality:illicit_sw_C_1,C_is_installed=true; + quality:illicit_sw_C_2,C_is_installed=true; + quality:illicit_sw_C_3,C_is_installed=true; + quality:illicit_sw_C_4,C_is_installed=true; + quality:illicit_sw_C_5,C_is_installed=true; postconditions: - update quality:c,C_is_installed=false; + update quality:torrent_prog_C,C_is_installed=false; + update quality:illicit_sw_C_1,C_is_installed=false; + update quality:illicit_sw_C_2,C_is_installed=false; + update quality:illicit_sw_C_3,C_is_installed=false; + update quality:illicit_sw_C_4,C_is_installed=false; + update quality:illicit_sw_C_5,C_is_installed=false; . + diff --git a/CG_Files/Employee_AC/dmca.nm b/CG_Files/Employee_AC/dmca.nm index dd35974..7544e56 100644 --- a/CG_Files/Employee_AC/dmca.nm +++ b/CG_Files/Employee_AC/dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; torrent_prog_A; illicit_sw_A_1; @@ -22,8 +20,6 @@ network model = quality:illicit_sw_C_3,sw_C_3_is_installed=true; quality:illicit_sw_C_4,sw_C_4_is_installed=true; quality:illicit_sw_C_5,sw_C_5_is_installed=true; - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - quality:illicit_sw_C_7,sw_C_7_is_installed=true; quality:torrent_prog_A,prog_A_is_installed=true; @@ -31,5 +27,5 @@ network model = quality:illicit_sw_A_2,sw_A_2_is_installed=true; quality:illicit_sw_A_3,sw_A_3_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_AC/dmca.xp b/CG_Files/Employee_AC/dmca.xp index 7af5dc6..9a02b37 100644 --- a/CG_Files/Employee_AC/dmca.xp +++ b/CG_Files/Employee_AC/dmca.xp @@ -40,20 +40,6 @@ exploit remove_illicit_sw_C_5(illicit_sw_C_5)= update quality:illicit_sw_C_5,sw_C_5_is_installed=false; . -exploit remove_illicit_sw_C_6(illicit_sw_C_6)= - preconditions: - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - postconditions: - update quality:illicit_sw_C_6,sw_C_6_is_installed=false; -. - -exploit remove_illicit_sw_C_7(illicit_sw_C_7)= - preconditions: - quality:illicit_sw_C_7,sw_C_7_is_installed=true; - postconditions: - update quality:illicit_sw_C_7,sw_C_7_is_installed=false; -. - exploit remove_torrent_prog_A(torrent_prog_A)= preconditions: quality:torrent_prog_A,prog_A_is_installed=true; diff --git a/CG_Files/Employee_AC/sync_dmca.nm b/CG_Files/Employee_AC/sync_dmca.nm index 9d38eac..dffbe03 100644 --- a/CG_Files/Employee_AC/sync_dmca.nm +++ b/CG_Files/Employee_AC/sync_dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; torrent_prog_A; illicit_sw_A_1; @@ -22,8 +20,6 @@ network model = quality:illicit_sw_C_3,C_is_installed=true; quality:illicit_sw_C_4,C_is_installed=true; quality:illicit_sw_C_5,C_is_installed=true; - quality:illicit_sw_C_6,C_is_installed=true; - quality:illicit_sw_C_7,C_is_installed=true; quality:torrent_prog_A,A_is_installed=true; @@ -31,5 +27,5 @@ network model = quality:illicit_sw_A_2,A_is_installed=true; quality:illicit_sw_A_3,A_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_AC/sync_dmca.xp b/CG_Files/Employee_AC/sync_dmca.xp index c09403e..43dbf5a 100644 --- a/CG_Files/Employee_AC/sync_dmca.xp +++ b/CG_Files/Employee_AC/sync_dmca.xp @@ -1,13 +1,31 @@ -uninstallA group exploit remove_all_A(a)= +uninstallA group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)= preconditions: - quality:a,A_is_installed=true; + quality:torrent_prog_A,A_is_installed=true; + quality:illicit_sw_A_1,A_is_installed=true; + quality:illicit_sw_A_2,A_is_installed=true; + quality:illicit_sw_A_3,A_is_installed=true; postconditions: - update quality:a,A_is_installed=false; + update quality:torrent_prog_A,A_is_installed=false; + update quality:illicit_sw_A_1,A_is_installed=false; + update quality:illicit_sw_A_2,A_is_installed=false; + update quality:illicit_sw_A_3,A_is_installed=false; . -uninstallC group exploit remove_all_C(c)= + +uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5)= preconditions: - quality:c,C_is_installed=true; + quality:torrent_prog_C,C_is_installed=true; + quality:illicit_sw_C_1,C_is_installed=true; + quality:illicit_sw_C_2,C_is_installed=true; + quality:illicit_sw_C_3,C_is_installed=true; + quality:illicit_sw_C_4,C_is_installed=true; + quality:illicit_sw_C_5,C_is_installed=true; postconditions: - update quality:c,C_is_installed=false; + update quality:torrent_prog_C,C_is_installed=false; + update quality:illicit_sw_C_1,C_is_installed=false; + update quality:illicit_sw_C_2,C_is_installed=false; + update quality:illicit_sw_C_3,C_is_installed=false; + update quality:illicit_sw_C_4,C_is_installed=false; + update quality:illicit_sw_C_5,C_is_installed=false; . + diff --git a/CG_Files/Employee_BC/dmca.nm b/CG_Files/Employee_BC/dmca.nm index 45ba57f..99e9cef 100644 --- a/CG_Files/Employee_BC/dmca.nm +++ b/CG_Files/Employee_BC/dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; torrent_prog_B; illicit_sw_B_1; @@ -23,8 +21,6 @@ network model = quality:illicit_sw_C_3,sw_C_3_is_installed=true; quality:illicit_sw_C_4,sw_C_4_is_installed=true; quality:illicit_sw_C_5,sw_C_5_is_installed=true; - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - quality:illicit_sw_C_7,sw_C_7_is_installed=true; quality:torrent_prog_B,prog_B_is_installed=true; @@ -33,5 +29,5 @@ network model = quality:illicit_sw_B_3,sw_B_3_is_installed=true; quality:illicit_sw_B_4,sw_B_4_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_BC/dmca.xp b/CG_Files/Employee_BC/dmca.xp index 9516e2c..dcaecdc 100644 --- a/CG_Files/Employee_BC/dmca.xp +++ b/CG_Files/Employee_BC/dmca.xp @@ -40,20 +40,6 @@ exploit remove_illicit_sw_C_5(illicit_sw_C_5)= update quality:illicit_sw_C_5,sw_C_5_is_installed=false; . -exploit remove_illicit_sw_C_6(illicit_sw_C_6)= - preconditions: - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - postconditions: - update quality:illicit_sw_C_6,sw_C_6_is_installed=false; -. - -exploit remove_illicit_sw_C_7(illicit_sw_C_7)= - preconditions: - quality:illicit_sw_C_7,sw_C_7_is_installed=true; - postconditions: - update quality:illicit_sw_C_7,sw_C_7_is_installed=false; -. - exploit remove_torrent_prog_B(torrent_prog_B)= preconditions: quality:torrent_prog_B,prog_B_is_installed=true; diff --git a/CG_Files/Employee_BC/sync_dmca.nm b/CG_Files/Employee_BC/sync_dmca.nm index 7c009ea..274fb77 100644 --- a/CG_Files/Employee_BC/sync_dmca.nm +++ b/CG_Files/Employee_BC/sync_dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; torrent_prog_B; illicit_sw_B_1; @@ -23,8 +21,6 @@ network model = quality:illicit_sw_C_3,C_is_installed=true; quality:illicit_sw_C_4,C_is_installed=true; quality:illicit_sw_C_5,C_is_installed=true; - quality:illicit_sw_C_6,C_is_installed=true; - quality:illicit_sw_C_7,C_is_installed=true; quality:torrent_prog_B,B_is_installed=true; @@ -33,5 +29,5 @@ network model = quality:illicit_sw_B_3,B_is_installed=true; quality:illicit_sw_B_4,B_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_BC/sync_dmca.xp b/CG_Files/Employee_BC/sync_dmca.xp index 22ee453..463b8d1 100644 --- a/CG_Files/Employee_BC/sync_dmca.xp +++ b/CG_Files/Employee_BC/sync_dmca.xp @@ -1,13 +1,31 @@ -uninstallB group exploit remove_all_B(b)= +uninstall group exploit remove_all_B(torrent_prog_B,illicit_sw_B_1,illicit_sw_B_2,illicit_sw_B_3,illicit_sw_B_4)= preconditions: - quality:b,B_is_installed=true; + quality:torrent_prog_B,B_is_installed=true; + quality:illicit_sw_B_1,B_is_installed=true; + quality:illicit_sw_B_2,B_is_installed=true; + quality:illicit_sw_B_3,B_is_installed=true; + quality:illicit_sw_B_4,B_is_installed=true; postconditions: - update quality:b,B_is_installed=false; + update quality:torrent_prog_B,B_is_installed=false; + update quality:illicit_sw_B_1,B_is_installed=false; + update quality:illicit_sw_B_2,B_is_installed=false; + update quality:illicit_sw_B_3,B_is_installed=false; + update quality:illicit_sw_B_4,B_is_installed=false; . -uninstallC group exploit remove_all_C(c)= +uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5)= preconditions: - quality:c,C_is_installed=true; + quality:torrent_prog_C,C_is_installed=true; + quality:illicit_sw_C_1,C_is_installed=true; + quality:illicit_sw_C_2,C_is_installed=true; + quality:illicit_sw_C_3,C_is_installed=true; + quality:illicit_sw_C_4,C_is_installed=true; + quality:illicit_sw_C_5,C_is_installed=true; postconditions: - update quality:c,C_is_installed=false; + update quality:torrent_prog_C,C_is_installed=false; + update quality:illicit_sw_C_1,C_is_installed=false; + update quality:illicit_sw_C_2,C_is_installed=false; + update quality:illicit_sw_C_3,C_is_installed=false; + update quality:illicit_sw_C_4,C_is_installed=false; + update quality:illicit_sw_C_5,C_is_installed=false; . diff --git a/CG_Files/Employee_C/dmca.nm b/CG_Files/Employee_C/dmca.nm index 3529d98..344c2fd 100644 --- a/CG_Files/Employee_C/dmca.nm +++ b/CG_Files/Employee_C/dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; facts: quality:torrent_prog_C,prog_C_is_installed=true; @@ -17,8 +15,6 @@ network model = quality:illicit_sw_C_3,sw_C_3_is_installed=true; quality:illicit_sw_C_4,sw_C_4_is_installed=true; quality:illicit_sw_C_5,sw_C_5_is_installed=true; - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - quality:illicit_sw_C_7,sw_C_7_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_C/dmca.xp b/CG_Files/Employee_C/dmca.xp index d94d79c..9cb635e 100644 --- a/CG_Files/Employee_C/dmca.xp +++ b/CG_Files/Employee_C/dmca.xp @@ -39,17 +39,3 @@ exploit remove_illicit_sw_C_5(illicit_sw_C_5)= postconditions: update quality:illicit_sw_C_5,sw_C_5_is_installed=false; . - -exploit remove_illicit_sw_C_6(illicit_sw_C_6)= - preconditions: - quality:illicit_sw_C_6,sw_C_6_is_installed=true; - postconditions: - update quality:illicit_sw_C_6,sw_C_6_is_installed=false; -. - -exploit remove_illicit_sw_C_7(illicit_sw_C_7)= - preconditions: - quality:illicit_sw_C_7,sw_C_7_is_installed=true; - postconditions: - update quality:illicit_sw_C_7,sw_C_7_is_installed=false; -. diff --git a/CG_Files/Employee_C/sync_dmca.nm b/CG_Files/Employee_C/sync_dmca.nm index 7b51e26..d3dffda 100644 --- a/CG_Files/Employee_C/sync_dmca.nm +++ b/CG_Files/Employee_C/sync_dmca.nm @@ -6,8 +6,6 @@ network model = illicit_sw_C_3; illicit_sw_C_4; illicit_sw_C_5; - illicit_sw_C_6; - illicit_sw_C_7; facts: quality:torrent_prog_C,C_is_installed=true; @@ -17,8 +15,6 @@ network model = quality:illicit_sw_C_3,C_is_installed=true; quality:illicit_sw_C_4,C_is_installed=true; quality:illicit_sw_C_5,C_is_installed=true; - quality:illicit_sw_C_6,C_is_installed=true; - quality:illicit_sw_C_7,C_is_installed=true; - topology:illicit_sw_C_6->illicit_sw_C_7,org; + topology:illicit_sw_C_4->illicit_sw_C_5,org; . diff --git a/CG_Files/Employee_C/sync_dmca.xp b/CG_Files/Employee_C/sync_dmca.xp index 0c6bd70..07e069e 100644 --- a/CG_Files/Employee_C/sync_dmca.xp +++ b/CG_Files/Employee_C/sync_dmca.xp @@ -1,6 +1,16 @@ -uninstall group exploit remove_all_C(c)= +uninstall group exploit remove_all_C(torrent_prog_C,illicit_sw_C_1,illicit_sw_C_2,illicit_sw_C_3,illicit_sw_C_4,illicit_sw_C_5)= preconditions: - quality:c,C_is_installed=true; + quality:torrent_prog_C,C_is_installed=true; + quality:illicit_sw_C_1,C_is_installed=true; + quality:illicit_sw_C_2,C_is_installed=true; + quality:illicit_sw_C_3,C_is_installed=true; + quality:illicit_sw_C_4,C_is_installed=true; + quality:illicit_sw_C_5,C_is_installed=true; postconditions: - update quality:c,C_is_installed=false; + update quality:torrent_prog_C,C_is_installed=false; + update quality:illicit_sw_C_1,C_is_installed=false; + update quality:illicit_sw_C_2,C_is_installed=false; + update quality:illicit_sw_C_3,C_is_installed=false; + update quality:illicit_sw_C_4,C_is_installed=false; + update quality:illicit_sw_C_5,C_is_installed=false; . diff --git a/CG_Files/run.sh b/CG_Files/run.sh index 5dc5402..881ae1e 100755 --- a/CG_Files/run.sh +++ b/CG_Files/run.sh @@ -58,8 +58,8 @@ fi CMD=() CMD+=$MPI_HAMMER_PARAMS CMD+=" ./ag_gen -n " -CMD+=${CURR_DIR}"Employee_"${ESIZE}/"dmca.nm" +CMD+=${CURR_DIR}"Employee_"${ESIZE}/"sync_dmca.nm" CMD+=" -x " -CMD+=${CURR_DIR}"Employee_"${ESIZE}/"dmca.xp" +CMD+=${CURR_DIR}"Employee_"${ESIZE}/"sync_dmca.xp" CMD+=${AG_TASK_PARAMS} ${CMD} diff --git a/data/.~lock.data.xlsx# b/data/.~lock.data.xlsx# deleted file mode 100644 index 441d1e0..0000000 --- a/data/.~lock.data.xlsx# +++ /dev/null @@ -1 +0,0 @@ -,noah,NovaArchSys,24.03.2023 13:37,file:///home/noah/.config/libreoffice/4; \ No newline at end of file