edits

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

diff --git a/src/Backend/satencoder.h b/src/Backend/satencoder.h
index 4cfe4c2fc6ca5121448a099424b70f2218760b01..08ec52707c2fe57988df6670022be6263085e888 100644 (file)
--- a/src/Backend/satencoder.h
+++ b/src/Backend/satencoder.h
@@ -6,21 +6,21 @@
 #include "inc_solver.h"
 #include "constraint.h"
 
-typedef HashTable<Boolean *, Node *, uintptr_t, 4> BooleanToEdgeMap;
+typedef Hashtable<Boolean *, Node *, uintptr_t, 4> BooleanToEdgeMap;
 
 class SATEncoder {
- public:
+public:
        int solve();
        SATEncoder(CSolver *solver);
        ~SATEncoder();
        void encodeAllSATEncoder(CSolver *csolver);
-       Edge encodeConstraintSATEncoder(Boolean *constraint);
-       CNF * getCNF() { return cnf;}
+       Edge encodeConstraintSATEncoder(BooleanEdge constraint);
+       CNF *getCNF() { return cnf;}
        long long getSolveTime() { return cnf->solveTime; }
        long long getEncodeTime() { return cnf->encodeTime; }
-       
-       MEMALLOC;
- private:
+
+       CMEMALLOC;
+private:
        Edge getNewVarSATEncoder();
        void getArrayNewVarsSATEncoder(uint num, Edge *carray);
        Edge encodeVarSATEncoder(BooleanVar *constraint);
@@ -47,16 +47,19 @@ class SATEncoder {
        Edge encodeOrderSATEncoder(BooleanOrder *constraint);
        Edge inferOrderConstraintFromGraph(Order *order, uint64_t _first, uint64_t _second);
        Edge getPairConstraint(Order *order, OrderPair *pair);
+       Edge getPartialPairConstraint(Order *order, OrderPair *pair);
        Edge encodeTotalOrderSATEncoder(BooleanOrder *constraint);
        Edge encodePartialOrderSATEncoder(BooleanOrder *constraint);
        void createAllTotalOrderConstraintsSATEncoder(Order *order);
-       Edge getOrderConstraint(HashTableOrderPair *table, OrderPair *pair);
+       void createAllPartialOrderConstraintsSATEncoder(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);
        Edge encodeEnumEntriesTablePredicateSATEncoder(BooleanPredicate *constraint);
        Edge encodeEnumTablePredicateSATEncoder(BooleanPredicate *constraint);
        void encodeEnumTableElemFunctionSATEncoder(ElementFunction *This);
        void encodeEnumEntriesTableElemFuncSATEncoder(ElementFunction *This);
-       
+
        CNF *cnf;
        CSolver *solver;
        BooleanToEdgeMap booledgeMap;
@@ -64,5 +67,4 @@ class SATEncoder {
 };
 
 void allocElementConstraintVariables(ElementEncoding *ee, uint numVars);
-Edge getOrderConstraint(HashTableOrderPair *table, OrderPair *pair);
 #endif