Adjusting xp files to include actual asset

CG_Files/Employee_A/dmca.xp

@@ -1,25 +1,25 @@
-exploit remove_torrent_prog_A(torrent_prog)=
+exploit remove_torrent_prog_A(torrent_prog_A)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_A,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_1(illicit_sw)=
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
 	preconditions:
 		quality:illicit_sw_A_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_2(illicit_sw)=
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
 	preconditions:
 		quality:illicit_sw_A_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_3(illicit_sw)=
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
 	preconditions:
 		quality:illicit_sw_A_3,is_installed=true;
 	postconditions:

CG_Files/Employee_A/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_A(torrent_prog)=
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 		quality:illicit_sw_A_1,is_installed=true;

CG_Files/Employee_AB/dmca.xp

@@ -1,118 +1,62 @@
-exploit remove_torrent_prog_A(torrent_prog)=
+exploit remove_torrent_prog_A(torrent_prog_A)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_A,is_installed=false;
 .
 
-exploit remove_torrent_prog_B(torrent_prog)=
+exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
 		quality:torrent_prog_B,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_B,is_installed=false;
 .
 
-exploit remove_torrent_prog_C(torrent_prog)=
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
-	preconditions:
-		quality:torrent_prog_C,is_installed=true;
-	postconditions:
-		update quality:torrent_prog_C,is_installed=false;
-.
-
-exploit remove_illicit_sw_A_1(illicit_sw)=
 	preconditions:
 		quality:illicit_sw_A_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_2(illicit_sw)=
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
 	preconditions:
 		quality:illicit_sw_A_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_3(illicit_sw)=
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
 	preconditions:
 		quality:illicit_sw_A_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_1(illicit_sw)=
+exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
 		quality:illicit_sw_B_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_2(illicit_sw)=
+exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
 		quality:illicit_sw_B_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_3(illicit_sw)=
+exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
 		quality:illicit_sw_B_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_4(illicit_sw)=
+exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
 		quality:illicit_sw_B_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_4,is_installed=false;
 .
