Fix conflict

diff --git a/src/Backend/constraint.c b/src/Backend/constraint.c
index 843f1685c48c99779d118c5037d42a68d960e83b..e9f9aa0f35f1eecf72f5e42f60801fb7b145cc64 100644 (file)
--- 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 ae22fdb4b53cebbdff9e3c937f067b2ee06016d1..2693455a0ba0f85da0c731709482c5b2de67d152 100644 (file)
--- 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 fede5e4cb3262594ca528b039d0eb31c88f0081f..1cf408d0ca404e15e67de8ae730bdd9854f3d6e2 100644 (file)
--- 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 ebd79f52f9a788a460d0119e879eec4c8f3a75af..20cd5cd4668cdc001941a0c90b09adccc291a8c3 100644 (file)
--- 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);