Changeset 2015 for GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

Timestamp:

01/22/07 20:25:06 (17 years ago)

Author:

bittner

Message:

pvs efficiency tuning

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -310 +310 @@
         bool RequiresResort() const
         {
-                // the last part should not be more than log of the sorted part. this
-                // way we can achieve logarithmic behaviour for insertion and find
-                const int dirtySize = (int)mEntries.size() - mLastSorted;
-                return dirtySize > 4*(int)(log((double)mEntries.size()) / log(2.0));
-        }
-
-
+          // the last part should not be more than log of the sorted part. this
+          // way we can achieve logarithmic behaviour for insertion and find
+          const int dirtySize = (int)mEntries.size() - mLastSorted;
+          return dirtySize > 500;
+          //              4*(int)(log((double)mEntries.size()) / log(2.0));
+        }
+
+  bool RequiresResortLog() const
+  {
+        // the last part should not be more than log of the sorted part. this
+        // way we can achieve logarithmic behaviour for insertion and find
+        const int dirtySize = (int)mEntries.size() - mLastSorted;
+        return dirtySize > 4*(int)(log((double)mEntries.size()) / log(2.0));
+  }
+  
+  
         int GetLastSorted() const
         {
@@ -600 +609 @@
                                          const bool checkDirty)
 {
-  bool found = false;
-  
   PvsEntry<T, S> dummy(sample, PvsData());
   
@@ -611 +618 @@
   
   if ((it != mEntries.end()) && ((*it).mObject == sample))
-        found = true;
+        //  if (it != sorted_end)
+        return true;
   
   // sample not found yet => search further in the unsorted part
-  if (!found && checkDirty) {
+  if (checkDirty) {
         
         for (it = sorted_end; (it != mEntries.end()) && ((*it).mObject != sample); ++ it) ;
         
         if (it != mEntries.end())
-          found = true;
+          return true;
   }
   
-  return found;
+  return false;
 }