[cig-commits] [commit] master: Add functions for aftershock accounting (62f7537)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vc

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04

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

commit 62f75370e448f38b7009f8b9b9ecacc965b4669c
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 17 15:34:16 2014 -0700

    Add functions for aftershock accounting


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

62f75370e448f38b7009f8b9b9ecacc965b4669c
 src/core/VCSimDataEvents.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/VCSimDataEvents.h b/src/core/VCSimDataEvents.h
index 9437934..cec4705 100644
--- a/src/core/VCSimDataEvents.h
+++ b/src/core/VCSimDataEvents.h
@@ -51,14 +51,19 @@ class VCSimDataEvents {
         void addAftershock(const VCEventAftershock &new_aftershock) {
             cur_aftershocks.insert(new_aftershock);
         };
-        double nextAftershockTime(void) {
+        double nextAftershockTime(void) const {
             if (cur_aftershocks.size() > 0) {
                 return cur_aftershocks.begin()->t;
             } else {
                 return DBL_MAX;
             }
         };
-        unsigned int numAftershocksToProcess(void) {
+        VCEventAftershock popAftershock(void) {
+            VCEventAftershock next_aftershock = *(cur_aftershocks.begin());
+            cur_aftershocks.erase(cur_aftershocks.begin());
+            return next_aftershock;
+        };
+        unsigned int numAftershocksToProcess(void) const {
             return cur_aftershocks.size();
         };
 };