ExportIterations: Log the file name when exporting iterations (2)

Now for sparse and hybrid as well...

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

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

prism/src/hybrid/PH_NondetReachReward.cc

@@ -212,6 +212,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	std::unique_ptr<ExportIterations> 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);
 	}
 

prism/src/hybrid/PH_NondetReachRewardInterval.cc

@@ -232,6 +232,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

prism/src/hybrid/PH_NondetUntil.cc

@@ -177,6 +177,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	std::unique_ptr<ExportIterations> 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);
 	}
 

prism/src/hybrid/PH_NondetUntilInterval.cc

@@ -222,6 +222,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

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

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

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

prism/src/hybrid/PH_PowerInterval.cc

@@ -183,6 +183,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

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

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

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

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

prism/src/sparse/PS_NondetReachReward.cc

@@ -222,6 +222,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 	std::unique_ptr<ExportIterations> 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);
 	}
 

prism/src/sparse/PS_NondetReachRewardInterval.cc

@@ -255,6 +255,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

prism/src/sparse/PS_NondetUntil.cc

@@ -207,6 +207,7 @@ jlong _strat				// strategy storage
 	std::unique_ptr<ExportIterations> 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);
 	}
 

prism/src/sparse/PS_NondetUntilInterval.cc

@@ -235,6 +235,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

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

prism/src/sparse/PS_PowerInterval.cc

@@ -166,6 +166,7 @@ jint flags
 	std::unique_ptr<ExportIterations> 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);
 	}

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

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