SAR: very simple progress feedback

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>

Author: thliebig

python/openEMS/sar_calculation.pxd

@@ -24,6 +24,7 @@ cdef extern from "openEMS/sar_calculation.h":
         _SAR_Calculation() nogil except +
 
         void SetDebugLevel(int level)
+        void EnableProgress(bool enable)
         void SetAveragingMass(float mass)
         bool SetAveragingMethod(string method, bool silent)
         bool CalcFromHDF5(string h5_fn, string out_name, bool export_cube_stats) nogil

python/openEMS/sar_calculation.pyx

@@ -37,6 +37,9 @@ cdef class SAR_Calculation:
     def SetDebugLevel(self, level):
         self.thisptr.SetDebugLevel(level)
 
+    def EnableProgress(self, enable):
+        self.thisptr.EnableProgress(enable)
+
     def SetAveragingMass(self, mass):
         ### Set the averaging mass in g
         # convert from g to kg

tools/sar_calc.cpp

@@ -38,6 +38,7 @@ int main(int argc, char *argv[])
 		bool debug = false;
 		bool export_cube_stats = false;
 		bool legacyHDF5 = false;
+		bool progress = false;
 
 		desc.add_options()
 		("help,h"  , "print usage message")
@@ -46,6 +47,7 @@ int main(int argc, char *argv[])
 		("method",   value(&method)->default_value("SIMPLE"), "set SAR method: IEEE_C95_3, IEEE_62704, SIMPLE")
 		("mass,m"  , value(&m_avg), "averaging mass in g")
 		("verbose,v", bool_switch(&debug), "verbose")
+		("progress,p", bool_switch(&progress), "show progress")
 		("export_cube_stats,e", bool_switch(&export_cube_stats), "Export Cube Statistics")
 		("legacyHDF5Dumps", bool_switch(&legacyHDF5), "Dumping using the legacy HDF5 file format as required for Octave/Matlab import");
 
@@ -60,6 +62,7 @@ int main(int argc, char *argv[])
 
 		SAR_Calculation sar_calc;
 		sar_calc.SetDebugLevel(int(debug));
+		sar_calc.EnableProgress(progress);
 		sar_calc.SetAveragingMass(m_avg/1000);
 		//sar_calc.SetAveragingMethod(SAR_Calculation::IEEE_62704);
 		if (!sar_calc.SetAveragingMethod(method, !debug))

tools/sar_calculation.cpp

@@ -800,6 +800,9 @@ bool SAR_Calculation::CalcAveragedSAR(ArrayLib::ArrayIJK<float> & SAR)
 	float* cube_vol = m_cube_volume.data();
 	float* cell_density = m_cell_density->data();
 	loc = 0;
+	unsigned int prog_N = SAR.size()/100;
+	if (m_progress)
+		std::cout << "Step-1: ";
 	for (pos[0]=0; pos[0]<m_numLines[0]; ++pos[0])
 	{
 		for (pos[1]=0; pos[1]<m_numLines[1]; ++pos[1])
@@ -811,6 +814,11 @@ bool SAR_Calculation::CalcAveragedSAR(ArrayLib::ArrayIJK<float> & SAR)
 					SAR(pos[0], pos[1], pos[2]) = 0;
 					++m_AirVoxel;
 					++loc;
+					if (m_progress && (loc%prog_N == 0))
+					{
+						std::cout << ".";
+						std::cout.flush();
+					}
 					continue;
 				}
 
@@ -840,9 +848,17 @@ bool SAR_Calculation::CalcAveragedSAR(ArrayLib::ArrayIJK<float> & SAR)
 				else
 					cerr << "other EC" << EC << endl;
 				++loc;
+				if (m_progress && (loc%prog_N == 0))
+				{
+					std::cout << ".";
+					std::cout.flush();
+				}
 			}
 		}
 	}
+	if (m_progress)
+		std::cout << " Done" << std::endl;
+
 	if (cnt_NoConvergence>0)
 	{
 		cerr << "SAR_Calculation::CalcAveragedSAR: Warning, for some voxel a valid averaging cube could not be found (no convergence)... " << endl;
@@ -859,6 +875,9 @@ bool SAR_Calculation::CalcAveragedSAR(ArrayLib::ArrayIJK<float> & SAR)
 	m_Used=0;
 	m_Unused=0;
 	loc = 0;
+	if (m_progress)
+		std::cout << "Step-2: ";
+
 	for (pos[0]=0;pos[0]<m_numLines[0];++pos[0])
 	{
 		for (pos[1]=0;pos[1]<m_numLines[1];++pos[1])
@@ -921,9 +940,16 @@ bool SAR_Calculation::CalcAveragedSAR(ArrayLib::ArrayIJK<float> & SAR)
 					}
 				}
 				++loc;
+				if (m_progress && (loc%prog_N == 0))
+				{
+					std::cout << ".";
+					std::cout.flush();
+				}
 			}
 		}
 	}
+	if (m_progress)
+		std::cout << " Done" << std::endl;
 
 	if (m_Valid+m_Used+m_Unused+m_AirVoxel!=m_numLines[0]*m_numLines[1]*m_numLines[2])
 	{

tools/sar_calculation.h

@@ -45,6 +45,9 @@ class SAR_EXPORT SAR_Calculation
 	//! Set the debug level
 	void SetDebugLevel(int level) {m_DebugLevel=level;}
 
+	//! Enable progress output
+	void EnableProgress(bool enable=true) {m_progress=enable;}
+
 	//! Set the used averaging method
 	bool SetAveragingMethod(SARAveragingMethod method, bool silent=false);
 
@@ -107,6 +110,8 @@ class SAR_EXPORT SAR_Calculation
 
 	int m_DebugLevel;
 
+	bool m_progress = false;
+
 	/*********** SAR calculation parameter and settings ***********/
 	float m_massTolerance;
 	unsigned int m_maxMassIterations;