[lmi-commits] [4900] Render two operator[]() implementations nearly identical

[Greg Chicares]

Revision: 4900
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4900
Author:   chicares
Date:     2010-05-03 23:44:37 +0000 (Mon, 03 May 2010)
Log Message:
-----------
Render two operator[]() implementations nearly identical

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

Modified: lmi/trunk/dbvalue.cpp
===================================================================
--- lmi/trunk/dbvalue.cpp       2010-05-03 23:14:41 UTC (rev 4899)
+++ lmi/trunk/dbvalue.cpp       2010-05-03 23:44:37 UTC (rev 4900)
@@ -214,30 +214,18 @@
 }
 
 //============================================================================
-double& TDBValue::operator[](std::vector<int> const& idx)
+double& TDBValue::operator[](std::vector<int> const& index)
 {
-    LMI_ASSERT(e_number_of_axes == idx.size());
+    LMI_ASSERT(e_number_of_axes == index.size());
+    LMI_ASSERT(e_number_of_axes == axis_lengths_.size());
 
-    if(e_number_of_axes != axis_lengths_.size())
-        {
-        fatal_error()
-            << "Trying to index database with key "
-            << key_
-            << ": "
-            << "e_number_of_axes is " << e_number_of_axes
-            << ", and axis_lengths.size() is " << axis_lengths_.size()
-            << ", but those quantities must be equal."
-            << LMI_FLUSH
-            ;
-        }
-
     int z = 0;
     for(unsigned int j = 0; j < axis_lengths_.size(); j++)
         {
         if(1 != axis_lengths_[j])
             {
-            LMI_ASSERT(idx[j] < axis_lengths_[j]);
-            z = z * axis_lengths_[j] + idx[j];
+            LMI_ASSERT(index[j] < axis_lengths_[j]);
+            z = z * axis_lengths_[j] + index[j];
             }
         }
 // TODO ?? erase    z *= axis_lengths_.back();
@@ -259,7 +247,8 @@
 {
     std::vector<int> const& index(idx.index_vector());
 
-    LMI_ASSERT(0 < axis_lengths_.size());
+    LMI_ASSERT(e_number_of_axes == axis_lengths_.size());
+
     int z = 0;
     for(unsigned int j = 0; j < axis_lengths_.size() - 1; j++)
         {