-
-exploit remove_illicit_sw_C_1(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_1,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_1,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_2(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_2,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_2,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_3(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_3,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_3,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_4(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_4,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_4,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_5(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_5,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_5,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_6(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_6,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_6,is_installed=false;
-.
-
-exploit remove_illicit_sw_C_7(illicit_sw)=
-	preconditions:
-		quality:illicit_sw_C_7,is_installed=true;
-	postconditions:
-		update quality:illicit_sw_C_7,is_installed=false;
-.

CG_Files/Employee_AB/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_A(torrent_prog)=
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 		quality:illicit_sw_A_1,is_installed=true;
@@ -11,7 +11,7 @@ uninstall group exploit remove_all_A(torrent_prog)=
 		update quality:illicit_sw_A_3,is_installed=false;
 .
 
-uninstall group exploit remove_all_B(torrent_prog)=
+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:torrent_prog_B,is_installed=true;
 		quality:illicit_sw_B_1,is_installed=true;

CG_Files/Employee_ABC/dmca.xp

@@ -1,116 +1,116 @@
-exploit remove_torrent_prog_A(torrent_prog)=
+exploit remove_torrent_prog_A(torrent_prog_A)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_A,is_installed=false;
 .
 
-exploit remove_torrent_prog_B(torrent_prog)=
+exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
 		quality:torrent_prog_B,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_B,is_installed=false;
 .
 
-exploit remove_torrent_prog_C(torrent_prog)=
+exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_C,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_1(illicit_sw)=
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
 	preconditions:
 		quality:illicit_sw_A_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_2(illicit_sw)=
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
 	preconditions:
 		quality:illicit_sw_A_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_A_3(illicit_sw)=
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
 	preconditions:
 		quality:illicit_sw_A_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_A_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_1(illicit_sw)=
+exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
 		quality:illicit_sw_B_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_2(illicit_sw)=
+exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
 		quality:illicit_sw_B_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_3(illicit_sw)=
+exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
 		quality:illicit_sw_B_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_4(illicit_sw)=
+exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
 		quality:illicit_sw_B_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_4,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_1(illicit_sw)=
+exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
 		quality:illicit_sw_C_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_2(illicit_sw)=
+exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
 		quality:illicit_sw_C_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_3(illicit_sw)=
+exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
 		quality:illicit_sw_C_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_4(illicit_sw)=
+exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
 		quality:illicit_sw_C_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_4,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_5(illicit_sw)=
+exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
 		quality:illicit_sw_C_5,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_5,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_6(illicit_sw)=
+exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
 		quality:illicit_sw_C_6,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_6,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_7(illicit_sw)=
+exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
 		quality:illicit_sw_C_7,is_installed=true;
 	postconditions:

CG_Files/Employee_ABC/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_A(torrent_prog)=
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
 	preconditions:
 		quality:torrent_prog_A,is_installed=true;
 		quality:illicit_sw_A_1,is_installed=true;
@@ -11,7 +11,7 @@ uninstall group exploit remove_all_A(torrent_prog)=
 		update quality:illicit_sw_A_3,is_installed=false;
 .
 
-uninstall group exploit remove_all_B(torrent_prog)=
+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:torrent_prog_B,is_installed=true;
 		quality:illicit_sw_B_1,is_installed=true;
@@ -26,7 +26,7 @@ uninstall group exploit remove_all_B(torrent_prog)=
 		update quality:illicit_sw_B_4,is_installed=false;
 .
 
-uninstall group exploit remove_all_C(torrent_prog)=
+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,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 		quality:illicit_sw_C_1,is_installed=true;

CG_Files/Employee_AC/dmca.nm

@@ -0,0 +1,34 @@
+network model =
+	assets:
+		torrent_prog_A;
+		illicit_sw_A_1;
+		illicit_sw_A_2;
+		illicit_sw_A_3;	
+		
+		torrent_prog_C;
+		illicit_sw_C_1;
+		illicit_sw_C_2;
+		illicit_sw_C_3;	
+		illicit_sw_C_4;	
+		illicit_sw_C_5;	
+		illicit_sw_C_6;	
+		illicit_sw_C_7;	
+
+	facts:
+		quality:torrent_prog_A,is_installed=true;
+		quality:torrent_prog_C,is_installed=true;
+	
+		quality:illicit_sw_A_1,is_installed=true;
+		quality:illicit_sw_A_2,is_installed=true;
+		quality:illicit_sw_A_3,is_installed=true;
+
+		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_7,is_installed=true;
+
+		topology:illicit_sw_C_6->illicit_sw_C_7,org;
+.

CG_Files/Employee_AC/dmca.xp

@@ -0,0 +1,84 @@
+exploit remove_torrent_prog_A(torrent_prog_A)=
+	preconditions:
+		quality:torrent_prog_A,is_installed=true;
+	postconditions:
+		update quality:torrent_prog_A,is_installed=false;
+.
+
+
+exploit remove_torrent_prog_C(torrent_prog_C)=
+	preconditions:
+		quality:torrent_prog_C,is_installed=true;
+	postconditions:
+		update quality:torrent_prog_C,is_installed=false;
+.
+
+exploit remove_illicit_sw_A_1(illicit_sw_A_1)=
+	preconditions:
+		quality:illicit_sw_A_1,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_1,is_installed=false;
+.
+
+exploit remove_illicit_sw_A_2(illicit_sw_A_2)=
+	preconditions:
+		quality:illicit_sw_A_2,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_2,is_installed=false;
+.
+
+exploit remove_illicit_sw_A_3(illicit_sw_A_3)=
+	preconditions:
+		quality:illicit_sw_A_3,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_A_3,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
+	preconditions:
+		quality:illicit_sw_C_1,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_1,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
+	preconditions:
+		quality:illicit_sw_C_2,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_2,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
+	preconditions:
+		quality:illicit_sw_C_3,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_3,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
+	preconditions:
+		quality:illicit_sw_C_4,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_4,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
+	preconditions:
+		quality:illicit_sw_C_5,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_5,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
+	preconditions:
+		quality:illicit_sw_C_6,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_6,is_installed=false;
+.
+
+exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
+	preconditions:
+		quality:illicit_sw_C_7,is_installed=true;
+	postconditions:
+		update quality:illicit_sw_C_7,is_installed=false;
+.

CG_Files/Employee_AC/sync_dmca.xp

@@ -0,0 +1,33 @@
+uninstall group exploit remove_all_A(torrent_prog_A,illicit_sw_A_1,illicit_sw_A_2,illicit_sw_A_3)=
+	preconditions:
+		quality:torrent_prog_A,is_installed=true;
+		quality:illicit_sw_A_1,is_installed=true;
+		quality:illicit_sw_A_2,is_installed=true;
+		quality:illicit_sw_A_3,is_installed=true;
+	postconditions:
+		update quality:torrent_prog_A,is_installed=false;
+		update quality:illicit_sw_A_1,is_installed=false;
+		update quality:illicit_sw_A_2,is_installed=false;
+		update quality:illicit_sw_A_3,is_installed=false;
+.
+
+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,illicit_sw_C_6,illicit_sw_C_7)=
+	preconditions:
+		quality:torrent_prog_C,is_installed=true;
+		quality:illicit_sw_C_1,is_installed=true;
+		quality:illicit_sw_C_2,is_installed=true;
+		quality:illicit_sw_C_3,is_installed=true;
+		quality:illicit_sw_C_4,is_installed=true;
+		quality:illicit_sw_C_5,is_installed=true;
+		quality:illicit_sw_C_6,is_installed=true;
+		quality:illicit_sw_C_7,is_installed=true;
+	postconditions:
+		update quality:torrent_prog_C,is_installed=false;
+		update quality:illicit_sw_C_1,is_installed=false;
+		update quality:illicit_sw_C_2,is_installed=false;
+		update quality:illicit_sw_C_3,is_installed=false;
+		update quality:illicit_sw_C_4,is_installed=false;
+		update quality:illicit_sw_C_5,is_installed=false;
+		update quality:illicit_sw_C_6,is_installed=false;
+		update quality:illicit_sw_C_7,is_installed=false;
+.

CG_Files/Employee_B/dmca.xp

@@ -1,35 +1,34 @@
-exploit remove_torrent_prog_B(torrent_prog)=
+exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
 		quality:torrent_prog_B,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_B,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_1(illicit_sw)=
+exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
 		quality:illicit_sw_B_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_2(illicit_sw)=
+exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
 		quality:illicit_sw_B_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_3(illicit_sw)=
+exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
 		quality:illicit_sw_B_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_4(illicit_sw)=
+exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
 		quality:illicit_sw_B_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_4,is_installed=false;
 .
-

CG_Files/Employee_B/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_B(torrent_prog)=
+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:torrent_prog_B,is_installed=true;
 		quality:illicit_sw_B_1,is_installed=true;

CG_Files/Employee_BC/dmca.xp

@@ -1,88 +1,90 @@
-exploit remove_torrent_prog_B(torrent_prog)=
+
+
+exploit remove_torrent_prog_B(torrent_prog_B)=
 	preconditions:
 		quality:torrent_prog_B,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_B,is_installed=false;
 .
 
-exploit remove_torrent_prog_C(torrent_prog)=
+exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_C,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_1(illicit_sw)=
+exploit remove_illicit_sw_B_1(illicit_sw_B_1)=
 	preconditions:
 		quality:illicit_sw_B_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_2(illicit_sw)=
+exploit remove_illicit_sw_B_2(illicit_sw_B_2)=
 	preconditions:
 		quality:illicit_sw_B_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_3(illicit_sw)=
+exploit remove_illicit_sw_B_3(illicit_sw_B_3)=
 	preconditions:
 		quality:illicit_sw_B_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_B_4(illicit_sw)=
+exploit remove_illicit_sw_B_4(illicit_sw_B_4)=
 	preconditions:
 		quality:illicit_sw_B_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_B_4,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_1(illicit_sw)=
+exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
 		quality:illicit_sw_C_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_2(illicit_sw)=
+exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
 		quality:illicit_sw_C_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_3(illicit_sw)=
+exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
 		quality:illicit_sw_C_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_4(illicit_sw)=
+exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
 		quality:illicit_sw_C_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_4,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_5(illicit_sw)=
+exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
 		quality:illicit_sw_C_5,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_5,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_6(illicit_sw)=
+exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
 		quality:illicit_sw_C_6,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_6,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_7(illicit_sw)=
+exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
 		quality:illicit_sw_C_7,is_installed=true;
 	postconditions:

CG_Files/Employee_BC/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_B(torrent_prog)=
+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:torrent_prog_B,is_installed=true;
 		quality:illicit_sw_B_1,is_installed=true;
@@ -13,7 +13,7 @@ uninstall group exploit remove_all_B(torrent_prog)=
 		update quality:illicit_sw_B_4,is_installed=false;
 .
 
-uninstall group exploit remove_all_C(torrent_prog)=
+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,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 		quality:illicit_sw_C_1,is_installed=true;

CG_Files/Employee_C/dmca.xp

@@ -1,53 +1,53 @@
-exploit remove_torrent_prog_C(torrent_prog)=
+exploit remove_torrent_prog_C(torrent_prog_C)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 	postconditions:
 		update quality:torrent_prog_C,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_1(illicit_sw)=
+exploit remove_illicit_sw_C_1(illicit_sw_C_1)=
 	preconditions:
 		quality:illicit_sw_C_1,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_1,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_2(illicit_sw)=
+exploit remove_illicit_sw_C_2(illicit_sw_C_2)=
 	preconditions:
 		quality:illicit_sw_C_2,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_2,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_3(illicit_sw)=
+exploit remove_illicit_sw_C_3(illicit_sw_C_3)=
 	preconditions:
 		quality:illicit_sw_C_3,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_3,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_4(illicit_sw)=
+exploit remove_illicit_sw_C_4(illicit_sw_C_4)=
 	preconditions:
 		quality:illicit_sw_C_4,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_4,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_5(illicit_sw)=
+exploit remove_illicit_sw_C_5(illicit_sw_C_5)=
 	preconditions:
 		quality:illicit_sw_C_5,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_5,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_6(illicit_sw)=
+exploit remove_illicit_sw_C_6(illicit_sw_C_6)=
 	preconditions:
 		quality:illicit_sw_C_6,is_installed=true;
 	postconditions:
 		update quality:illicit_sw_C_6,is_installed=false;
 .
 
-exploit remove_illicit_sw_C_7(illicit_sw)=
+exploit remove_illicit_sw_C_7(illicit_sw_C_7)=
 	preconditions:
 		quality:illicit_sw_C_7,is_installed=true;
 	postconditions:

CG_Files/Employee_C/sync_dmca.xp

@@ -1,4 +1,4 @@
-uninstall group exploit remove_all_C(torrent_prog)=
+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,illicit_sw_C_6,illicit_sw_C_7)=
 	preconditions:
 		quality:torrent_prog_C,is_installed=true;
 		quality:illicit_sw_C_1,is_installed=true;

CG_Files/run.sh

@@ -15,7 +15,7 @@ DBNAME="$DBNAME$USER"
 MPI_HAMMER_PARAMS="mpiexec --mca btl_openib_allow_ib 1 --mca btl openib,self,vader --mca opal_warn_on_missing_libcuda 0 --bind-to numa --map-by numa -np 1 --timeout 129600"
 
 ### AG Gen Parameters. Please run the AG generator with the '-h' parameter to see all options. Adjust as desired.
-AG_TASK_PARAMS="-t 1 -q 1 -p -a 0.6 -z ${DBNAME}"
+AG_TASK_PARAMS=" -t 1 -q 1 -p -a 0.6 -z ${DBNAME}"
 
 ### Running
 
@@ -61,8 +61,5 @@ CMD+=" ./ag_gen -n "
 CMD+=${CURR_DIR}"Employee_"${ESIZE}/"dmca.nm"
 CMD+=" -x "
 CMD+=${CURR_DIR}"Employee_"${ESIZE}/"dmca.xp"
-CMD+=" -i "
-CMD+=${CURR_DIR}
-CMD+="output/serial "
 CMD+=${AG_TASK_PARAMS}
 ${CMD}

CG_Files/sync_data_col.sh

@@ -6,7 +6,7 @@ nodelist=compute01,compute04,compute07,compute10,compute11,compute12
 TIMESTR=`date +"%s"`
 DBNAME="${folder}_${TIMESTR}"
 NODES=(1)
-ESIZE=(A B C AB BC ABC)
+ESIZE=(A B C AB AC BC ABC)
 
 pwd=`pwd`