From 5c1bb43a2fb5af9969b2d4f9f168559683b5195d Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 17 Oct 2007 08:53:50 +0000 Subject: [PATCH] Code tidy (function return types). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@452 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/dd/dd_export.cc | 1 + prism/src/simulator/SimulatorEngine.cc | 6 +++--- prism/src/simulator/simexpression.cc | 4 ++-- prism/src/simulator/simexpressionbuilder.cc | 2 +- prism/src/simulator/simiohandler.cc | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/prism/src/dd/dd_export.cc b/prism/src/dd/dd_export.cc index 1e8270a4..2d8fa09b 100644 --- a/prism/src/dd/dd_export.cc +++ b/prism/src/dd/dd_export.cc @@ -177,6 +177,7 @@ FILE *fp } fprintf(fp, "%z\n", (size_t)dd); + return 0; } //------------------------------------------------------------------------------ diff --git a/prism/src/simulator/SimulatorEngine.cc b/prism/src/simulator/SimulatorEngine.cc index e64a4593..c975699b 100644 --- a/prism/src/simulator/SimulatorEngine.cc +++ b/prism/src/simulator/SimulatorEngine.cc @@ -581,7 +581,7 @@ JNIEXPORT jint JNICALL Java_simulator_SimulatorEngine_exportBinary const char *str = env->GetStringUTFChars(filename, 0); Export_Engine_To_Binary_File(str); env->ReleaseStringUTFChars(filename, str); - //env->ReleaseStringChars(filename, (const char*)filename8); + return 1; } JNIEXPORT jint JNICALL Java_simulator_SimulatorEngine_doSampling @@ -736,9 +736,9 @@ JNIEXPORT jstring JNICALL Java_simulator_SimulatorEngine_modelToString JNIEXPORT jstring JNICALL Java_simulator_SimulatorEngine_pathToString (JNIEnv *env, jclass cls) { - /*std::string str = Path_To_String(); + std::string str = Path_To_String(); - return env->NewStringUTF(str.c_str());*/ + return env->NewStringUTF(str.c_str()); } JNIEXPORT void JNICALL Java_simulator_SimulatorEngine_printCurrentUpdates diff --git a/prism/src/simulator/simexpression.cc b/prism/src/simulator/simexpression.cc index b33b8f51..1c95673e 100644 --- a/prism/src/simulator/simexpression.cc +++ b/prism/src/simulator/simexpression.cc @@ -1226,12 +1226,12 @@ int CNormalPow::Get_Type() int CNormalPow::Evaluate() { - return (int)pow(lexpr->Evaluate(), rexpr->Evaluate()); + return (int)pow((double)lexpr->Evaluate(), rexpr->Evaluate()); } int CNormalPow::Evaluate(int* vars) { - return (int)pow(lexpr->Evaluate(vars), rexpr->Evaluate(vars)); + return (int)pow((double)lexpr->Evaluate(vars), rexpr->Evaluate(vars)); } bool CNormalPow::One_Result() diff --git a/prism/src/simulator/simexpressionbuilder.cc b/prism/src/simulator/simexpressionbuilder.cc index 9a341f00..a6f7dd58 100644 --- a/prism/src/simulator/simexpressionbuilder.cc +++ b/prism/src/simulator/simexpressionbuilder.cc @@ -124,7 +124,7 @@ JNIEXPORT jlong __pointer JNICALL Java_simulator_SimulatorEngine_createAnd (JNIEnv * env, jclass cls, jlongArray __pointer exprPointers) { jsize length = env->GetArrayLength(exprPointers); - + printf("and\n"); jlong buf[length]; jint i, sum = 0; env->GetLongArrayRegion(exprPointers, 0, length, buf); diff --git a/prism/src/simulator/simiohandler.cc b/prism/src/simulator/simiohandler.cc index 43bfccb7..72c36588 100644 --- a/prism/src/simulator/simiohandler.cc +++ b/prism/src/simulator/simiohandler.cc @@ -189,13 +189,14 @@ int Setup_For_Feedback(char* feedback) { feedback_file = feedback; do_feedback = true; + return 0; } int Setup_For_Results_Feedback(char* results_feedback_f) { results_feedback_file = results_feedback_f; do_results_feedback = true; - cout << "called setup" << endl; + return 0; }