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

@@ -177,6 +177,7 @@ FILE *fp
 	}
 	
 	fprintf(fp, "%z\n", (size_t)dd);
+	return 0;
 }
 
 //------------------------------------------------------------------------------

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

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()

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);

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;
 }