Rename onestep.cpp -> onestep-example.cpp

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

GMLMIP-0.1/onestep.cpp → 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++) {