From e9710fed80cc02ed360e116af34623cff2fb8087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <uni@thorsten-wissmann.de>
Date: Sun, 26 Jan 2014 14:47:17 +0100
Subject: [PATCH] Rename onestep.cpp -> onestep-example.cpp
---
GMLMIP-0.1/makefile | 6 +++---
GMLMIP-0.1/{onestep.cpp => onestep-example.cpp} | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
rename GMLMIP-0.1/{onestep.cpp => onestep-example.cpp} (96%)
diff --git a/GMLMIP-0.1/makefile b/GMLMIP-0.1/makefile
index 4d68d86..93b4228 100644
--- a/GMLMIP-0.1/makefile
+++ b/GMLMIP-0.1/makefile
@@ -13,7 +13,7 @@ parser/lex.yy.h
.PHONY: all clean parser/% formulas/% rules/%
-all: main onestep
+all: main onestep-example
.PHONY: phony
# don't do anything here
@@ -34,14 +34,14 @@ rules/%: phony
main: main.o $(POBJS) $(FOBJS) $(ROBJS)
$(GCC) $(GCCFLAGS) $(POBJS) $(FOBJS) $(ROBJS) -lbdd -lm -lglpk $< -o $@
-onestep: onestep.o $(POBJS) $(FOBJS) $(ROBJS)
+onestep-example: onestep-example.o $(POBJS) $(FOBJS) $(ROBJS)
$(GCC) $(GCCFLAGS) $(POBJS) $(FOBJS) $(ROBJS) -lbdd -lm -lglpk $< -o $@
main.o: main.cpp $(HEADERS)
$(GCC) $(GCCFLAGS) -c $< -o $@
-onestep.o: onestep.cpp $(HEADERS)
+onestep-example.o: onestep-example.cpp $(HEADERS)
$(GCC) $(GCCFLAGS) -c $<
clean: parser/clean formulas/clean rules/clean
diff --git a/GMLMIP-0.1/onestep.cpp b/GMLMIP-0.1/onestep-example.cpp
similarity index 96%
rename from GMLMIP-0.1/onestep.cpp
rename to GMLMIP-0.1/onestep-example.cpp
index d9d6871..25e07f2 100644
--- a/GMLMIP-0.1/onestep.cpp
+++ b/GMLMIP-0.1/onestep-example.cpp
@@ -34,7 +34,7 @@ int main (int argc, char *argv[]){
//bdd b = bdd_and(f->modal(new bdd(f->variable(0)), 4, 0),
// bdd_not(f->modal(new bdd(f->variable(0)), 6, 0)));
bdd b = bdd_or(f->modal(new bdd(f->variable(4)), 4, 0),
- bdd_not(f->modal(new bdd(f->variable(7)), 3, 0)));
+ bdd_not(f->modal(new bdd(bdd_not(f->variable(7))), 3, 0)));
f->set_bdd(b);
// bdd_varblockall();
// bdd_reorder(BDD_REORDER_WIN3ITE);
@@ -58,7 +58,6 @@ int main (int argc, char *argv[]){
// }
// cout << endl;
//}
- f->onestep();
vector<SatisfyingAssignment> vsa = f->onestep();
cout << vsa.size() << " possible assignments\n";
for (unsigned int i = 0; i < vsa.size(); i++) {
--
GitLab