diff --git a/prism/src/hybrid/PH_JOR.cc b/prism/src/hybrid/PH_JOR.cc index 4cb65fdd..402ac3c1 100644 --- a/prism/src/hybrid/PH_JOR.cc +++ b/prism/src/hybrid/PH_JOR.cc @@ -227,6 +227,7 @@ jdouble omega // omega (over-relaxation parameter) title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_JORInterval.cc b/prism/src/hybrid/PH_JORInterval.cc index 5168cd19..9028bd50 100644 --- a/prism/src/hybrid/PH_JORInterval.cc +++ b/prism/src/hybrid/PH_JORInterval.cc @@ -241,6 +241,7 @@ jint flags title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/hybrid/PH_NondetReachReward.cc b/prism/src/hybrid/PH_NondetReachReward.cc index 44e93bb0..bbc31e79 100644 --- a/prism/src/hybrid/PH_NondetReachReward.cc +++ b/prism/src/hybrid/PH_NondetReachReward.cc @@ -212,6 +212,7 @@ jboolean min // min or max probabilities (true = min, false = max) std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_NondetReachReward")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_NondetReachRewardInterval.cc b/prism/src/hybrid/PH_NondetReachRewardInterval.cc index 2faf94a3..07a61b8b 100644 --- a/prism/src/hybrid/PH_NondetReachRewardInterval.cc +++ b/prism/src/hybrid/PH_NondetReachRewardInterval.cc @@ -232,6 +232,7 @@ jint flags std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_NondetReachReward (interval)")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/hybrid/PH_NondetUntil.cc b/prism/src/hybrid/PH_NondetUntil.cc index b42e70f8..7fe4ea24 100644 --- a/prism/src/hybrid/PH_NondetUntil.cc +++ b/prism/src/hybrid/PH_NondetUntil.cc @@ -177,6 +177,7 @@ jboolean min // min or max probabilities (true = min, false = max) std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_NondetUntil")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_NondetUntilInterval.cc b/prism/src/hybrid/PH_NondetUntilInterval.cc index 0a38628c..0579cc01 100644 --- a/prism/src/hybrid/PH_NondetUntilInterval.cc +++ b/prism/src/hybrid/PH_NondetUntilInterval.cc @@ -222,6 +222,7 @@ jint flags std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_NondetUntil_Interval")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/hybrid/PH_PSOR.cc b/prism/src/hybrid/PH_PSOR.cc index 51130678..f9588dd7 100644 --- a/prism/src/hybrid/PH_PSOR.cc +++ b/prism/src/hybrid/PH_PSOR.cc @@ -241,6 +241,7 @@ jboolean forwards // forwards or backwards? title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_PSORInterval.cc b/prism/src/hybrid/PH_PSORInterval.cc index 29c778c9..66c263e0 100644 --- a/prism/src/hybrid/PH_PSORInterval.cc +++ b/prism/src/hybrid/PH_PSORInterval.cc @@ -255,6 +255,7 @@ jint flags title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/hybrid/PH_Power.cc b/prism/src/hybrid/PH_Power.cc index 36f7fa0b..82ae1a0d 100644 --- a/prism/src/hybrid/PH_Power.cc +++ b/prism/src/hybrid/PH_Power.cc @@ -173,6 +173,7 @@ jboolean transpose // transpose A? (i.e. solve xA=x not Ax=x?) std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_Power")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_PowerInterval.cc b/prism/src/hybrid/PH_PowerInterval.cc index 7531cc32..42b01333 100644 --- a/prism/src/hybrid/PH_PowerInterval.cc +++ b/prism/src/hybrid/PH_PowerInterval.cc @@ -183,6 +183,7 @@ jint flags std::unique_ptr iterationExport; if (PH_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PH_Power")); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/hybrid/PH_SOR.cc b/prism/src/hybrid/PH_SOR.cc index 88bc1171..73579186 100644 --- a/prism/src/hybrid/PH_SOR.cc +++ b/prism/src/hybrid/PH_SOR.cc @@ -252,6 +252,7 @@ jboolean fwds // forwards or backwards? title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/hybrid/PH_SORInterval.cc b/prism/src/hybrid/PH_SORInterval.cc index 469119a5..dae08333 100644 --- a/prism/src/hybrid/PH_SORInterval.cc +++ b/prism/src/hybrid/PH_SORInterval.cc @@ -267,6 +267,7 @@ jint flags title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PH_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/sparse/PS_JOR.cc b/prism/src/sparse/PS_JOR.cc index 0f73863d..32e2e1aa 100644 --- a/prism/src/sparse/PS_JOR.cc +++ b/prism/src/sparse/PS_JOR.cc @@ -209,6 +209,7 @@ jdouble omega // omega (over-relaxation parameter) title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/sparse/PS_JORInterval.cc b/prism/src/sparse/PS_JORInterval.cc index cfb306b4..4323733d 100644 --- a/prism/src/sparse/PS_JORInterval.cc +++ b/prism/src/sparse/PS_JORInterval.cc @@ -223,6 +223,7 @@ jint flags title += "), interval"; iterationExport.reset(new ExportIterations(title.c_str())); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/sparse/PS_NondetReachReward.cc b/prism/src/sparse/PS_NondetReachReward.cc index 5dbff833..cb5939b8 100644 --- a/prism/src/sparse/PS_NondetReachReward.cc +++ b/prism/src/sparse/PS_NondetReachReward.cc @@ -222,6 +222,7 @@ jboolean min // min or max probabilities (true = min, false = max) std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_NondetReachReward")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/sparse/PS_NondetReachRewardInterval.cc b/prism/src/sparse/PS_NondetReachRewardInterval.cc index 3f35b0c3..e0d0124c 100644 --- a/prism/src/sparse/PS_NondetReachRewardInterval.cc +++ b/prism/src/sparse/PS_NondetReachRewardInterval.cc @@ -255,6 +255,7 @@ jint flags std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_NondetReachReward (interval)")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/sparse/PS_NondetUntil.cc b/prism/src/sparse/PS_NondetUntil.cc index 5eb7b02f..2ac3d503 100644 --- a/prism/src/sparse/PS_NondetUntil.cc +++ b/prism/src/sparse/PS_NondetUntil.cc @@ -207,6 +207,7 @@ jlong _strat // strategy storage std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_NondetUntil")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/sparse/PS_NondetUntilInterval.cc b/prism/src/sparse/PS_NondetUntilInterval.cc index 94262236..91c954c8 100644 --- a/prism/src/sparse/PS_NondetUntilInterval.cc +++ b/prism/src/sparse/PS_NondetUntilInterval.cc @@ -235,6 +235,7 @@ jint flags std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_NondetUntil_Interval")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/sparse/PS_Power.cc b/prism/src/sparse/PS_Power.cc index 5831a14f..dabad5d6 100644 --- a/prism/src/sparse/PS_Power.cc +++ b/prism/src/sparse/PS_Power.cc @@ -157,6 +157,7 @@ jboolean transpose // transpose A? (i.e. solve xA=x not Ax=x?) std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_Power")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/sparse/PS_PowerInterval.cc b/prism/src/sparse/PS_PowerInterval.cc index ae138e93..882af944 100644 --- a/prism/src/sparse/PS_PowerInterval.cc +++ b/prism/src/sparse/PS_PowerInterval.cc @@ -166,6 +166,7 @@ jint flags std::unique_ptr iterationExport; if (PS_GetFlagExportIterations()) { iterationExport.reset(new ExportIterations("PS_PowerInterval")); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); } diff --git a/prism/src/sparse/PS_SOR.cc b/prism/src/sparse/PS_SOR.cc index 80f4a08a..b70f31ca 100644 --- a/prism/src/sparse/PS_SOR.cc +++ b/prism/src/sparse/PS_SOR.cc @@ -209,6 +209,7 @@ jboolean forwards // forwards or backwards? title += (omega == 1.0)?"Gauss-Seidel":("SOR omega=" + std::to_string(omega)); title += ")"; iterationExport.reset(new ExportIterations(title.c_str())); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln, n, 0); } diff --git a/prism/src/sparse/PS_SORInterval.cc b/prism/src/sparse/PS_SORInterval.cc index fe6f603d..78efdb05 100644 --- a/prism/src/sparse/PS_SORInterval.cc +++ b/prism/src/sparse/PS_SORInterval.cc @@ -222,6 +222,7 @@ jint flags title += (omega == 1.0)?"Gauss-Seidel":("SOR omega=" + std::to_string(omega)); title += "), interval"; iterationExport.reset(new ExportIterations(title.c_str())); + PS_PrintToMainLog(env, "Exporting iterations to %s\n", iterationExport->getFileName().c_str()); iterationExport->exportVector(soln_below, n, 0); iterationExport->exportVector(soln_above, n, 1); }