[lmi-commits] [5086] Rectify names

[Greg Chicares]

Revision: 5086
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5086
Author:   chicares
Date:     2010-08-01 12:17:33 +0000 (Sun, 01 Aug 2010)
Log Message:
-----------
Rectify names

Modified Paths:
--------------
    lmi/trunk/dbindex.hpp
    lmi/trunk/dbvalue.cpp

Modified: lmi/trunk/dbindex.hpp
===================================================================
--- lmi/trunk/dbindex.hpp       2010-07-29 02:12:48 UTC (rev 5085)
+++ lmi/trunk/dbindex.hpp       2010-08-01 12:17:33 UTC (rev 5086)
@@ -40,7 +40,7 @@
 
 enum
     {e_axis_gender    = 0
-    ,e_axis_class     = 1
+    ,e_axis_uw_class  = 1
     ,e_axis_smoking   = 2
     ,e_axis_issue_age = 3
     ,e_axis_uw_basis  = 4
@@ -55,7 +55,7 @@
 enum enum_database_dimensions
     {e_number_of_axes    = 1 + number_of_indices
     ,e_max_dim_gender    =   3
-    ,e_max_dim_class     =   4
+    ,e_max_dim_uw_class  =   4
     ,e_max_dim_smoking   =   3
     ,e_max_dim_issue_age = 100
     ,e_max_dim_uw_basis  =   5
@@ -77,7 +77,7 @@
     database_index
         (mcenum_gender   gender
         ,mcenum_class    uw_class
-        ,mcenum_smoking  smoker
+        ,mcenum_smoking  smoking
         ,int             issue_age
         ,mcenum_uw_basis uw_basis
         ,mcenum_state    state
@@ -86,7 +86,7 @@
     {
         idx_[0] = gender   ;
         idx_[1] = uw_class ;
-        idx_[2] = smoker   ;
+        idx_[2] = smoking  ;
         idx_[3] = issue_age;
         idx_[4] = uw_basis ;
         idx_[5] = state    ;

Modified: lmi/trunk/dbvalue.cpp
===================================================================
--- lmi/trunk/dbvalue.cpp       2010-07-29 02:12:48 UTC (rev 5085)
+++ lmi/trunk/dbvalue.cpp       2010-08-01 12:17:33 UTC (rev 5086)
@@ -144,7 +144,7 @@
 {
     LMI_ASSERT(e_number_of_axes == new_dims.size());
     LMI_ASSERT(1 == new_dims[0] || e_max_dim_gender    == new_dims[0]);
-    LMI_ASSERT(1 == new_dims[1] || e_max_dim_class     == new_dims[1]);
+    LMI_ASSERT(1 == new_dims[1] || e_max_dim_uw_class  == new_dims[1]);
     LMI_ASSERT(1 == new_dims[2] || e_max_dim_smoking   == new_dims[2]);
     LMI_ASSERT(1 == new_dims[3] || e_max_dim_issue_age == new_dims[3]);
     LMI_ASSERT(1 == new_dims[4] || e_max_dim_uw_basis  == new_dims[4]);
@@ -442,7 +442,7 @@
 {
     static int const d[e_number_of_axes] =
         {e_max_dim_gender
-        ,e_max_dim_class
+        ,e_max_dim_uw_class
         ,e_max_dim_smoking
         ,e_max_dim_issue_age
         ,e_max_dim_uw_basis