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

[satune.git] / src / Serialize / deserializer.cc

diff --git a/src/Serialize/deserializer.cc b/src/Serialize/deserializer.cc
index 163bd199e643e86a90a9b7eaf8b0b7248cebcbef..7616cd7e31a9186b6424eb06bb25704a61fe9c0c 100644 (file)
--- a/src/Serialize/deserializer.cc
+++ b/src/Serialize/deserializer.cc
@@ -26,10 +26,7 @@ Deserializer::~Deserializer() {
 }
 
 ssize_t Deserializer::myread(void* __buf, size_t __nbytes){
-       ssize_t t = read (filedesc, __buf, __nbytes);
-       write (1, __buf, __nbytes);
-       model_print("read\n");
-       return t;
+       return read (filedesc, __buf, __nbytes);
 }
 
 CSolver * Deserializer::deserialize(){
@@ -42,6 +39,15 @@ CSolver * Deserializer::deserialize(){
                        case BOOLEANVAR:
                                deserializeBooleanVar();
                                break;
+                       case ORDERCONST:
+                               deserializeBooleanOrder();
+                               break;
+                       case ORDERTYPE:
+                               deserializeOrder();
+                               break;
+                       case SETTYPE:
+                               deserializeSet();
+                               break;
                        default:
                                ASSERT(0);
                }
@@ -80,4 +86,40 @@ void Deserializer::deserializeBooleanOrder(){
        ASSERT(map.contains(optr));
        Order* order  = (Order*) map.get(optr);
        map.put(bo_ptr, solver->orderConstraint(order, first, second).getBoolean());
-}
\ No newline at end of file
+}
+
+void Deserializer::deserializeOrder(){
+       Order* o_ptr;
+       myread(&o_ptr, sizeof(Order*));
+       OrderType type;
+       myread(&type, sizeof(OrderType));
+       Set * set_ptr;
+       myread(&set_ptr, sizeof(Set *));
+       ASSERT(map.contains(set_ptr));
+       Set* set  = (Set*) map.get(set_ptr);
+       map.put(o_ptr, solver->createOrder(type, set));
+}
+
+void Deserializer::deserializeSet(){
+       Set *s_ptr;
+       myread(&s_ptr, sizeof(Set*));
+       VarType type;
+       myread(&type, sizeof(VarType));
+       bool isRange;
+       myread(&isRange, sizeof(bool));
+       uint64_t low;
+       myread(&low, sizeof(uint64_t));
+       uint64_t high;
+       myread(&high, sizeof(uint64_t));
+       uint size;
+       myread(&size, sizeof(uint));
+       Vector<uint64_t> members;
+       for(uint i=0; i<size; i++){
+               uint64_t mem;
+               myread(&mem, sizeof(uint64_t));
+               members.push(mem);
+       }
+       Set *set = isRange? solver->createRangeSet(type, low, high):
+               solver->createSet(type, members.expose(), size);
+       map.put(s_ptr, set);
+}