moved cooc() to parent class

proycon · Apr 25, 2012 · 2523e67 · 2523e67
1 parent dcdbcad
commit 2523e67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/include/alignmodel.h b/include/alignmodel.h
@@ -41,6 +41,8 @@ class AlignmentModel: public AlignConstraintInterface {
 
 	int graphalign(SelectivePatternModel & sourcemodel, SelectivePatternModel & targetmodel, double impactfactor = 1.2);
 
+	double cooc( CoocMode mode, const std::multiset<uint32_t> & sourceindex, const std::multiset<uint32_t> & targetindex,  const double threshold = 0); //multiset instead of vector cause we want the ordering to easily compute co-occurence
+
 	virtual void save(const std::string & filename) {};	
 };
 
@@ -73,7 +75,7 @@ class CoocAlignmentModel: public AlignmentModel {
 
     void save(const std::string & filename);
 
-    double cooc( const std::multiset<uint32_t> & sourceindex, const std::multiset<uint32_t> & targetindex,  const double threshold = 0); //multiset instead of vector cause we want the ordering to easily compute co-occurence 
+
     unsigned int compute(const EncAnyGram * sourcegram, const std::multiset<uint32_t> & sourceindex, SelectivePatternModel * targetmodel);
 
 
@@ -95,6 +97,8 @@ class EMAlignmentModel: public AlignmentModel {
 };
 
 
+
+
 class EMAlignmentModel2: public AlignmentModel {
    protected:
     bool INIT;

diff --git a/src/alignmodel.cpp b/src/alignmodel.cpp
@@ -4,7 +4,7 @@ using namespace std;
 
 const EncNullGram * NULLGRAM = new EncNullGram();
 
-double CoocAlignmentModel::cooc( const multiset<uint32_t> & sourceindex, const multiset<uint32_t> & targetindex, const double heurthreshold) {    
+double AlignmentModel::cooc( CoocMode mode, const multiset<uint32_t> & sourceindex, const multiset<uint32_t> & targetindex, const double heurthreshold) {    
     //Jaccard co-occurrence    
     int intersectioncount = 0;    
 
@@ -82,7 +82,7 @@ unsigned int CoocAlignmentModel::compute(const EncAnyGram * sourcegram, const mu
 		    } else {
 		       targetindex = &targetmodel->skipgrams[*( (EncSkipGram*) targetgram)].sentences;
 		    }				    
-		    const double coocvalue = cooc(sourceindex, *targetindex, absthreshold);                    
+		    const double coocvalue = cooc(mode, sourceindex, *targetindex, absthreshold);                    
 		    if (coocvalue >= absthreshold) {
 		    	//prune based on absolute co-occurrence value
 		    	found++;