stratcomp benchmark changes

Author: tobiaskaminski

benchmarks/stratcomp-deppruning/generate_instances.py

@@ -9,34 +9,44 @@
 
 num_inst = 10
 
-min_comp = 1
+min_comp = 10
 max_comp = 100
-step_comp = 1
+step_comp = 10
 
-products_factor = 5
+products_factor = 10
 owners_factor = 0.2
 
 
 for size in range(min_comp, max_comp + 1, step_comp):
 	for num in range(0, num_inst):
 		f = open('instances/inst_' + str(size).zfill(3) + '_' + str(num).zfill(3) + '.hex', 'w')
 
-		f.write('strat(X1) v strat(X2) :- prod(_,X1,X2).\n')
+		f.write('strat(X1) v strat(X2) v strat(X3) v strat(X4) :- prod(_,X1,X2,X3,X4).\n')
 		f.write('strat(X) :- &owns[\"instances/owners_' + str(size).zfill(3) + '_' + str(num).zfill(3) + '\",strat](X), comp(X).\n')
 
 		for comp in range(0,size):
 			f.write('comp(c' + str(comp) + ').\n')
 
 		for prod in range(0,size * products_factor):
-			f.write('prod(p' + str(prod) + ',c' + str(randint(0,size-1))  + ',c' + str(randint(0,size-1)) + ').\n')
+			f.write('prod(p' + str(prod) + ',c' + str(randint(0,size-1))  + ',c' + str(randint(0,size-1)) + ',c' + str(randint(0,size-1)) + ',c' + str(randint(0,size-1)) + ').\n')
 
 		f.close()
 
 
-		f = open('instances/owners_' + str(size).zfill(3) + '_' + str(num).zfill(3), 'w')
+		if True:
 
-		for owner in range(0,int(size * owners_factor)):
-			f.write('owns(c' + str(randint(0,size-1))  + ',c' + str(randint(0,size-1)) + ').\n')
+			f = open('instances/owners_' + str(size).zfill(3) + '_' + str(num).zfill(3), 'w')
 
-		f.close()
+			for owner in range(0,int(size * owners_factor)):
+				first = randint(0,size-2)
+				f.write('own(c' + str(first) + ',c' + str(randint(first+1,size-1)) + ',c' + str(randint(first+1,size-1)) + ',c' + str(randint(first+1,size-1)) + ').\n')
+
+			f.close()
+
+		else:
+			f = open('instances/owners_' + str(size).zfill(3) + '_' + str(num).zfill(3), 'w')
+
+			for owner in range(0,int(size * owners_factor)):
+				f.write('own(c' + str(randint(0,size-1)) + ',c' + str(randint(0,size-1)) + ',c' + str(randint(0,size-1)) + ',c' + str(randint(0,size-1)) + ').\n')
 
+			f.close()

testsuite/plugin.py

@@ -1001,21 +1001,27 @@ def owns(path,strat):
 	ownsrel = dict()
 
 	for line in f:
-		m = re.search('owns\((.+),(.+)\)', line)
+		m = re.search('own\((.+),(.+),(.+),(.+)\)', line)
 		if m.group(1) in ownsrel:
-			ownsrel[m.group(1)].append(m.group(2))
+			ownsrel[m.group(1)].append((m.group(2),m.group(3),m.group(4)))
 		else:
-			ownsrel[m.group(1)] = [m.group(2)]
+			ownsrel[m.group(1)] = [(m.group(2),m.group(3),m.group(4))]
+
+	true_strat = []
+	false_strat = []
 
 	for x in dlvhex.getInputAtoms():
 		 if x.tuple()[0] == strat and x.isTrue():
-			if x.tuple()[1].value() in ownsrel:
-				for el in ownsrel[x.tuple()[1].value()]:
-					dlvhex.output((el,))
-		 elif x.tuple()[0] == strat and not x.isFalse():
-			if x.tuple()[1].value() in ownsrel:
-				for el in ownsrel[x.tuple()[1].value()]:
-					dlvhex.outputUnknown((el,))
+			true_strat.append(x.tuple()[1].value())
+		 if x.tuple()[0] == strat and x.isFalse():
+			false_strat.append(x.tuple()[1].value())
+
+	for key in ownsrel:
+		for el in ownsrel[key]:
+			if el[0] in true_strat and el[1] in true_strat and el[2] in true_strat:
+				dlvhex.output((key,))
+			if el[0] not in false_strat and el[1] not in false_strat and el[2] not in false_strat:
+				dlvhex.outputUnknown((key,))
 
 
 def complianceCheck4(path,i,j,k,inp,outp):
@@ -1025,13 +1031,13 @@ def complianceCheck4(path,i,j,k,inp,outp):
 		ownsrel = dict()
 
 		for line in f:
-			m = re.search('owns\((.+),(.+)\)', line)
+			m = re.search('own\((.+),(.+),(.+),(.+)\)', line)
 			if m.group(1) in ownsrel:
-				ownsrel[m.group(1)].append(m.group(2))
+				ownsrel[m.group(1)] += [m.group(2),m.group(3),m.group(4)]
 			else:
-				ownsrel[m.group(1)] = [m.group(2)]
+				ownsrel[m.group(1)] = [m.group(2),m.group(3),m.group(4)]
 
-		if inp in ownsrel and outp in ownsrel[inp]:
+		if outp in ownsrel and inp in ownsrel[outp]:
 			return "0"
 		else:
 			return "1"