Move to class simplifiedcnf

Author: msoos

src/main.cpp

@@ -317,7 +317,7 @@ int main(int argc, char** argv)
     const string fname(files[0]);
     if (do_arjun) {
         parse_file(fname, &cnf);
-        const auto orig_sampl_vars = cnf.sampl_vars;
+        const auto orig_sampl_vars = cnf.get_sampl_vars();
         double my_time = cpu_time();
         ArjunNS::Arjun arjun;
         arjun.set_verb(verb);
@@ -330,11 +330,11 @@ int main(int argc, char** argv)
         arjun.standalone_minimize_indep(cnf, etof_conf.all_indep);
         if (with_e) arjun.standalone_elim_to_file(cnf, etof_conf, simp_conf);
         appmc->new_vars(cnf.nVars());
-        appmc->set_sampl_vars(cnf.sampl_vars);
-        for(const auto& c: cnf.clauses) appmc->add_clause(c);
-        for(const auto& c: cnf.red_clauses) appmc->add_red_clause(c);
-        appmc->set_multiplier_weight(cnf.multiplier_weight);
-        print_final_indep_set(cnf.sampl_vars, orig_sampl_vars.size());
+        appmc->set_sampl_vars(cnf.get_sampl_vars());
+        for(const auto& c: cnf.get_clauses()) appmc->add_clause(c);
+        for(const auto& c: cnf.get_red_clauses()) appmc->add_red_clause(c);
+        appmc->set_multiplier_weight(cnf.get_multiplier_weight());
+        print_final_indep_set(cnf.get_sampl_vars(), orig_sampl_vars.size());
         cout << "c o [arjun] Arjun finished. T: " << (cpu_time() - my_time) << endl;
     } else {
         parse_file(fname, appmc);