Merge remote-tracking branch 'origin/master' into ticket37

[stg.git] / projects / stargazer / tariff_impl.h

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index b471f0d04014e5c072dc7807c2ca6867c66302bd..4948b3f81bed00dd77a0247ab1d05b8e72596280 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -48,20 +48,20 @@ public:
     TARIFF_IMPL()
         : TARIFF(),
           tariffData()
     TARIFF_IMPL()
         : TARIFF(),
           tariffData()

-    {};
+    {}

     TARIFF_IMPL(const std::string & name)
         : TARIFF(),
           tariffData(name)
     TARIFF_IMPL(const std::string & name)
         : TARIFF(),
           tariffData(name)

-    {};
+    {}

     TARIFF_IMPL(const TARIFF_DATA & td)
         : TARIFF(),
           tariffData(td)
     TARIFF_IMPL(const TARIFF_DATA & td)
         : TARIFF(),
           tariffData(td)

-    {};
+    {}

     TARIFF_IMPL(const TARIFF_IMPL & t)
         : TARIFF(),
           tariffData(t.tariffData)
     TARIFF_IMPL(const TARIFF_IMPL & t)
         : TARIFF(),
           tariffData(t.tariffData)

-    {};
-    virtual ~TARIFF_IMPL() {};
+    {}
+    virtual ~TARIFF_IMPL() {}

 
     double  GetPriceWithTraffType(uint64_t up,
                                   uint64_t down,
 
     double  GetPriceWithTraffType(uint64_t up,
                                   uint64_t down,


@@ -72,6 +72,8 @@ public:
     double  GetFee() const { return tariffData.tariffConf.fee; }
     double  GetFree() const { return tariffData.tariffConf.free; }
     PERIOD  GetPeriod() const { return tariffData.tariffConf.period; }
     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;
 
 
     void    Print() const;
 


@@ -87,11 +89,12 @@ public:
     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(); }
     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;
 
 
 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;
 };
 
     int     Interval(int dir, time_t t) const;
 };