Merge branch 'scratch' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

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

diff --git a/src/Backend/satencoder.h b/src/Backend/satencoder.h
index dcf3b86ad30cb40a0fb3770144d6550eba11bd94..0ccf31cfcdcb012ee00a533e81e1ed788dfea2c3 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -13,7 +13,7 @@ public:
        int solve();
        SATEncoder(CSolver *solver);
        ~SATEncoder();
-        void resetSATEncoder();
+       void resetSATEncoder();
        void encodeAllSATEncoder(CSolver *csolver);
        Edge encodeConstraintSATEncoder(BooleanEdge constraint);
        CNF *getCNF() { return cnf;}
@@ -22,6 +22,7 @@ public:
 
        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 +32,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);
@@ -60,11 +61,12 @@ private:
        Edge encodeEnumTablePredicateSATEncoder(BooleanPredicate *constraint);
        void encodeEnumTableElemFunctionSATEncoder(ElementFunction *This);
        void encodeEnumEntriesTableElemFuncSATEncoder(ElementFunction *This);
-
+       void generateAnyValueBinaryIndexEncoding(ElementEncoding *encoding);
+       void generateAnyValueBinaryValueEncoding(ElementEncoding *encoding);
        CNF *cnf;
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;
-
+       VectorEdge *vector;
 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);