Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

[stg.git] / include / stg / tariff_conf.h

diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h
index 8640d82383f437cd3e37c793d00aae595b0aa88d..79ade2eb44bef6ddaee90bf705a8d421297b7dcf 100644 (file)
--- a/include/stg/tariff_conf.h
+++ b/include/stg/tariff_conf.h
@@ -149,6 +149,7 @@ struct TARIFF_CONF
     std::string        name;
     TARIFF::PERIOD     period;
     TARIFF::CHANGE_POLICY changePolicy;
     std::string        name;
     TARIFF::PERIOD     period;
     TARIFF::CHANGE_POLICY changePolicy;

+    time_t changePolicyTimeout;

 
     TARIFF_CONF()
         : fee(0),
 
     TARIFF_CONF()
         : fee(0),


@@ -157,7 +158,8 @@ struct TARIFF_CONF
           passiveCost(0),
           name(),
           period(TARIFF::MONTH),
           passiveCost(0),
           name(),
           period(TARIFF::MONTH),

-          changePolicy(TARIFF::ALLOW)
+          changePolicy(TARIFF::ALLOW),
+          changePolicyTimeout(0)

         {}
 
     TARIFF_CONF(const std::string & n)
         {}
 
     TARIFF_CONF(const std::string & n)


@@ -167,7 +169,8 @@ struct TARIFF_CONF
           passiveCost(0),
           name(n),
           period(TARIFF::MONTH),
           passiveCost(0),
           name(n),
           period(TARIFF::MONTH),

-          changePolicy(TARIFF::ALLOW)
+          changePolicy(TARIFF::ALLOW),
+          changePolicyTimeout(0)

         {}
 };
 //-----------------------------------------------------------------------------
         {}
 };
 //-----------------------------------------------------------------------------


@@ -180,7 +183,8 @@ struct TARIFF_CONF_RES
           passiveCost(),
           name(),
           period(),
           passiveCost(),
           name(),
           period(),

-          changePolicy()
+          changePolicy(),
+          changePolicyTimeout()

         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)


@@ -192,6 +196,7 @@ struct TARIFF_CONF_RES
         name        = tc.name;
         period      = tc.period;
         changePolicy = tc.changePolicy;
         name        = tc.name;
         period      = tc.period;
         changePolicy = tc.changePolicy;

+        changePolicyTimeout = tc.changePolicyTimeout;

         return *this;
         }
 
         return *this;
         }
 


@@ -204,6 +209,8 @@ struct TARIFF_CONF_RES
         passiveCost.maybeSet(tc.passiveCost);
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);
         passiveCost.maybeSet(tc.passiveCost);
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);

+        changePolicy.maybeSet(tc.changePolicy);
+        changePolicyTimeout.maybeSet(tc.changePolicyTimeout);

         return tc;
         }
 
         return tc;
         }
 


@@ -213,6 +220,8 @@ struct TARIFF_CONF_RES
     RESETABLE<double>             passiveCost;
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;
     RESETABLE<double>             passiveCost;
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;

+    RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;
+    RESETABLE<time_t>             changePolicyTimeout;

 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA
 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA


@@ -253,6 +262,14 @@ struct TARIFF_DATA_RES
           dirPrice(DIR_NUM)
         {}
 
           dirPrice(DIR_NUM)
         {}
 

+    TARIFF_DATA_RES & operator=(const TARIFF_DATA & td)
+        {
+        tariffConf = td.tariffConf;
+        for (size_t i = 0; i < DIR_NUM; ++i)
+            dirPrice[i] = td.dirPrice[i];
+        return *this;
+        }
+

     TARIFF_DATA GetData() const
         {
         TARIFF_DATA td;
     TARIFF_DATA GetData() const
         {
         TARIFF_DATA td;