Wire in new classes into workflow; add tests

Author: CodeByDrescher

IDAWin/SundialsSolverInterface.cpp

@@ -10,12 +10,45 @@
 #include <iomanip>
 #include <sstream>
 #include <VCELL/GitDescribe.h>
+#include <VCELL/SimulationMessaging.h>
+#include "StoppedByUserException.h"
 
 #define CVODE_SOLVER "CVODE"
 #define IDA_SOLVER "IDA"
 
+void errExit(int returnCode, const std::string &errorMsg);
+
 void activateSolver(std::ifstream& inputFileStream, FILE* outputFile, int taskID) {
-	VCellSolver* targetSolver = VCellSolverFactory::produceVCellSolver(inputFileStream, taskID);
-	targetSolver->solve(nullptr, true, outputFile, VCellSundialsSolver::checkStopRequested);
+	try {
+		VCellSolver* targetSolver = VCellSolverFactory::produceVCellSolver(inputFileStream, taskID);
+		targetSolver->solve(nullptr, true, outputFile, VCellSundialsSolver::checkStopRequested);
+	} catch (const char *ex) {
+		errExit(-1, ex);
+	} catch (std::string &ex) {
+		errExit(-2, ex);
+	} catch (StoppedByUserException&) {
+		errExit(0, "Execution Stopped By User");
+	} catch (VCell::Exception &ex) {
+		errExit(-3, ex.getMessage());
+	} catch (const std::exception& err) {
+		errExit(-4, err.what());
+	} catch (...) {
+		errExit(-5, "unknown error");
+	}
+
+	// cleanup
+	if (SimulationMessaging::getInstVar() != nullptr) {
+		SimulationMessaging::getInstVar()->waitUntilFinished();
+		delete SimulationMessaging::getInstVar();
+	}
+}
+
+void errExit(int returnCode, const std::string &errorMsg) {
+	#ifdef USE_MESSAGING
+	if (returnCode && SimulationMessaging::getInstVar() && !SimulationMessaging::getInstVar()->isStopRequested()) {
+		SimulationMessaging::getInstVar()->setWorkerEvent(JobEvent::JOB_FAILURE, errorMsg.c_str());
+	}
+	#endif
+	std::cerr << errorMsg << std::endl;
 }
 

IDAWin/SundialsSolverStandalone.cpp

@@ -1,8 +1,7 @@
 // Messaging
-#ifdef USE_MESSAGING
+
 #include <VCELL/SimulationMessaging.h>
 #include <memory.h>
-#endif
 // Standard Includes
 #include <iomanip>
 #include <fstream>
@@ -18,7 +17,6 @@
 #define IDA_SOLVER "IDA"
 
 int parseAndRunWithArgParse(int argc, char *argv[]);
-void errExit(int returnCode, std::string &errorMsg);
 
 int main(int argc, char *argv[]) {
 	std::cout << std::setprecision(20);
@@ -58,46 +56,15 @@ int parseAndRunWithArgParse(int argc, char *argv[]) {
 			throw std::runtime_error("Could not open output file[" + outputFilePath + "] for writing.");
 		}
 		activateSolver(inputFileStream, outputFile, taskID);
-
-	} catch (const char *ex) {
-		errMsg += ex;
-		returnCode = -1;
-	} catch (std::string &ex) {
-		errMsg += ex;
-		returnCode = -1;
-	} catch (StoppedByUserException&) {
-		returnCode = 0; // stopped by user;
-	} catch (VCell::Exception &ex) {
-		errMsg += ex.getMessage();
-		returnCode = -1;
-	} catch (const std::exception& err) {
-		errMsg += err.what();
-		returnCode = -1;
+	} catch (const std::runtime_error& err) {
+		std::cerr << err.what() << std::endl;
+		returnCode = 5;
 	} catch (...) {
-		errMsg += "unknown error";
-		returnCode = -1;
+		std::cerr << "Unknown exception thrown." << std::endl;
+		returnCode = 255;
 	}
 
 	if (outputFile != NULL) { fclose(outputFile); }
 	if (inputFileStream.is_open()) { inputFileStream.close(); }
-	errExit(returnCode, errMsg);
 	return returnCode;
 }
