diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/util/timer.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/util/timer.h index 96897f0285..a1f48a7fc7 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/util/timer.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/util/timer.h @@ -39,20 +39,20 @@ class Timer { timeval result; timersub(&end_, &start_, &result); std::stringstream str; - str << (result.tv_sec + result.tv_usec / 1000000.0); + str << (result.tv_sec + static_cast(result.tv_usec) / 1000000.0); return str.str(); } double GetTotalElapsedTime() { timeval result; timersub(&end_, &start_, &result); - return (result.tv_sec + result.tv_usec / 1000000.0); + return (result.tv_sec + static_cast(result.tv_usec) / 1000000.0); } double GetElapsedTime(int checkpoint_id) { timeval result; timersub(&checkpoints_[checkpoint_id], &start_, &result); - return (result.tv_sec + result.tv_usec / 1000000.0); + return (result.tv_sec + static_cast(result.tv_usec) / 1000000.0); } private: diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_dev.h b/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_dev.h index fc25fd9c62..61b4bfbfdc 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_dev.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_dev.h @@ -45,7 +45,9 @@ void physpack::nbody_simulator::NbodySimulator::Init( table_ = arguments_in.table_; // Declare the global constants. - global_.Init(table_, arguments_in.relative_error_, arguments_in.probability_); + global_.Init( + table_, arguments_in.relative_error_, arguments_in.probability_, + arguments_in.summary_compute_quantile_); } bool physpack::nbody_simulator::NbodySimulator::ConstructBoostVariableMap_( diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_tripletree.h b/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_tripletree.h index 224211c72b..5bc0b117c5 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_tripletree.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/physpack/nbody_simulator/nbody_simulator_tripletree.h @@ -383,7 +383,9 @@ class NbodySimulatorGlobal { void Init( core::table::Table *table_in, - double relative_error_in, double probability_in) { + double relative_error_in, + double probability_in, + double summary_compute_quantile_in) { relative_error_ = relative_error_in; probability_ = probability_in; @@ -397,6 +399,8 @@ class NbodySimulatorGlobal { // Initialize the potential. potential_.Init(total_num_tuples_); + + summary_compute_quantile_ = summary_compute_quantile_in; } };