[mlpack-git] master: Merge pull request #472 from Kirizaki/master (4e4588e)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/713fa60a06f709bc715c4dd88f6ba585796f73a0...319205b2f3103187c584db302b1a3683aa2fbfdf

>---------------------------------------------------------------

commit 4e4588e5b666a84f29dfa03fb8b95864fd4b680b
Merge: 589f13b d0d8284
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Nov 17 14:24:36 2015 -0800

    Merge pull request #472 from Kirizaki/master
    
    Add exception for starting & stopping given timer


>---------------------------------------------------------------

4e4588e5b666a84f29dfa03fb8b95864fd4b680b
 doc/guide/timer.hpp             |  3 ++-
 src/mlpack/core.hpp             |  1 +
 src/mlpack/core/util/timers.cpp | 22 ++++++++++++++++++++++
 src/mlpack/core/util/timers.hpp |  7 +++++--
 src/mlpack/tests/cli_test.cpp   | 14 ++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)