Posted implementation of FilterTool.

[bamtools.git] / src / utils / bamtools_filter_engine.cpp

diff --git a/src/utils/bamtools_filter_engine.cpp b/src/utils/bamtools_filter_engine.cpp
index 0689ebe684685c0dfef6c74f21f673ccba8ca8d8..3ad943082a0175efc4a2dc1560288b8be32ff95d 100644 (file)
--- a/src/utils/bamtools_filter_engine.cpp
+++ b/src/utils/bamtools_filter_engine.cpp
@@ -8,6 +8,7 @@
 // 
 // ***************************************************************************
 
+#include <iostream>
 #include "bamtools_filter_engine.h"
 #include "BamAux.h"
 using namespace std;
@@ -27,7 +28,7 @@ bool PropertyFilterValue::check(const string& query) const {
   
     // localize string version of our filter value
     const string& valueString = Value.get<string>();
-
+    
     // string matching based on our filter type
     switch ( Type ) {
         case ( PropertyFilterValue::CONTAINS)           : return ( query.find(valueString) != string::npos );
@@ -44,22 +45,6 @@ bool PropertyFilterValue::check(const string& query) const {
     return false;
 }
 
-// --------------------------------------------------------
-// PropertyFilter implementation
-PropertyFilter::PropertyFilter(void)
-    : Type(PropertyFilter::EXACT)
-    , LeftChild(0)
-    , RightChild(0)
-{ }
-
-PropertyFilter::~PropertyFilter(void) {
-    delete LeftChild;
-    LeftChild = 0;
-  
-    delete RightChild;
-    RightChild = 0;
-}
-
 // ---------------------------------------------------------
 // FilterEngine implementation
 
@@ -115,87 +100,3 @@ const vector<string> FilterEngine::enabledPropertyNames(void) {
         if ( (*propIter).IsEnabled ) names.push_back( (*propIter).Name );    
     return names;
 }
-
-// ================================================================
-// DEBUGGING
-
-void FilterEngine::print(void) {
-    cout << endl;
-    printAllProperties();
-    printEnabledProperties();
-    printFilters();
-}
-
-void FilterEngine::printAllProperties(void) {
-    
-    cout << "=======================================" << endl;
-    cout << "All Properties: " << endl;
-    cout << endl;
-  
-    const vector<string> propertyNames = allPropertyNames();
-    vector<string>::const_iterator nameIter = propertyNames.begin();
-    vector<string>::const_iterator nameEnd  = propertyNames.end();
-    for ( ; nameIter != nameEnd; ++nameIter )
-        cout << (*nameIter) << endl;
-    cout << endl;
-}
-
-void FilterEngine::printEnabledProperties(void) {
-    
-    cout << "=======================================" << endl;
-    cout << "Enabled Properties: " << endl;
-    cout << endl;
-  
-    const vector<string> propertyNames = enabledPropertyNames();
-    vector<string>::const_iterator nameIter = propertyNames.begin();
-    vector<string>::const_iterator nameEnd  = propertyNames.end();
-    for ( ; nameIter != nameEnd; ++nameIter )
-        cout << (*nameIter) << endl;
-    cout << endl;
-}
-
-void FilterEngine::printFilters(void) {
-  
-    cout << "=======================================" << endl;
-    cout << "Current Filters: " << endl;
-    cout << endl;
-    
-    // iterate over all filters in FilterEngine
-    FilterMap::const_iterator filterIter = m_filters.begin();
-    FilterMap::const_iterator filterEnd  = m_filters.end();
-    for ( ; filterIter != filterEnd; ++filterIter ) {
-        cout << "Filter Name: " << (*filterIter).first << endl;
-      
-        // see if filter set has this property enabled
-        const PropertyFilter& filter = (*filterIter).second;
-        PropertyMap::const_iterator propIter = filter.Properties.begin();
-        PropertyMap::const_iterator propEnd  = filter.Properties.end();
-        for ( ; propIter != propEnd; ++propIter ) {
-          
-            cout << " - " << (*propIter).first << " : ";
-            const PropertyFilterValue& filterValue = (*propIter).second;
-             
-            if ( filterValue.Value.is_type<bool>() )              cout << "\t" << boolalpha << filterValue.Value.get<bool>();
-            else if ( filterValue.Value.is_type<int>() )          cout << "\t" << filterValue.Value.get<int>();
-            else if ( filterValue.Value.is_type<unsigned int>() ) cout << "\t" << filterValue.Value.get<unsigned int>();
-            else if ( filterValue.Value.is_type<unsigned short>() ) cout << "\t" << filterValue.Value.get<unsigned short>();
-            else if ( filterValue.Value.is_type<float>() )        cout << "\t" << filterValue.Value.get<float>();
-            else if ( filterValue.Value.is_type<string>() )  cout << "\t" << filterValue.Value.get<string>();
-            else cout << "** UNKNOWN VALUE TYPE!! **";
-                
-            switch( filterValue.Type ) {
-                case (PropertyFilterValue::CONTAINS)           : cout << " (contains)"; break;
-                case (PropertyFilterValue::ENDS_WITH)          : cout << " (ends_with)"; break;
-                case (PropertyFilterValue::EXACT)              : cout << " (exact)"; break;
-                case (PropertyFilterValue::GREATER_THAN)       : cout << " (greater_than)"; break;
-                case (PropertyFilterValue::GREATER_THAN_EQUAL) : cout << " (greater_than_equal)"; break;
-                case (PropertyFilterValue::LESS_THAN)          : cout << " (less_than)"; break;
-                case (PropertyFilterValue::LESS_THAN_EQUAL)    : cout << " (less_than_equal)"; break;
-                case (PropertyFilterValue::NOT)                : cout << " (not)"; break;
-                case (PropertyFilterValue::STARTS_WITH)        : cout << " (starts_with)"; break;
-                default : cout << " : ** UNKNOWN COMPARE TYPE!! **";
-            }
-            cout << endl;
-        }
-    }
-}