Changeset 182 for bdm/stat/libBM.cpp

Timestamp:

10/17/08 10:28:15 (16 years ago)

Author:

smidl

Message:

compilation error!

Files:

• bdm/stat/libBM.cpp (modified) (2 diffs)

bdm/stat/libBM.cpp

@@ -151 +151 @@
                 }
         }
+        it_assert_debug(res.length()==tsize,"this rv is not fully present in crv!");
         return res;
 
+}
+
+void RV::dataind (const RV &rv2, ivec &selfi, ivec &rv2i) const {
+        //clean results
+        selfi.set_size(0);
+        rv2i.set_size(0);
+        
+        // just in case any rv is empty
+        if ((len==0)||(rv2.length()==0)){return;} 
+        
+        //find comon rv
+        ivec cids=itpp::find(this->findself(rv2)>=0);
+        
+        // index of 
+        if ( cids.length()>0 ) {
+                str str1 = tostr();
+                str str2 = rv2.tostr(); 
+                
+                ivec part1;
+                ivec part2;
+                int i,j;
+                // find common rv in strs
+                for ( j=0; j < cids.length();j++ ) {
+                        i = cids(j);
+                        part1 = itpp::find ( ( str1.ids == ids ( i ) ) & ( str1.times == times ( i ) ) );
+                        part2 = itpp::find ( ( str2.ids == ids ( i ) ) & ( str2.times == times ( i ) ) );
+                        selfi = concat ( selfi, part1 );
+                        rv2i = concat ( rv2i, part2 );
+                }
+        }
+        it_assert_debug(selfi.length() == rv2i.length(),"this should not happen!");
 }
 
@@ -206 +238 @@
                 // find ith rv in common rv
                 rvsinrv ( i ) = mpdfs ( i )->_rv().dataind ( rv );
-                rvcsinrv ( i ) = mpdfs ( i )->_rvc().dataind ( rv );
-                rvinrvcs ( i ) = rv.dataind(mpdfs ( i )->_rvc());
-                //rvcsinrv and rvinrvcs must be 1-to-1
-                it_assert_debug(rvcsinrv ( i ).length()==rvinrvcs(i).length(),"" );
+                // establish link between rv and rvc
+                rv.dataind(mpdfs(i)->_rvc(), irv_rvcs(i), irvcs_rv(i));
         }
 }