From: bdemsky <bdemsky@uci.edu>
Date: Tue, 11 Jul 2017 19:50:20 +0000 (-0700)
Subject: Fix conflict
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a24001dc0a2c54ad270f9a8b6731fc2b50b260e7;p=satune.git

Fix conflict
---

diff --git a/src/Backend/constraint.c b/src/Backend/constraint.c
index 843f168..e9f9aa0 100644
--- a/src/Backend/constraint.c
+++ b/src/Backend/constraint.c
@@ -309,7 +309,7 @@ Edge constraintITE(CNF * cnf, Edge cond, Edge thenedge, Edge elseedge) {
 	return result;
 }
 
-void addConstraint(CNF *cnf, Edge constraint) {
+void addConstraintCNF(CNF *cnf, Edge constraint) {
 	pushVectorEdge(&cnf->constraints, constraint);
 }
 
diff --git a/src/Backend/constraint.h b/src/Backend/constraint.h
index ae22fdb..2693455 100644
--- a/src/Backend/constraint.h
+++ b/src/Backend/constraint.h
@@ -191,7 +191,7 @@ Edge constraintITE(CNF * cnf, Edge cond, Edge thenedge, Edge elseedge);
 Edge constraintNewVar(CNF *cnf);
 void countPass(CNF *cnf);
 void countConstraint(CNF *cnf, VectorEdge * stack, Edge e);
-void addConstraint(CNF *cnf, Edge constraint);
+void addConstraintCNF(CNF *cnf, Edge constraint);
 int solveCNF(CNF *cnf);
 bool getValueCNF(CNF *cnf, Edge var);
 void printCNF(Edge e);
diff --git a/src/Backend/satencoder.c b/src/Backend/satencoder.c
index fede5e4..1cf408d 100644
--- a/src/Backend/satencoder.c
+++ b/src/Backend/satencoder.c
@@ -71,7 +71,7 @@ void encodeAllSATEncoder(CSolver *csolver, SATEncoder * This) {
 		Edge c= encodeConstraintSATEncoder(This, constraint);
 		printCNF(c);
 		printf("\n\n");
-		addConstraint(This->cnf, c);
+		addConstraintCNF(This->cnf, c);
 	}
 }
 
@@ -198,7 +198,7 @@ void createAllTotalOrderConstraintsSATEncoder(SATEncoder* This, Order* order){
 				OrderPair pairIK = {valueI, valueK};
 				Edge constIK = getPairConstraint(This, table, & pairIK);
 				Edge constJK = getPairConstraint(This, table, & pairJK);
-				addConstraint(This->cnf, generateTransOrderConstraintSATEncoder(This, constIJ, constJK, constIK)); 
+				addConstraintCNF(This->cnf, generateTransOrderConstraintSATEncoder(This, constIJ, constJK, constIK)); 
 			}
 		}
 	}
diff --git a/src/Test/testcnf.c b/src/Test/testcnf.c
index ebd79f5..20cd5cd 100644
--- a/src/Test/testcnf.c
+++ b/src/Test/testcnf.c
@@ -21,7 +21,7 @@ int main(int numargs, char ** argv) {
 	Edge cor=constraintOR2(cnf, constraintAND2(cnf, c1, c2), v5);
 	printCNF(cor);
 	printf("\n");
-	addConstraint(cnf, cor);
+	addConstraintCNF(cnf, cor);
 	int value=solveCNF(cnf);
 	if (value==1) {
 		bool v1v=getValueCNF(cnf, v1);