From aaa43ff5f075537d07402ca5ba0f31ee306e18ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <uni@thorsten-wissmann.de>
Date: Sat, 25 Jan 2014 10:37:38 +0100
Subject: [PATCH] Some whitespace and indentation fixups
---
GMLMIP-0.1/formulas/formula.cpp | 2 +-
GMLMIP-0.1/main.cpp | 25 ++++++++++++-------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/GMLMIP-0.1/formulas/formula.cpp b/GMLMIP-0.1/formulas/formula.cpp
index 0a9ef1e..2491e55 100644
--- a/GMLMIP-0.1/formulas/formula.cpp
+++ b/GMLMIP-0.1/formulas/formula.cpp
@@ -54,7 +54,7 @@ bool Formula<ModalValueType>::check_satisfiability(bdd b){
//bdd_printdot(b);
bdd_allsat(b, sat_handler); // pushes satisfying assignment onto stack
vector<SatisfyingAssignment> sat_ass = sat_ass_stack;
- sat_ass_stack.clear();
+ sat_ass_stack.clear();
for(unsigned int i=0; i < sat_ass.size() && !sat; i++){ // we break if proved sat
sat = apply_rules(sat_ass[i]);
}
diff --git a/GMLMIP-0.1/main.cpp b/GMLMIP-0.1/main.cpp
index 1e88620..c4a5098 100644
--- a/GMLMIP-0.1/main.cpp
+++ b/GMLMIP-0.1/main.cpp
@@ -33,18 +33,18 @@ int main (int argc, char *argv[]){
bdd_error_hook(error_handler);
parse(f, argc, argv, verbose);
if(f){
- // bdd_varblockall();
- // bdd_reorder(BDD_REORDER_WIN3ITE);
- // bdd_printdot((driver.formula)->bdd_rep);
- //bdd_printset(f->get_bdd());
- //cout << endl;
- //(driver.formula)->print_back_vars();
- if(f->satisfiability(verbose))
- cout << "Satisfiable" << endl;
- else
- cout << "Unsatisfiable" << endl;
- f->clear_maps();
- delete f;
+ // bdd_varblockall();
+ // bdd_reorder(BDD_REORDER_WIN3ITE);
+ // bdd_printdot((driver.formula)->bdd_rep);
+ //bdd_printset(f->get_bdd());
+ //cout << endl;
+ //(driver.formula)->print_back_vars();
+ if(f->satisfiability(verbose))
+ cout << "Satisfiable" << endl;
+ else
+ cout << "Unsatisfiable" << endl;
+ f->clear_maps();
+ delete f;
}
bdd_done();
total_time = clock() - total_time;
@@ -67,4 +67,3 @@ void parse(IFormula* &formula, int argc, char *argv[], int& option){
driver.extract_formula(formula);
}
-
--
GitLab