[lmi-commits] [6019] Improve cell-deletion speed

[Greg Chicares]

Revision: 6019
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6019
Author:   chicares
Date:     2014-11-05 18:07:24 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
Improve cell-deletion speed

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/census_view.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-11-01 22:30:19 UTC (rev 6018)
+++ lmi/trunk/ChangeLog 2014-11-05 18:07:24 UTC (rev 6019)
@@ -34520,3 +34520,9 @@
   census_view.cpp
 Remove markers deemed nugatory 20141101T2228Z.
 
+20141105T1807Z <address@hidden> [519]
+
+  census_view.cpp
+Improve cell-deletion speed. See:
+  http://lists.nongnu.org/archive/html/lmi/2014-11/msg00004.html
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2014-11-01 22:30:19 UTC (rev 6018)
+++ lmi/trunk/census_view.cpp   2014-11-05 18:07:24 UTC (rev 6019)
@@ -1491,23 +1491,12 @@
 
     LMI_ASSERT(cell_parms().size() == n_items);
 
-    std::vector<Input> expurgated_cell_parms;
-    expurgated_cell_parms.reserve
-        (n_items - n_sel_items
-        );
-
-    for(unsigned int j = 0; j < cell_parms().size(); ++j)
+    for(int j = erasures.size() - 1; 0 <= j; --j)
         {
-        if(!contains(erasures, j))
-            {
-            expurgated_cell_parms.push_back(cell_parms()[j]);
-            }
+        cell_parms().erase(erasures[j] + cell_parms().begin());
         }
-    LMI_ASSERT(expurgated_cell_parms.size() == n_items - n_sel_items);
+    LMI_ASSERT(cell_parms().size() == n_items - n_sel_items);
 
-//    cell_parms().swap(expurgated_cell_parms); // TODO ?? Would this be 
better?
-    cell_parms() = expurgated_cell_parms;
-
 #if !wxCHECK_VERSION(2,9,3)
     // Remove selection to work around wx-2.9.2 bug in GetSelections()
     // (we'll set it again below).