minor modifications

utvisionlab · Aug 25, 2016 · e9aa15b · e9aa15b
1 parent d6ee83e
commit e9aa15b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/mixest/distributions/mixture/mixture_mergeinit.m b/mixest/distributions/mixture/mixture_mergeinit.m
@@ -62,10 +62,17 @@
         if strcmp(method, 'default')
             if true
                 options.verbosity = 0;
+                DidxM = D.component(idx1);
+                % penalizer_theta
+                if options.penalize
+                    if isempty(options.penalizertheta)
+                        options.penalizertheta = DidxM.penalizerparam(data);
+                    end
+                end
                 data = mxe_readdata(data);
                 h = D.weighting(theta, data);
                 data.weight = sum(h([idx1 idx2],:),1);
-                DidxM = D.component(idx1);
+                options.theta0 = theta.D{idx1};
                 theta.D{idx1} = DidxM.estimate(data, options);
             else
                 w1 = theta.p(idx1);

diff --git a/mixest/distributions/mixture/mixture_splitinit.m b/mixest/distributions/mixture/mixture_splitinit.m
@@ -69,11 +69,18 @@
             if strcmp(method, 'default')
                 if true
                     options.verbosity = 0;
+                    DidxM = D.component(idx);
+                    % penalizer_theta
+                    if options.penalize
+                        if isempty(options.penalizertheta)
+                            options.penalizertheta = DidxM.penalizerparam(data);
+                        end
+                    end
                     data = mxe_readdata(data);
                     h = D.weighting(theta, data);
                     w = rand(1, data.size);
-                    DidxM = D.component(idx);
                     data.weight = w.*(h(idx,:)+0.1);
+                    options.theta0 = theta.D{idx};
                     theta.D{end} = DidxM.estimate(data, options);
                     data.weight = (1-w).*(h(idx,:)+0.1);
                     theta.D{idx} = DidxM.estimate(data, options);