Ticket 52. Definition of the tariff pointer added to the

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

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index 788162cdd1c17ebe06f36efb6249ca67c8662e37..3a12fbdf6769a18047540d6466d1808ff6849cbf 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -31,14 +31,14 @@
 #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
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1


@@ -49,18 +49,14 @@ public:
         : TARIFF(),
           tariffData()
     {}
         : 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() {}
 
     double  GetPriceWithTraffType(uint64_t up,
     virtual ~TARIFF_IMPL() {}
 
     double  GetPriceWithTraffType(uint64_t up,


@@ -73,6 +69,7 @@ public:
     double  GetFree() const { return tariffData.tariffConf.free; }
     PERIOD  GetPeriod() const { return tariffData.tariffConf.period; }
     CHANGE_POLICY GetChangePolicy() const { return tariffData.tariffConf.changePolicy; }
     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;
 


@@ -88,7 +85,7 @@ 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;
+    std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const;

 
 private:
     TARIFF_DATA     tariffData;
 
 private:
     TARIFF_DATA     tariffData;