Changeset 7634

Timestamp:

03/14/11 15:24:14 (14 years ago)

Author:

jschierm

Message:

Changed dataset clear to use reverse_iterator for efficiency in matlab memory manager.

File:

• issm/trunk/src/c/Container/DataSet.cpp (modified) (2 diffs)

issm/trunk/src/c/Container/DataSet.cpp

@@ -77 +77 @@
 /*FUNCTION DataSet::~DataSet{{{1*/
 DataSet::~DataSet(){
+//      Echo();
         clear();
+//      Echo();
         xfree((void**)&sorted_ids);
         xfree((void**)&id_offsets);
@@ -379 +381 @@
 void  DataSet::clear(){
 
-        vector<Object*>::iterator object;
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
+/*  use reverse_iterator for efficiency in matlab memory manager
+        (keeping old code in case it needs to revert back)  */
+
+//      vector<Object*>::iterator object;
+        vector<Object*>::reverse_iterator object;
+
+//      for ( object=objects.begin() ; object < objects.end(); object++ ){
+//              delete (*object);
+//      }
+        for ( object=objects.rbegin() ; object < objects.rend(); object++ ){
                 delete (*object);
         }