Use signaling_nan's again for initialization

diff --git a/doc/news/changes/minor/20170623DanielArndt b/doc/news/changes/minor/20170623DanielArndt
index e50b1a6bd2c6b10692ddd27ffb65f4cc24861605..38e7390f5a81075ed15bcf0d8d9f332491246290 100644 (file)
--- a/doc/news/changes/minor/20170623DanielArndt
+++ b/doc/news/changes/minor/20170623DanielArndt
@@ -1,5 +1,6 @@
-New: The class Timer has the new functions get_total_data(),
-print_total_data, last_wall_time, cpu_time and last_cpu_time()
-for accessing information about the total run and the last lap now.
+New: The Timer class now has new functions Timer::get_total_data(),
+Timer::print_total_data, Timer::last_wall_time, Timer::cpu_time and 
+Timer::last_cpu_time() to access information about the total run as 
+well as the last lap.
 <br>
 (Daniel Arndt, 2017/06/23)

diff --git a/source/base/timer.cc b/source/base/timer.cc
index c7441509a664beedde7fab330910d19b710e3d95..05745a8bad706f27b4abd77371ef5906e27cfd62 100644 (file)
--- a/source/base/timer.cc
+++ b/source/base/timer.cc
@@ -47,8 +47,8 @@ Timer::Timer()
   start_wall_time (0.),
   cumulative_time (0.),
   cumulative_wall_time (0.),
-  last_lap_time (0.),
-  last_lap_cpu_time(0.),
+  last_lap_time (numbers::signaling_nan<double>()),
+  last_lap_cpu_time(numbers::signaling_nan<double>()),
   running (false)
 #ifdef DEAL_II_WITH_MPI
   ,
@@ -57,8 +57,8 @@ Timer::Timer()
 #endif
 {
 #ifdef DEAL_II_WITH_MPI
-  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = 0.;
-  mpi_data.min_index = mpi_data.max_index = 0;
+  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = numbers::signaling_nan<double>();
+  mpi_data.min_index = mpi_data.max_index = numbers::invalid_unsigned_int;
   mpi_total_data.sum = mpi_total_data.min = mpi_total_data.max = mpi_total_data.avg = 0.;
   mpi_total_data.min_index = mpi_total_data.max_index = 0;
 #endif
@@ -79,15 +79,15 @@ Timer::Timer(MPI_Comm mpi_communicator,
   start_wall_time (0.),
   cumulative_time (0.),
   cumulative_wall_time (0.),
-  last_lap_time (0.),
-  last_lap_cpu_time (0.),
+  last_lap_time (numbers::signaling_nan<double>()),
+  last_lap_cpu_time (numbers::signaling_nan<double>()),
   running (false),
   mpi_communicator (mpi_communicator),
   sync_wall_time(sync_wall_time_)
 {
 #ifdef DEAL_II_WITH_MPI
-  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = 0.;
-  mpi_data.min_index = mpi_data.max_index = 0;
+  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = numbers::signaling_nan<double>();
+  mpi_data.min_index = mpi_data.max_index = numbers::invalid_unsigned_int;
   mpi_total_data.sum = mpi_total_data.min = mpi_total_data.max = mpi_total_data.avg = 0.;
   mpi_total_data.min_index = mpi_total_data.max_index = 0;
 #endif
@@ -312,14 +312,14 @@ double Timer::last_wall_time () const
 
 void Timer::reset ()
 {
-  last_lap_time = 0.;
-  last_lap_cpu_time = 0.;
+  last_lap_time = numbers::signaling_nan<double>();
+  last_lap_cpu_time = numbers::signaling_nan<double>();
   cumulative_time = 0.;
   cumulative_wall_time = 0.;
   running         = false;
 #ifdef DEAL_II_WITH_MPI
-  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = 0.;
-  mpi_data.min_index = mpi_data.max_index = 0;
+  mpi_data.sum = mpi_data.min = mpi_data.max = mpi_data.avg = numbers::signaling_nan<double>();
+  mpi_data.min_index = mpi_data.max_index = numbers::invalid_unsigned_int;
   mpi_total_data.sum = mpi_total_data.min = mpi_total_data.max = mpi_total_data.avg = 0.;
   mpi_total_data.min_index = mpi_total_data.max_index = 0;
 #endif

diff --git a/tests/base/timer_04.cc b/tests/base/timer_04.cc
index 8fc498bfe77fe3f2de25fa7dea670c5ed4705950..3a954357bbae6e50f44a04ad916b9586617b9d4e 100644 (file)
--- a/tests/base/timer_04.cc
+++ b/tests/base/timer_04.cc
@@ -50,8 +50,6 @@ int main ()
   AssertThrow(old_wall_time > 0., ExcInternalError());
   const double old_cpu_time = t.wall_time();
   AssertThrow(old_cpu_time > 0., ExcInternalError());
-  AssertThrow(t.last_wall_time() == 0., ExcInternalError());
-  AssertThrow(t.last_cpu_time() == 0, ExcInternalError());
 
   burn(50);
   AssertThrow(t.stop() > 0., ExcInternalError());
@@ -64,8 +62,6 @@ int main ()
   t.reset();
   AssertThrow(t.wall_time() == 0., ExcInternalError());
   AssertThrow(t.cpu_time()== 0., ExcInternalError());
-  AssertThrow(t.last_wall_time() == 0., ExcInternalError());
-  AssertThrow(t.last_cpu_time() == 0, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/base/timer_05.cc b/tests/base/timer_05.cc
index 31a6e4a6e2f40ff84596720482229fdf9bc9406f..a0819002606a0d513417ce2d46e3c1faa78083c7 100644 (file)
--- a/tests/base/timer_05.cc
+++ b/tests/base/timer_05.cc
@@ -47,10 +47,7 @@ test_timer(Timer &t)
   AssertThrow(old_wall_time > 0., ExcInternalError());
   const double old_cpu_time = t.wall_time();
   AssertThrow(old_cpu_time > 0., ExcInternalError());
-  AssertThrow(t.last_wall_time() == 0., ExcInternalError());
-  AssertThrow(t.last_cpu_time() == 0., ExcInternalError());
-  AssertThrow(t.get_data().min == 0., ExcInternalError());
-  AssertThrow(t.get_total_data().min == 0., ExcInternalError());
+  AssertThrow(t.get_total_data().max == 0., ExcInternalError());
 
   burn(50);
   AssertThrow(t.stop() > 0., ExcInternalError());
@@ -65,10 +62,7 @@ test_timer(Timer &t)
   t.reset();
   AssertThrow(t.wall_time() == 0., ExcInternalError());
   AssertThrow(t.cpu_time()== 0., ExcInternalError());
-  AssertThrow(t.last_wall_time() == 0., ExcInternalError());
-  AssertThrow(t.last_cpu_time() == 0., ExcInternalError());
-  AssertThrow(t.get_data().min == 0., ExcInternalError());
-  AssertThrow(t.get_total_data().min == 0, ExcInternalError());
+  AssertThrow(t.get_total_data().max == 0, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }