Changeset 668 for XIOS/trunk/src/distribution_server.cpp

Timestamp:

08/24/15 14:53:36 (9 years ago)

Author:

mhnguyen

Message:

Implementing some code factoring

+) Replace some slow searching function by faster ones

Test
+) On Curie
+) test_client and test_complete are correct

File:

• XIOS/trunk/src/distribution_server.cpp (modified) (3 diffs)

XIOS/trunk/src/distribution_server.cpp

@@ -8 +8 @@
  */
 #include "distribution_server.hpp"
+#include "utils.hpp"
 
 namespace xios {
@@ -91 +92 @@
 CArray<size_t,1> CDistributionServer::computeLocalIndex(const CArray<size_t,1>& globalIndex)
 {
-  CArray<size_t,1>::const_iterator itBegin = this->globalIndex_.begin(),
-                                   itEnd   = this->globalIndex_.end(), it;
+  int ssize = globalIndex.numElements();
+  int nbGlobalIndex = this->globalIndex_.numElements();
 
-  int ssize = globalIndex.numElements(), idx = 0;
+  std::vector<int>::iterator it;
+  std::vector<int> permutIndex(nbGlobalIndex);
+  XIOSAlgorithms::fillInIndex(nbGlobalIndex, permutIndex);
+  XIOSAlgorithms::sortWithIndex<size_t, CArrayStorage>(this->globalIndex_, permutIndex);
+  typedef XIOSBinarySearchWithIndex<size_t, CArrayStorage> BinarySearch;
+  BinarySearch binarySearch(this->globalIndex_);
+
   CArray<size_t,1> localIndex(ssize);
-  it = itBegin;
+  int idx = 0;
   for (int i = 0; i < ssize; ++i)
   {
-    it = std::find(itBegin, itEnd, globalIndex(i));
-//    it = std::lower_bound(it, itEnd, globalIndex(i));
-    if (itEnd != it)
+    if (binarySearch.search(permutIndex.begin(), permutIndex.end(), globalIndex(i), it))
     {
-      localIndex(idx) = std::distance(itBegin, it);
+      localIndex(idx) = *it;
       ++idx;
     }
@@ -117 +122 @@
 void CDistributionServer::computeLocalIndex(CArray<size_t,1>& globalIndex)
 {
-  CArray<size_t,1>::const_iterator itBegin = this->globalIndex_.begin(),
-                                   itEnd   = this->globalIndex_.end(), it;
+  int ssize = globalIndex.numElements();
+  int nbGlobalIndex = this->globalIndex_.numElements();
 
-  int ssize = globalIndex.numElements(), idx = 0;
+  std::vector<int>::iterator it;
+  std::vector<int> permutIndex(nbGlobalIndex);
+  XIOSAlgorithms::fillInIndex(nbGlobalIndex, permutIndex);
+  XIOSAlgorithms::sortWithIndex<size_t, CArrayStorage>(this->globalIndex_, permutIndex);
+  typedef XIOSBinarySearchWithIndex<size_t, CArrayStorage> BinarySearch;
+  BinarySearch binarySearch(this->globalIndex_);
+
   CArray<size_t,1> localIndex(ssize);
-  it = itBegin;
+  int idx = 0;
   for (int i = 0; i < ssize; ++i)
   {
-    it = std::find(itBegin, itEnd, globalIndex(i));
-//    it = std::lower_bound(it, itEnd, globalIndex(i));
-    if (itEnd != it)
+    if (binarySearch.search(permutIndex.begin(), permutIndex.end(), globalIndex(i), it))
     {
-      localIndex(idx) = std::distance(itBegin, it);
+      localIndex(idx) = *it;
       ++idx;
     }