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 03471647f830b1cf0586e830297690fe52a74776..11387a8b6c937f8e61f9d5e8b03812447df021b7 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -10,7 +10,7 @@ typedef Hashtable<Boolean *, Node *, uintptr_t, 4> BooleanToEdgeMap;
 
 class SATEncoder {
 public:
-       int solve();
+       int solve(long timeout);
        SATEncoder(CSolver *solver);
        ~SATEncoder();
        void resetSATEncoder();
@@ -19,9 +19,11 @@ public:
        CNF *getCNF() { return cnf;}
        long long getSolveTime() { return cnf->solveTime; }
        long long getEncodeTime() { return cnf->encodeTime; }
+       void freezeElementVariables(ElementEncoding *encoding);
 
        CMEMALLOC;
 private:
+       void shouldMemoize(Element *elem, uint64_t val, bool &memo);
        Edge getNewVarSATEncoder();
        void getArrayNewVarsSATEncoder(uint num, Edge *carray);
        Edge encodeVarSATEncoder(BooleanVar *constraint);
@@ -31,11 +33,11 @@ private:
        void encodeElementSATEncoder(Element *element);
        void encodeElementFunctionSATEncoder(ElementFunction *function);
        void encodeTableElementFunctionSATEncoder(ElementFunction *This);
-       Edge getElementValueOneHotConstraint(Element *elem, uint64_t value);
-       Edge getElementValueUnaryConstraint(Element *elem, uint64_t value);
-       Edge getElementValueBinaryIndexConstraint(Element *element, uint64_t value);
-       Edge getElementValueBinaryValueConstraint(Element *element, uint64_t value);
-       Edge getElementValueConstraint(Element *element, uint64_t value);
+       Edge getElementValueOneHotConstraint(Element *elem, Polarity p, uint64_t value);
+       Edge getElementValueUnaryConstraint(Element *elem, Polarity p, uint64_t value);
+       Edge getElementValueBinaryIndexConstraint(Element *element, Polarity p, uint64_t value);
+       Edge getElementValueBinaryValueConstraint(Element *element, Polarity p, uint64_t value);
+       Edge getElementValueConstraint(Element *element, Polarity p, uint64_t value);
        void generateOneHotEncodingVars(ElementEncoding *encoding);
        void generateUnaryEncodingVars(ElementEncoding *encoding);
        void generateBinaryIndexEncodingVars(ElementEncoding *encoding);
@@ -43,6 +45,8 @@ 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);
        Edge encodeOrderSATEncoder(BooleanOrder *constraint);
@@ -53,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);
@@ -60,11 +66,15 @@ private:
        Edge encodeEnumTablePredicateSATEncoder(BooleanPredicate *constraint);
        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;
 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);