improve function/variable naming

Author: gonuke

src/context.cc

@@ -315,8 +315,8 @@ int Context::time() {
   return ti_->time();
 }
 
-int Context::timeshift(int year, int month) {
-  return ti_->timeshift(year, month);
+int Context::CalcTimeDiff(int year, int month) {
+  return ti_->CalcTimeDiff(year, month);
 }
 
 int Context::random() {

src/context.h

@@ -253,7 +253,7 @@ class Context {
   virtual int time();
 
   /// Returns a time shift between the simulation start time and another time stamp
-  int timeshift(int year, int month);
+  int CalcTimeDiff(int year, int month);
 
   /// Adds a package type to a simulation-wide accessible list.
   /// Agents should NOT add their own packages.

src/timer.cc

@@ -281,18 +281,18 @@ int Timer::dur() {
   return si_.duration;
 }
 
-int Timer::timeshift(int year, int month) {
+int Timer::CalcTimeDiff(int year, int month) {
 
-  int timeshift_ = 0;
+  int timediff_ = 0;
   if (year >= 0) {
-    timeshift_ += (year - si_.y0) * kMonthsPerYear;
+    timediff_ += (year - si_.y0) * kMonthsPerYear;
   }
 
   if (month >= 0) {
-    timeshift_ += si_.m0 - month;
+    timediff_ += si_.m0 - month;
   }
 
-  return timeshift_;
+  return timediff_;
 
 }
 

src/timer.h

@@ -75,9 +75,9 @@ class Timer {
   /// @param year of alternate time stamp
   /// @param month of alternate time stamp
   ///
-  /// @return the timeshift between two times, in months
+  /// @return the difference between the simulation start time and another time
   /// @warning Only valid for times that occur after the simulation start time.
-  int timeshift(int year, int month);
+  int CalcTimeDiff(int year, int month);
 
  private:
   /// builds all agents queued for the current timestep.