Changeset 145 for bdm/stat/libBM.cpp

Timestamp:

08/20/08 15:41:21 (16 years ago)

Author:

smidl

Message:

Oprava dokumentace

Files:

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

bdm/stat/libBM.cpp

@@ -25 +25 @@
         times = in_times;
         tsize = 0;
-        for ( i=0;i<len;i++ ) {tsize+=sizes ( i );}
+        for ( i = 0;i < len;i++ ) {tsize += sizes ( i );}
 };
 
@@ -32 +32 @@
 }
 
-RV::RV () : tsize ( 0 ),len ( 0 ) {};
+RV::RV() : tsize ( 0 ), len ( 0 ) {};
 
-void RV::add ( const RV &rv2 ) {
+bool RV::add ( const RV &rv2 ) {
         // TODO
-        tsize+=rv2.tsize;
-        len +=rv2.len;
-        ids=concat ( ids,rv2.ids );
-        sizes=concat ( sizes,rv2.sizes );
-        times=concat ( times,rv2.times );
-        names=concat ( names,rv2.names );
+        ivec ind = rv2.findself ( *this ); //should be -1 all the time
+        ivec index = itpp::find(ind==-1); 
+        
+        if ( index.length() < rv2.len ) { //conflict
+                ids = concat ( ids, rv2.ids(index) );
+                sizes = concat ( sizes, rv2.sizes(index) );
+                times = concat ( times, rv2.times(index) );
+                names = concat ( names, rv2.names(to_Arr(index)) );
+        }
+        else {
+                ids = concat ( ids, rv2.ids );
+                sizes = concat ( sizes, rv2.sizes );
+                times = concat ( times, rv2.times );
+                names = concat ( names, rv2.names );
+        }
+        tsize = sum(sizes);
+        len = ids.length();
+        return (index.length()<rv2.len);
+
 //      return *this;
 };
@@ -58 +71 @@
 }
 
-RV RV::subselect ( ivec ind ) {
+RV RV::subselect ( ivec ind ) const {
         return RV ( ids ( ind ), names ( to_Arr ( ind ) ), sizes ( ind ), times ( ind ) );
 }
 
-void RV::t ( int delta ) { times +=delta;}
+void RV::t ( int delta ) { times += delta;}
 
-RV RV::operator() ( ivec ind ) {
+RV RV::operator() ( ivec ind ) const {
         return RV ( ids ( ind ), names ( to_Arr ( ind ) ), sizes ( ind ), times ( ind ) );
 }
 
-bool RV::equal ( RV rv2 ) const {
-        return ( ids==rv2.ids ) && ( times == rv2.times ) && ( sizes==rv2.sizes );
+bool RV::equal ( const RV &rv2 ) const {
+        return ( ids == rv2.ids ) && ( times == rv2.times ) && ( sizes == rv2.sizes );
 }
 
 mat epdf::sampleN ( int N ) const {
-        mat X =zeros ( rv.count(),N );
-        for ( int i=0;i<N;i++ ) X.set_col ( i,this->sample() ); 
+        mat X = zeros ( rv.count(), N );
+        for ( int i = 0;i < N;i++ ) X.set_col ( i, this->sample() );
         return X;
 };
@@ -88 +101 @@
 }
 
-ivec RV::indexlist() {
-        ivec indlist ( tsize );
+str RV::tostr() const {
+        ivec idlist ( tsize );
+        ivec tmlist ( tsize );
         int i;
         int pos = 0;
-        for ( i=0;i<len;i++ ) {
-                indlist.set_subvector ( pos,pos+sizes ( i )-1, ids ( i ) );
+        for ( i = 0;i < len;i++ ) {
+                idlist.set_subvector ( pos, pos + sizes ( i ) - 1, ids ( i ) );
+                tmlist.set_subvector ( pos, pos + sizes ( i ) - 1, times ( i ) );
+                pos += sizes ( i );
         }
-        return indlist;
+        return str ( idlist, tmlist );
+}
+
+ivec RV::dataind ( RV rv2 ) const {
+        str str2 = rv2.tostr();
+        ivec res ( 0 );
+        ivec part;
+        int i;
+        for ( i = 0;i < len;i++ ) {
+                part = itpp::find ( ( str2.ids == ids ( i ) ) & ( str2.times == times ( i ) ) );
+                res = concat ( res, part );
+        }
+        return res;
+}
+
+RV RV::subt ( const RV rv2 ) const {
+        ivec res = this->findself ( rv2 ); // nonzeros
+        ivec valid = itpp::find ( res == -1 ); //-1 => value not found => it remains
+        return ( *this ) ( valid ); //keep those that were not found in rv2
+}
+
+ivec RV::findself ( const RV &rv2 ) const {
+        int i, j;
+        ivec tmp = -ones_i ( len );
+        for ( i = 0;i < len;i++ ) {
+                for ( j = 0;j < rv2.length();j++ ) {
+                        if ( ( ids ( i ) == rv2.ids ( j ) ) & ( times ( i ) == rv2.times ( j ) ) ) {
+                                tmp ( i ) = j;
+                                break;
+                        }
+                }
+        }
+        return tmp;
 }