Changeset 767

Timestamp:

01/11/10 23:01:37 (14 years ago)

Author:

mido

Message:

a few details corrected

Location:

applications

Files:

• bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• pmsm/filters.h (modified) (2 diffs)

applications/bdmtoolbox/mex/merger.cpp

@@ -67 +67 @@
                 Merger->set_support ( *RecSup );
         } 
-        } catch (UIException &e) {
+        } catch (UIException) {
                 shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support", UI::optional );
                 if (DisSup){

applications/pmsm/filters.h

@@ -56 +56 @@
                 PMSMlin ( MPFpmsm &p0 ) :p ( p0 ) {};
                 PMSMlin ( const PMSMlin &P0 ) : KalmanFull ( P0 ), p ( P0.p ), thm ( P0.thm ) {}
-                BM* _copy_() const {return new PMSMlin ( *this );}
+                
+                PMSMlin* _copy() const {
+                        return new PMSMlin ( *this );
+                }
 
                 void fillA() {
@@ -177 +180 @@
                                 if ( ind ( i ) != i ) {//replace the current Bm by a new one
                                         delete BMs ( i );
-                                        BMs ( i ) = BMs ( ind ( i ) )->_copy_(); //copy constructor
+                                        BMs ( i ) = BMs ( ind ( i ) )->_copy(); //copy constructor
                                 }
                         };