Browse Source

Fixes in C-code warning message functions.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4180 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
f344411a3c
  1. 2
      prism/src/hybrid/PrismHybrid.cc
  2. 2
      prism/src/mtbdd/PrismMTBDD.cc
  3. 4
      prism/src/sparse/PS_NondetReachReward.cc
  4. 4
      prism/src/sparse/PS_NondetUntil.cc
  5. 2
      prism/src/sparse/PrismSparse.cc

2
prism/src/hybrid/PrismHybrid.cc

@ -167,7 +167,7 @@ void PH_PrintWarningToMainLog(JNIEnv *env, const char *str, ...)
if (env)
env->CallVoidMethod(main_log_obj, main_log_warn, env->NewStringUTF(full_string));
else
printf("Warning: %s", full_string);
printf("\nWarning: %s\n", full_string);
}
//------------------------------------------------------------------------------

2
prism/src/mtbdd/PrismMTBDD.cc

@ -158,7 +158,7 @@ void PM_PrintWarningToMainLog(JNIEnv *env, const char *str, ...)
if (env)
env->CallVoidMethod(main_log_obj, main_log_warn, env->NewStringUTF(full_string));
else
printf("Warning: %s", full_string);
printf("\nWarning: %s\n", full_string);
}
//------------------------------------------------------------------------------

4
prism/src/sparse/PS_NondetReachReward.cc

@ -159,7 +159,7 @@ jboolean min // min or max probabilities (true = min, false = max)
// also extract list of action names from 'synchs'
get_string_array_from_java(env, synchs, action_names_jstrings, action_names, num_actions);
} else {
PS_PrintWarningToMainLog(env, "Action labels are not available for adversary generation.\n", export_adv_filename);
PS_PrintWarningToMainLog(env, "Action labels are not available for adversary generation.", export_adv_filename);
}
}
@ -234,7 +234,7 @@ jboolean min // min or max probabilities (true = min, false = max)
if (fp_adv) {
fprintf(fp_adv, "%d ?\n", n);
} else {
PS_PrintWarningToMainLog(env, "Adversary generation cancelled (could not open file \"%s\").\n", export_adv_filename);
PS_PrintWarningToMainLog(env, "Adversary generation cancelled (could not open file \"%s\").", export_adv_filename);
export_adv_enabled = EXPORT_ADV_NONE;
}
}

4
prism/src/sparse/PS_NondetUntil.cc

@ -155,7 +155,7 @@ jboolean min // min or max probabilities (true = min, false = max)
// also extract list of action names from 'synchs'
get_string_array_from_java(env, synchs, action_names_jstrings, action_names, num_actions);
} else {
PS_PrintWarningToMainLog(env, "Action labels are not available for adversary generation.\n", export_adv_filename);
PS_PrintWarningToMainLog(env, "Action labels are not available for adversary generation.", export_adv_filename);
}
}
@ -212,7 +212,7 @@ jboolean min // min or max probabilities (true = min, false = max)
if (fp_adv) {
fprintf(fp_adv, "%d ?\n", n);
} else {
PS_PrintWarningToMainLog(env, "Adversary generation cancelled (could not open file \"%s\").\n", export_adv_filename);
PS_PrintWarningToMainLog(env, "Adversary generation cancelled (could not open file \"%s\").", export_adv_filename);
export_adv_enabled = EXPORT_ADV_NONE;
}
}

2
prism/src/sparse/PrismSparse.cc

@ -160,7 +160,7 @@ void PS_PrintWarningToMainLog(JNIEnv *env, const char *str, ...)
if (env)
env->CallVoidMethod(main_log_obj, main_log_warn, env->NewStringUTF(full_string));
else
printf("Warning: %s", full_string);
printf("\nWarning: %s\n", full_string);
}
//------------------------------------------------------------------------------

Loading…
Cancel
Save