allowed wrapup to force solver state

Author: muhos

src/gpu/definitions.cuh

@@ -64,14 +64,14 @@ namespace ParaFROST {
 
 	#if	defined(_DEBUG) || defined(DEBUG) || !defined(NDEBUG)
 		#define CHECK(FUNCCALL) \
-			{ \
+			do { \
 				const cudaError_t returncode = FUNCCALL; \
 				if (returncode != cudaSuccess) { \
 					LOGERRORN("CUDA runtime failure due to %s", cudaGetErrorString(returncode)); \
 					cudaDeviceReset(); \
 					exit(1); \
 				} \
-			}
+			} while(0)
 	#else
 		#define CHECK(FUNCCALL) FUNCCALL
 	#endif

src/gpu/solver.cpp

@@ -229,8 +229,9 @@ void Solver::solve()
 	wrapup();
 }
 
-void Solver::wrapup() {
+void Solver::wrapup(const CNFState& state) {
     LOGHEADER(1, 5, "Result");
+	if (state != UNSOLVED) cnfstate = state;
 	if (cnfstate == SAT) {
 		LOGSAT("SATISFIABLE");
 		assert(sp != NULL && sp->value != NULL);

src/gpu/solver.hpp

@@ -657,9 +657,9 @@ namespace ParaFROST {
 		void			eligibleVMFQ		();
 		void			decide				();
 		void			report				();
-		void			wrapup				();
 		void			solve				();
 		bool			parse				();
+		void			wrapup				(const CNFState& state = UNSOLVED);
 		bool			parse				(const string&);
 		void			map					(BCNF&);
 		void			map					(WL&);