[cig-commits] r14411 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2009-03-21 09:57:43 -0700 (Sat, 21 Mar 2009)
New Revision: 14411

Modified:
   cs/cigma/trunk/src/ProgressTimer.cpp
Log:
Use direct definition of progress in ProgressTimer, instead of the time-based definition

Modified: cs/cigma/trunk/src/ProgressTimer.cpp
===================================================================
--- cs/cigma/trunk/src/ProgressTimer.cpp	2009-03-21 16:57:41 UTC (rev 14410)
+++ cs/cigma/trunk/src/ProgressTimer.cpp	2009-03-21 16:57:43 UTC (rev 14411)
@@ -45,7 +45,8 @@
     num_per_sec = (1.0/60.0) / mins_per_num;
     remaining_mins = (total - current) * mins_per_num;
     total_mins = total * mins_per_num;
-    progress = 100 * elapsed_mins / total_mins;
+    //progress = 100 * elapsed_mins / total_mins;
+    progress = (100.0 * cur) / total;
     return *this;
 }