Removing extra constraints for the unary encoding

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

diff --git a/src/Backend/satencoder.h b/src/Backend/satencoder.h
index 9750048fb26f7bafa7497d6c586e752648e0156e..b67708da00a749dbe0d9b9473c68d97f06f79e0a 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -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,7 +61,9 @@ private:
        Edge encodeEnumTablePredicateSATEncoder(BooleanPredicate *constraint);
        void encodeEnumTableElemFunctionSATEncoder(ElementFunction *This);
        void encodeEnumEntriesTableElemFuncSATEncoder(ElementFunction *This);
-
+        void generateAnyValueOneHotEncoding(ElementEncoding *encoding);
+       void generateAnyValueBinaryIndexEncoding(ElementEncoding *encoding);
+       void generateAnyValueBinaryValueEncoding(ElementEncoding *encoding);
        CNF *cnf;
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;