Update ChangeLog.

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

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index f33c08af0aa1340b3ba1bf0db72e60e964d0709c..f3accec99a9c86b527bafe36dc3754c965c684a1 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -31,37 +31,29 @@
 #ifndef TARIFF_IMPL_H
 #define TARIFF_IMPL_H
 
 #ifndef TARIFF_IMPL_H
 #define TARIFF_IMPL_H
 

-#include <ctime>
+#include "stg/tariff.h"
+#include "stg/os_int.h"
+#include "stg/tariff_conf.h"

 
 #include <string>
 #include <list>
 
 
 #include <string>
 #include <list>
 

-#include "stg/tariff.h"
-#include "stg/os_int.h"
-#include "stg/tariff_conf.h"
+#include <ctime>

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 class TARIFF_IMPL : public TARIFF {
 public:
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 class TARIFF_IMPL : public TARIFF {
 public:

-    TARIFF_IMPL()
-        : TARIFF(),
-          tariffData()
-    {};
-    TARIFF_IMPL(const std::string & name)
+    explicit TARIFF_IMPL(const std::string & name)

         : TARIFF(),
           tariffData(name)
         : TARIFF(),
           tariffData(name)

-    {};
-    TARIFF_IMPL(const TARIFF_DATA & td)
+    {}
+    explicit TARIFF_IMPL(const TARIFF_DATA & td)

         : TARIFF(),
           tariffData(td)
         : TARIFF(),
           tariffData(td)

-    {};
-    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,


@@ -71,6 +63,9 @@ public:
     double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; }
     double  GetFee() const { return tariffData.tariffConf.fee; }
     double  GetFree() 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;
 
 
     void    Print() const;
 


@@ -83,14 +78,14 @@ public:
     const TARIFF_DATA & GetTariffData() const { return tariffData; }
 
     TARIFF_IMPL & operator=(const TARIFF_DATA & td);
     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(); }
     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, time_t currentTime) 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;
 };