[lmi-commits] [lmi] master a924a36 4/5: Rename an obsolete enumerator

[Greg Chicares]

branch: master
commit a924a36ebb38cc201f38a24862c8d7740544415e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rename an obsolete enumerator
---
 datum_sequence.cpp    | 4 ++--
 input_realization.cpp | 2 +-
 mc_enum_types.xpp     | 4 ++--
 types.rnc             | 6 ++----
 types.xsd             | 8 +++-----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/datum_sequence.cpp b/datum_sequence.cpp
index 03c6a4b..9c101b8 100644
--- a/datum_sequence.cpp
+++ b/datum_sequence.cpp
@@ -207,7 +207,7 @@ std::map<std::string,std::string> const 
payment_sequence::allowed_keywords() con
         {
         all_keywords["minimum" ] = "PmtMinimum" ;
         all_keywords["target"  ] = "PmtTarget"  ;
-        all_keywords["sevenpay"] = "PmtMEP"     ;
+        all_keywords["sevenpay"] = "Pmt7PP"     ;
         all_keywords["glp"     ] = "PmtGLP"     ;
         all_keywords["gsp"     ] = "PmtGSP"     ;
         all_keywords["corridor"] = "PmtCorridor";
@@ -281,7 +281,7 @@ std::map<std::string,std::string> const 
specamt_sequence::allowed_keywords() con
         {
         all_keywords["maximum" ] = "SAMaximum" ;
         all_keywords["target"  ] = "SATarget"  ;
-        all_keywords["sevenpay"] = "SAMEP"     ;
+        all_keywords["sevenpay"] = "SA7PP"     ;
         all_keywords["glp"     ] = "SAGLP"     ;
         all_keywords["gsp"     ] = "SAGSP"     ;
         all_keywords["corridor"] = "SACorridor";
diff --git a/input_realization.cpp b/input_realization.cpp
index 2afb9c8..d10f82e 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -164,7 +164,7 @@ Input::permissible_specified_amount_strategy_keywords()
         {
         all_keywords["maximum" ] = "SAMaximum"       ;
         all_keywords["target"  ] = "SATarget"        ;
-        all_keywords["sevenpay"] = "SAMEP"           ;
+        all_keywords["sevenpay"] = "SA7PP"           ;
         all_keywords["glp"     ] = "SAGLP"           ;
         all_keywords["gsp"     ] = "SAGSP"           ;
         all_keywords["corridor"] = "SACorridor"      ;
diff --git a/mc_enum_types.xpp b/mc_enum_types.xpp
index 27f7b94..c35daca 100644
--- a/mc_enum_types.xpp
+++ b/mc_enum_types.xpp
@@ -261,7 +261,7 @@
     {"PmtInputScalar" \
     ,"PmtMinimum" \
     ,"PmtTarget" \
-    ,"PmtMEP" \
+    ,"Pmt7PP" \
     ,"PmtGLP" \
     ,"PmtGSP" \
     ,"PmtCorridor" \
@@ -284,7 +284,7 @@
     {"SAInputScalar" \
     ,"SAMaximum" \
     ,"SATarget" \
-    ,"SAMEP" \
+    ,"SA7PP" \
     ,"SAGLP" \
     ,"SAGSP" \
     ,"SACorridor" \
diff --git a/types.rnc b/types.rnc
index abad3ff..c3ad928 100644
--- a/types.rnc
+++ b/types.rnc
@@ -157,13 +157,12 @@ solve_target =
 
 ## Optional strategy to determine payment as a function of specified amount.
 ## 'PmtInputScalar' is the default even though it is obsolete.
-## 'PmtMEP' uses 7702A 7PP rate.
 ## 'Table' uses an external table (e.g., New York Table D for group insurance).
 pmt_strategy =
       "PmtInputScalar"
     | "PmtMinimum"
     | "PmtTarget"
-    | "PmtMEP"
+    | "Pmt7PP"
     | "PmtGLP"
     | "PmtGSP"
     | "PmtCorridor"
@@ -171,12 +170,11 @@ pmt_strategy =
 
 ## Optional strategy to determine specified amount as a function of premium.
 ## 'SAInputScalar' is the default even though it is obsolete.
-## 'SAMEP' uses 7702A 7PP rate.
 sa_strategy =
       "SAInputScalar"
     | "SAMaximum"
     | "SATarget"
-    | "SAMEP"
+    | "SA7PP"
     | "SAGLP"
     | "SAGSP"
     | "SACorridor"
diff --git a/types.xsd b/types.xsd
index 2debb5d..7f01337 100644
--- a/types.xsd
+++ b/types.xsd
@@ -252,14 +252,13 @@ but none use both, so a single set of enumerators 
suffices.</xs:documentation>
     <xs:annotation>
       <xs:documentation>Optional strategy to determine payment as a function 
of specified amount.
 'PmtInputScalar' is the default even though it is obsolete.
-'PmtMEP' uses 7702A 7PP rate.
 'Table' uses an external table (e.g., New York Table D for group 
insurance).</xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:token">
       <xs:enumeration value="PmtInputScalar"/>
       <xs:enumeration value="PmtMinimum"/>
       <xs:enumeration value="PmtTarget"/>
-      <xs:enumeration value="PmtMEP"/>
+      <xs:enumeration value="Pmt7PP"/>
       <xs:enumeration value="PmtGLP"/>
       <xs:enumeration value="PmtGSP"/>
       <xs:enumeration value="PmtCorridor"/>
@@ -269,14 +268,13 @@ but none use both, so a single set of enumerators 
suffices.</xs:documentation>
   <xs:simpleType name="sa_strategy">
     <xs:annotation>
       <xs:documentation>Optional strategy to determine specified amount as a 
function of premium.
-'SAInputScalar' is the default even though it is obsolete.
-'SAMEP' uses 7702A 7PP rate.</xs:documentation>
+'SAInputScalar' is the default even though it is obsolete.</xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:token">
       <xs:enumeration value="SAInputScalar"/>
       <xs:enumeration value="SAMaximum"/>
       <xs:enumeration value="SATarget"/>
-      <xs:enumeration value="SAMEP"/>
+      <xs:enumeration value="SA7PP"/>
       <xs:enumeration value="SAGLP"/>
       <xs:enumeration value="SAGSP"/>
       <xs:enumeration value="SACorridor"/>