Removed parser.cpp.

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

diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h
index 6a296230d8413e3b148d3969ffc69992fb115ae2..ae40c12813c335aead50ea16cd878339b8d096ec 100644 (file)
--- a/include/stg/tariff_conf.h
+++ b/include/stg/tariff_conf.h
@@ -34,14 +34,6 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-//-----------------------------------------------------------------------------
-enum
-{
-    TRAFF_UP = 0,
-    TRAFF_DOWN,
-    TRAFF_UP_DOWN,
-    TRAFF_MAX
-};

 //-----------------------------------------------------------------------------
 struct DIRPRICE_DATA
 {
 //-----------------------------------------------------------------------------
 struct DIRPRICE_DATA
 {


@@ -121,6 +113,21 @@ struct DIRPRICE_DATA_RES
         return dd;
         }
 
         return dd;
         }
 

+    void Splice(const DIRPRICE_DATA_RES & rhs)
+        {
+        hDay.splice(rhs.hDay);
+        mDay.splice(rhs.mDay);
+        hNight.splice(rhs.hNight);
+        mNight.splice(rhs.mNight);
+        priceDayA.splice(rhs.priceDayA);
+        priceNightA.splice(rhs.priceNightA);
+        priceDayB.splice(rhs.priceDayB);
+        priceNightB.splice(rhs.priceNightB);
+        threshold.splice(rhs.threshold);
+        singlePrice.splice(rhs.singlePrice);
+        noDiscount.splice(rhs.noDiscount);
+        }
+

     RESETABLE<int>    hDay;
     RESETABLE<int>    mDay;
     RESETABLE<int>    hNight;
     RESETABLE<int>    hDay;
     RESETABLE<int>    mDay;
     RESETABLE<int>    hNight;


@@ -136,17 +143,17 @@ struct DIRPRICE_DATA_RES
 //-----------------------------------------------------------------------------
 struct TARIFF_CONF
 {
 //-----------------------------------------------------------------------------
 struct TARIFF_CONF
 {

-    double         fee;
-    double         free;
-    int            traffType;
-    double         passiveCost;
-    std::string    name;
-    TARIFF::PERIOD period;
+    double             fee;
+    double             free;
+    TARIFF::TRAFF_TYPE traffType;
+    double             passiveCost;
+    std::string        name;
+    TARIFF::PERIOD     period;

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

-          traffType(TRAFF_UP_DOWN),
+          traffType(TARIFF::TRAFF_UP_DOWN),

           passiveCost(0),
           name(),
           period(TARIFF::MONTH)
           passiveCost(0),
           name(),
           period(TARIFF::MONTH)


@@ -155,7 +162,7 @@ struct TARIFF_CONF
     TARIFF_CONF(const std::string & n)
         : fee(0),
           free(0),
     TARIFF_CONF(const std::string & n)
         : fee(0),
           free(0),

-          traffType(TRAFF_UP_DOWN),
+          traffType(TARIFF::TRAFF_UP_DOWN),

           passiveCost(0),
           name(n),
           period(TARIFF::MONTH)
           passiveCost(0),
           name(n),
           period(TARIFF::MONTH)


@@ -196,12 +203,12 @@ struct TARIFF_CONF_RES
         return tc;
         }
 
         return tc;
         }
 

-    RESETABLE<double>         fee;
-    RESETABLE<double>         free;
-    RESETABLE<int>            traffType;
-    RESETABLE<double>         passiveCost;
-    RESETABLE<std::string>    name;
-    RESETABLE<TARIFF::PERIOD> period;
+    RESETABLE<double>             fee;
+    RESETABLE<double>             free;
+    RESETABLE<TARIFF::TRAFF_TYPE> traffType;
+    RESETABLE<double>             passiveCost;
+    RESETABLE<std::string>        name;
+    RESETABLE<TARIFF::PERIOD>     period;

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