More helper functions

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index 8d34d473d6fcaec7a40930497c138b560004b1b1..8fe908a50a475938b60dad9b000e734e04fb6d49 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -222,3 +222,31 @@ void EncodingSubGraph::addNode(EncodingNode *n) {
 SetIteratorEncodingNode * EncodingSubGraph::nodeIterator() {
        return nodes.iterator();
 }
+
+uint EncodingSubGraph::computeIntersection(Set *s) {
+       uint intersect=0;
+       uint size=s->getSize();
+       for(uint i=0; i<size; i++) {
+               uint64_t val=s->getElement(i);
+               if (values.contains(val))
+                       intersect++;
+       }
+       return intersect;
+}
+
+uint EncodingSubGraph::computeIntersection(EncodingSubGraph *g) {
+       if (g->values.getSize() > values.getSize()) {
+               //iterator over smaller set
+               return g->computeIntersection(this);
+       }
+       
+       uint intersect=0;
+       SetIterator64Int * iter=g->values.iterator();
+       while(iter->hasNext()) {
+               uint64_t val=iter->next();
+               if (values.contains(val))
+                       intersect++;
+       }
+       delete iter;
+       return intersect;
+}

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.h b/src/ASTAnalyses/Encoding/encodinggraph.h
index e44ccfd69c539b3eaaec6afdc7b1cce018a7a17e..4057dd2ed7c10115081320768bf04d0fa150dd43 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.h
+++ b/src/ASTAnalyses/Encoding/encodinggraph.h
@@ -58,6 +58,8 @@ class EncodingSubGraph {
        EncodingSubGraph();
        void addNode(EncodingNode *n);
        SetIteratorEncodingNode * nodeIterator();
+       uint computeIntersection(Set *s);
+       uint computeIntersection(EncodingSubGraph *g);
        
        CMEMALLOC;
  private:
@@ -88,6 +90,4 @@ class EncodingEdge {
        friend class EncodingGraph;
 };
 
-
-
 #endif

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index d5d6f5ef74f72678c98007a13e4823063394931e..2a85eaead2d96bd1ccd616b45c2f35301eb777b8 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -27,6 +27,7 @@ typedef Hashset<Boolean *, uintptr_t, PTRSHIFT> HashsetBoolean;
 typedef Hashset<Element *, uintptr_t, PTRSHIFT> HashsetElement;
 typedef SetIterator<Boolean *, uintptr_t, PTRSHIFT> SetIteratorBoolean;
 typedef Hashset<uint64_t, uint64_t, 0> Hashset64Int;
+typedef SetIterator<uint64_t, uint64_t, 0> SetIterator64Int;
 
 
 typedef Hashtable<OrderNode *, HashsetOrderNode *, uintptr_t, PTRSHIFT> HashtableNodeToNodeSet;