Incremental solver works and the test case passes

[satune.git] / src / Backend / satencoder.h

diff --git a/src/Backend/satencoder.h b/src/Backend/satencoder.h
index 827a9041b059922d78607771352bf7b615cd9a34..11387a8b6c937f8e61f9d5e8b03812447df021b7 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -19,6 +19,7 @@ public:
        CNF *getCNF() { return cnf;}
        long long getSolveTime() { return cnf->solveTime; }
        long long getEncodeTime() { return cnf->encodeTime; }
+       void freezeElementVariables(ElementEncoding *encoding);
 
        CMEMALLOC;
 private:
@@ -44,6 +45,7 @@ private:
        void generateElementEncoding(Element *element);
        Edge encodeOperatorPredicateSATEncoder(BooleanPredicate *constraint);
        Edge encodeEnumOperatorPredicateSATEncoder(BooleanPredicate *constraint);
+       Edge encodeUnaryPredicateSATEncoder(BooleanPredicate *constraint);
        Edge encodeEnumEqualsPredicateSATEncoder(BooleanPredicate *constraint);
        void encodeOperatorElementFunctionSATEncoder(ElementFunction *This);
        Edge encodeCircuitOperatorPredicateEncoder(BooleanPredicate *constraint);
@@ -55,6 +57,8 @@ private:
        Edge encodePartialOrderSATEncoder(BooleanOrder *constraint);
        void createAllTotalOrderConstraintsSATEncoder(Order *order);
        void createAllPartialOrderConstraintsSATEncoder(Order *order);
+       void createAllTotalOrderConstraintsSATEncoderSparse(Order *order);
+       void createAllPartialOrderConstraintsSATEncoderSparse(Order *order);
        Edge getOrderConstraint(HashtableOrderPair *table, OrderPair *pair);
        Edge generateTransOrderConstraintSATEncoder(Edge constIJ, Edge constJK, Edge constIK);
        Edge generatePartialOrderConstraintsSATEncoder(Edge ij,Edge ji, Edge jk, Edge kj,Edge ik, Edge ki);
@@ -63,13 +67,14 @@ private:
        void encodeEnumTableElemFunctionSATEncoder(ElementFunction *This);
        void encodeEnumEntriesTableElemFuncSATEncoder(ElementFunction *This);
        void generateAnyValueBinaryIndexEncoding(ElementEncoding *encoding);
+       int getMaximumUsedSize(ElementEncoding *encoding);
        void generateAnyValueBinaryIndexEncodingPositive(ElementEncoding *encoding);
        void generateAnyValueBinaryValueEncoding(ElementEncoding *encoding);
        CNF *cnf;
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;
        VectorEdge *vector;
-        friend class VarOrderingOpt;
+       friend class VarOrderingOpt;
 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);