added conflicts and degrees_of_variables to instance db entries

src/runMinisat.cpp

@@ -41,9 +41,6 @@ int main(int argc, char** argv)
 	{
         satlab::MinisatSolver solver(satlab::types::convert<satlab::KSATinstance>(doc));
         
-        bool modelFound = solver.solve();
-        
-        
         auto result = satlab::convert<bsoncxx::builder::stream::document>(
                         solver.getResult()
                       );

src/util/bson2ksatClauseConverter.h

@@ -11,30 +11,6 @@
 
 namespace satlab
 {
-/*
-using BSON2KSATCLAUSE_CONVERTER = Converter<KSATinstance::CLAUSE,
-                                            bsoncxx::array::element>;
-                                            
-template<>
-class Converter<KSATinstance::CLAUSE, bsoncxx::array::element>
-{
-public:
-    KSATinstance::CLAUSE convert(const bsoncxx::array::element& docView);
-};
-
-KSATinstance::CLAUSE
-BSON2KSATCLAUSE_CONVERTER::convert(const bsoncxx::array::element& docView)
-{
-    KSATinstance::CLAUSE clause;
-    
-    for(auto lit : static_cast<bsoncxx::array::view>(docView.get_array()))
-    {
-        clause.push_back(lit.get_int32());
-    }
-    
-    return clause;
-}
-*/
 
 namespace types
 {

src/util/bson2ksatConverter.h

@@ -35,34 +35,6 @@ KSATinstance convert(const bsoncxx::document::view& docView)
 }
 
 }
-/*
-using BSON2KSAT_CONVERTER = Converter<KSATinstance, bsoncxx::document::view>;
-
-template<>
-class Converter<KSATinstance, bsoncxx::document::view>
-{
-public:
-    KSATinstance convert(const bsoncxx::document::view& docView);
-    
-private:
-    BSON2KSATCLAUSE_CONVERTER clauseConverter;
-};
-
-KSATinstance BSON2KSAT_CONVERTER::convert(const bsoncxx::document::view& docView)
-{
-    KSATinstance ksat;
-    
-    bsoncxx::array::view clauses = docView["clauses"].get_array();
-    
-    for(auto clause : clauses)
-    {
-        ksat.addClause(clauseConverter.convert(clause));
-    }
-    
-    
-    return ksat;
-}
-*/
 
 }
 

src/util/convert.h

@@ -3,14 +3,6 @@
 
 namespace satlab
 {
-/*
-template<typename TARGET_T, typename SOURCE_T>
-class Converter
-{
-public:
-    TARGET_T convert(const SOURCE_T& source);
-};
-*/
 
 namespace types
 {