merge to branch master

diff --cc src/ASTAnalyses/Encoding/encodinggraph.cc
index 60437f5ea4fd266f4f62437da3e9d255140b7943,08db96d7b55cc47e02c7be0e394ae1135270ce5a..75a98b1ea7ecc43b66b88700612ab6f4d32032f0
--- 1/src/ASTAnalyses/Encoding/encodinggraph.cc
--- 2/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@@ -6,7 -6,9 +6,10 @@@
  #include "set.h"
  #include "csolver.h"
  #include "tunable.h"
+ #include "qsort.h"
+ #include "subgraph.h"
+ #include "elementencoding.h"
 +#include "boolean.h"
  
  EncodingGraph::EncodingGraph(CSolver * _solver) :
        solver(_solver) {
@@@ -29,6 -42,35 +43,35 @@@ void EncodingGraph::buildGraph() 
                        ASSERT(0);
                }
        }
 -                      ElementEncoding *encoding=getElementEncoding(e);
+       bsdqsort(edgeVector.expose(), edgeVector.getSize(), sizeof(EncodingEdge *), sortEncodingEdge);
+       decideEdges();
+ }
+ 
+ void EncodingGraph::encode() {
+       SetIteratorEncodingSubGraph * itesg=subgraphs.iterator();
+       while(itesg->hasNext()) {
+               EncodingSubGraph *sg=itesg->next();
+               sg->encode();
+       }
+       delete itesg;
+ 
+       ElementIterator it(solver);
+       while(it.hasNext()) {
+               Element * e = it.next();
+               switch(e->type) {
+               case ELEMSET:
+               case ELEMFUNCRETURN: {
++                      ElementEncoding *encoding=e->getElementEncoding();
+                       if (encoding->getElementEncodingType() == ELEM_UNASSIGNED) {
+                               //Do assignment...
+                       }
+                       break;
+               }
+               default:
+                       break;
+               }
+       }
+       
  }
  
  void EncodingGraph::mergeNodes(EncodingNode *first, EncodingNode *second) {