Changeset 584

Timestamp:

08/27/09 15:39:33 (15 years ago)

Author:

smidl

Message:

new function unique(ivec) and its test in RV_test

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (1 diff)
• bdm/itpp_ext.cpp (modified) (1 diff)
• bdm/itpp_ext.h (modified) (1 diff)
• tests/rv_test.cpp (modified) (1 diff)

library/bdm/base/bdmbase.h

@@ -139 +139 @@
                         return dsize;
                 }
+                
+                //! access function
+                const ivec& _ids() const { return ids;}
 
                 //! Recount size of the corresponding data vector

library/bdm/itpp_ext.cpp

@@ -398 +398 @@
 vec randun(int n){vec res(n); for(int i=0;i<n;i++){res(i)=randun();}; return res;};
 mat randun(int n, int m){mat res(n,m); for(int i=0;i<n*m;i++){res(i)=randun();}; return res;};
-
-}
+ivec unique (const ivec &in)
+{
+        ivec uniq (0);
+        int j = 0;
+        bool found = false;
+        for (int i = 0;i < in.length(); i++) {
+                found = false;
+                j = 0;
+                while ( (!found) && (j < uniq.length())) {
+                        if (in (i) == uniq (j)) found = true;
+                        j++;
+                }
+                if (!found) uniq = concat (uniq, in (i));
+        }
+        return uniq;
+}
+
+}

library/bdm/itpp_ext.h

@@ -113 +113 @@
 mat randun(int n, int m);
 
+//! function returns unique entries in input vector \c in
+ivec unique(const ivec &in);
 }
 

library/tests/rv_test.cpp

@@ -133 +133 @@
                 CHECK_EQUAL ( exp_bi[i], bi ( i ) );
         }
+        
+        // check uniqueness
+        RV join=a;
+        join.add(b);
+        RV tmp=a; tmp.t(1);
+        join.add(tmp);
+        tmp=b; tmp.t(-1);
+        join.add(tmp);
+        
+        CHECK_EQUAL(unique(join._ids()), vec_2(a.id(0), b.id(0)));
 }