Changeset 384 for library/bdm/estim/mixtures.cpp

Timestamp:

06/19/09 10:17:25 (15 years ago)

Author:

mido

Message:

possibly broken?

Location:

library/bdm

Files:

• . (moved) (moved from bdm)
• estim/mixtures.cpp (moved) (moved from bdm/estim/mixef.cpp) (2 diffs)

library/bdm/estim/mixtures.cpp

@@ -1 @@
-#include "mixef.h"
 #include <vector>
+#include "mixtures.h"
 
 namespace bdm{
@@ -136 +136 @@
 }
 
-emix* MixEF::epredictor (  ) const {
+mixtures* MixEF::epredictor (  ) const {
         Array<epdf*> pC ( n );
         for ( int i=0;i<n;i++ ) {pC ( i ) =Coms ( i )->epredictor ( );}
-        emix* tmp;
-        tmp = new emix (  );
+        mixtures* tmp;
+        tmp = new mixtures (  );
         tmp->set_parameters ( weights.posterior().mean(), pC, false );
         tmp->ownComs();