DriftingOscillatorBase: Implemented getNumTicksAtOrigin().

Author: levy

src/inet/clock/base/DriftingOscillatorBase.cc

@@ -23,6 +23,7 @@ void DriftingOscillatorBase::initialize(int stage)
             throw cRuntimeError("The nominalTickLength parameter value %lg cannot be accurately represented with the current simulation time precision, conversion result: %s", nominalTickLengthAsDouble, nominalTickLength.ustr().c_str());
         inverseDriftRate = invertDriftRate(driftRate);
         setOrigin(simTime());
+        numTicksAtOrigin = 0;
         simtime_t currentTickLength = getCurrentTickLength();
         simtime_t tickOffset = par("tickOffset");
         if (tickOffset < 0 || tickOffset >= currentTickLength)
@@ -43,6 +44,7 @@ void DriftingOscillatorBase::setOrigin(simtime_t origin)
     EV_DEBUG << "Setting oscillator origin" << EV_FIELD(origin) << EV_ENDL;
     DEBUG_CMP(origin, <=, simTime());
     DEBUG_CMP(this->origin, <=, origin);
+    numTicksAtOrigin += computeTicksForInterval(origin - this->origin);
     this->origin = origin;
 }
 

src/inet/clock/base/DriftingOscillatorBase.h

@@ -28,6 +28,9 @@ class INET_API DriftingOscillatorBase : public OscillatorBase, public IScriptabl
     simtime_t origin; // simulation time from which the computeClockTicksForInterval and computeIntervalForClockTicks is measured
     simtime_t nextTickFromOrigin; // simulation time interval from the computation origin to the next tick
 
+    /** Total number of ticks strictly before the origin (absolute tick index at o). */
+    int64_t numTicksAtOrigin;
+
   protected:
     virtual void initialize(int stage) override;
 
@@ -49,6 +52,9 @@ class INET_API DriftingOscillatorBase : public OscillatorBase, public IScriptabl
     virtual simtime_t getNominalTickLength() const override { return nominalTickLength; }
     virtual double getCurrentTickLength() const { return nominalTickLength.dbl() + nominalTickLength.dbl() * inverseDriftRate.get<unit>(); }
 
+
+    /** Returns the absolute tick count at the origin (ticks strictly before o). */
+    virtual int64_t getNumTicksAtOrigin() const override { return numTicksAtOrigin; }
     virtual ppm getDriftRate() const { return driftRate; }
     virtual void setDriftRate(ppm driftRate);
     virtual void setTickOffset(simtime_t tickOffset);
@@ -62,4 +68,3 @@ class INET_API DriftingOscillatorBase : public OscillatorBase, public IScriptabl
 } // namespace inet
 
 #endif
-