X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/687631532197750696d35aa12c40406b04fb878d..d4d0006dd2a603fc5c17774d6eacc186f689cbfc:/projects/stargazer/tariff_impl.h?ds=sidebyside diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h index b8d0a776..f2f84d26 100644 --- a/projects/stargazer/tariff_impl.h +++ b/projects/stargazer/tariff_impl.h @@ -46,18 +46,22 @@ class TARIFF_IMPL : public TARIFF { public: TARIFF_IMPL() - : tariffData() - {}; + : TARIFF(), + tariffData() + {} TARIFF_IMPL(const std::string & name) - : tariffData(name) - {}; + : TARIFF(), + tariffData(name) + {} TARIFF_IMPL(const TARIFF_DATA & td) - : tariffData(td) - {}; + : TARIFF(), + tariffData(td) + {} TARIFF_IMPL(const TARIFF_IMPL & t) - : tariffData(t.tariffData) - {}; - virtual ~TARIFF_IMPL() {}; + : TARIFF(), + tariffData(t.tariffData) + {} + virtual ~TARIFF_IMPL() {} double GetPriceWithTraffType(uint64_t up, uint64_t down, @@ -67,6 +71,7 @@ public: double GetPassiveCost() const { return tariffData.tariffConf.passiveCost; } double GetFee() const { return tariffData.tariffConf.fee; } double GetFree() const { return tariffData.tariffConf.free; } + PERIOD GetPeriod() const { return tariffData.tariffConf.period; } void Print() const; @@ -78,15 +83,15 @@ public: int GetThreshold(int dir) const; const TARIFF_DATA & GetTariffData() const { return tariffData; } - TARIFF & operator=(const TARIFF_DATA & td); - TARIFF & operator=(const TARIFF & t); - bool operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); } - bool operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); } + TARIFF_IMPL & operator=(const TARIFF_DATA & td); + TARIFF_IMPL & operator=(const TARIFF_IMPL & t); + bool operator==(const TARIFF_IMPL & rhs) const { return GetName() == rhs.GetName(); } + bool operator!=(const TARIFF_IMPL & rhs) const { return GetName() != rhs.GetName(); } private: TARIFF_DATA tariffData; - double GetPriceWithoutFreeMb(int dir, int mb, time_t t) const; + double GetPriceWithoutFreeMb(int dir, int64_t mb, time_t t) const; int Interval(int dir, time_t t) const; };