fixed bugs related to thresholded_oasis #90

thanks to @ehennestad

Author: epnev

deconvolution/oasis/thresholded_oasisAR1.m

@@ -134,7 +134,7 @@
             % update b and g
             if and(optimize_g, ~g_converged);
                 g0 = g;
-                [solution, active_set, g, spks] = update_g(y-b, active_set);       
+                [solution, active_set, g, spks] = update_g(y-b, active_set, smin);       
                 if abs(g-g0)/g0 < 1e-4;
                     g_converged = true;
                 end

deconvolution/oasis/thresholded_oasisAR2.m

@@ -134,13 +134,13 @@
         else
             % update smin
             [smin, solution, spks, active_set] = update_smin(y-b, g, smin,...
-                solution, spks, active_set, sqrt(thresh));
+                solution, spks, active_set, sqrt(thresh), max(spks));
             b = mean(y-solution);
 
             % update b and g
             if and(optimize_g, ~g_converged);
                 g0 = g;
-                [solution, active_set, g, spks] = update_g(y-b, active_set,lam);
+                [solution, active_set, g, spks] = update_g(y-b, g0, spks, smin);
                 if abs(g-g0)/g0 < 1e-4;
                     g_converged = true;
                 end