-
-void errExit(int returnCode, std::string &errorMsg) {
-	#ifdef USE_MESSAGING
-	if (returnCode != 0) {
-		if (SimulationMessaging::getInstVar() != nullptr && !SimulationMessaging::getInstVar()->isStopRequested()) {
-			SimulationMessaging::getInstVar()->setWorkerEvent(new WorkerEvent(JOB_FAILURE, errorMsg.c_str()));
-		}
-	}
-	#endif
-
-	if (returnCode != 0) std::cerr << errorMsg << std::endl;
-	#ifdef USE_MESSAGING
-	else if (SimulationMessaging::getInstVar() != nullptr) {
-		SimulationMessaging::getInstVar()->waitUntilFinished();
-		delete SimulationMessaging::getInstVar();
-	}
-	#endif
-}

IDAWin/VCellCVodeSolver.cpp

@@ -501,7 +501,7 @@ void VCellCVodeSolver::cvodeSolve(bool bPrintProgress, FILE* outputFile, void (*
 		}
 	}
 #ifdef USE_MESSAGING
-	SimulationMessaging::getInstVar()->setWorkerEvent(new WorkerEvent(JOB_COMPLETED, 1, Time));
+	SimulationMessaging::getInstVar()->setWorkerEvent(JobEvent::JOB_COMPLETED, 1, Time);
 #endif
 }
 

IDAWin/VCellIDASolver.cpp

@@ -719,7 +719,7 @@ void VCellIDASolver::idaSolve(bool bPrintProgress, FILE* outputFile, void (*chec
 		} 
 	}
 #ifdef USE_MESSAGING
-	SimulationMessaging::getInstVar()->setWorkerEvent(new WorkerEvent(JOB_COMPLETED, 1, Time));
+	SimulationMessaging::getInstVar()->setWorkerEvent(JobEvent::JOB_COMPLETED, 1, Time);
 #endif
 }
 

IDAWin/VCellSolverFactory.cpp

@@ -60,9 +60,9 @@ VCellSolverInputBreakdown VCellSolverFactory::parseInputFile(std::ifstream& inpu
 			inputBreakdown.solverType = determineSolverType(solverName);
 		} else if (nextToken == "JMS_PARAM_BEGIN") {
 			loadJMSInfo(inputFileStream, taskID);
-			#ifdef USE_MESSAGING
-			SimulationMessaging::getInstVar()->start(); // start the thread
-			#endif
+			// #ifdef USE_MESSAGING
+			// SimulationMessaging::getInstVar()->start(); // start the thread
+			// #endif
 		}
 		else if (nextToken == "STARTING_TIME") { inputFileStream >> inputBreakdown.timeCourseSettings.STARTING_TIME; }
 		else if (nextToken == "ENDING_TIME") { inputFileStream >> inputBreakdown.timeCourseSettings.ENDING_TIME; }
@@ -430,7 +430,7 @@ static void loadJMSInfo(std::istream &ifsInput, int taskID) {
 	// We'll still parse the section, as we can still execute the simulation; we'll just toss the values!
 	std::cerr << "WARNING: Input file expects messaging capabilities; this build does not support JMS messaging!" << std::endl;
 	#endif
-	
+
 	std::string broker;
 	std::string smqUserName;
 	std::string password;

IDAWin/VCellSundialsSolver.cpp

@@ -124,7 +124,7 @@ void VCellSundialsSolver::printProgress(double currTime, double &lastPercentile,
 
 	if (currTime == STARTING_TIME) { // print 0%
 		#ifdef USE_MESSAGING
-		SimulationMessaging::getInstVar()->setWorkerEvent(new WorkerEvent(JOB_PROGRESS, lastPercentile, currTime));
+		SimulationMessaging::getInstVar()->setWorkerEvent(JobEvent::JOB_PROGRESS, lastPercentile, currTime);
 		#else
 		printf("[[[progress:%lg%%]]]", lastPercentile*100.0);
 		fflush(stdout);
@@ -146,8 +146,8 @@ void VCellSundialsSolver::printProgress(double currTime, double &lastPercentile,
 			if (lastPercentile != newPercentile) {
 				#ifdef USE_MESSAGING
 				SimulationMessaging::getInstVar()->
-						setWorkerEvent(new WorkerEvent(JOB_PROGRESS, newPercentile, currTime));
-				SimulationMessaging::getInstVar()->setWorkerEvent(new WorkerEvent(JOB_DATA, newPercentile, currTime));
+						setWorkerEvent(JobEvent::JOB_PROGRESS, newPercentile, currTime);
+				SimulationMessaging::getInstVar()->setWorkerEvent(JobEvent::JOB_DATA, newPercentile, currTime);
 				#else
 				printf("[[[progress:%lg%%]]]", newPercentile*100.0);
 				printf("[[[data:%lg]]]", currTime);