X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0b5942cd0189bbcc6b9fdc833d1e377100e5f3c7..be1b46cc784e43cd28c5521bdcde79bd7463fb40:/projects/stargazer/tariff_impl.h?ds=sidebyside

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index 4948b3f8..a45df060 100644
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -22,80 +22,68 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
-/*
- $Revision: 1.9 $
- $Date: 2010/10/07 17:53:39 $
- $Author: faust $
- */
-
-#ifndef TARIFF_IMPL_H
-#define TARIFF_IMPL_H
+#pragma once
 
-#include <ctime>
+#include "stg/tariff.h"
+#include "stg/tariff_conf.h"
 
 #include <string>
-#include <list>
 
-#include "stg/tariff.h"
-#include "stg/os_int.h"
-#include "stg/tariff_conf.h"
+#include <ctime>
+#include <cstdint>
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
-class TARIFF_IMPL : public TARIFF {
-public:
-    TARIFF_IMPL()
-        : TARIFF(),
-          tariffData()
-    {}
-    TARIFF_IMPL(const std::string & name)
-        : TARIFF(),
-          tariffData(name)
-    {}
-    TARIFF_IMPL(const TARIFF_DATA & td)
-        : TARIFF(),
-          tariffData(td)
-    {}
-    TARIFF_IMPL(const TARIFF_IMPL & t)
-        : TARIFF(),
-          tariffData(t.tariffData)
-    {}
-    virtual ~TARIFF_IMPL() {}
-
-    double  GetPriceWithTraffType(uint64_t up,
-                                  uint64_t down,
-                                  int dir,
-                                  time_t t) const;
-    double  GetFreeMb() const { return tariffData.tariffConf.free; }
-    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; }
-    CHANGE_POLICY GetChangePolicy() const { return tariffData.tariffConf.changePolicy; }
-    time_t GetChangePolicyTimeout() const { return tariffData.tariffConf.changePolicyTimeout; }
-
-    void    Print() const;
-
-    const   std::string & GetName() const { return tariffData.tariffConf.name; }
-    void    SetName(const std::string & name) { tariffData.tariffConf.name = name; }
-
-    int     GetTraffType() const { return tariffData.tariffConf.traffType; }
-    int64_t GetTraffByType(uint64_t up, uint64_t down) const;
-    int     GetThreshold(int dir) const;
-    const TARIFF_DATA & GetTariffData() const { return tariffData; }
-
-    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(); }
-    std::string TariffChangeIsAllowed(const TARIFF & to) const;
-
-private:
-    TARIFF_DATA     tariffData;
-
-    double  GetPriceWithoutFreeMb(int dir, int64_t mb, time_t t) const;
-    int     Interval(int dir, time_t t) const;
+namespace STG
+{
+
+class TariffImpl : public Tariff {
+    public:
+        explicit TariffImpl(const std::string & name)
+            : tariffData(name)
+        {}
+        explicit TariffImpl(const TariffData & td)
+            : tariffData(td)
+        {}
+
+        TariffImpl(const TariffImpl&) = default;
+        TariffImpl& operator=(const TariffImpl&) = default;
+        TariffImpl(TariffImpl&&) = default;
+        TariffImpl& operator=(TariffImpl&&) = default;
+
+        double  GetPriceWithTraffType(uint64_t up,
+                                      uint64_t down,
+                                      int dir,
+                                      time_t t) const;
+        double  GetFreeMb() const { return tariffData.tariffConf.free; }
+        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; }
+        ChangePolicy GetChangePolicy() const { return tariffData.tariffConf.changePolicy; }
+        time_t GetChangePolicyTimeout() const { return tariffData.tariffConf.changePolicyTimeout; }
+
+        void    Print() const;
+
+        const   std::string & GetName() const { return tariffData.tariffConf.name; }
+        void    SetName(const std::string & name) { tariffData.tariffConf.name = name; }
+
+        int     GetTraffType() const { return tariffData.tariffConf.traffType; }
+        int64_t GetTraffByType(uint64_t up, uint64_t down) const;
+        int     GetThreshold(int dir) const;
+        const TariffData & GetTariffData() const { return tariffData; }
+
+        TariffImpl & operator=(const TariffData & td);
+        bool     operator==(const TariffImpl & rhs) const { return GetName() == rhs.GetName(); }
+        bool     operator!=(const TariffImpl & rhs) const { return GetName() != rhs.GetName(); }
+        std::string TariffChangeIsAllowed(const Tariff & to, time_t currentTime) const;
+
+    private:
+        TariffData     tariffData;
+
+        double  GetPriceWithoutFreeMb(int dir, int64_t mb, time_t t) const;
+        int     Interval(int dir, time_t t) const;
 };
 
-#endif
+}