modification of the resampling procedure: only one call for all methods

matlab/particle/gaussian_mixture_filter.m

@@ -180,7 +180,7 @@ for t=1:sample_size
         SampleWeights = SampleWeights./SumSampleWeights ;			
         [ras,SortedRandomIndx] = sort(rand(1,Gsecond));        
         SortedRandomIndx = SortedRandomIndx(1:G);
-        indx = resample(SampleWeights,DynareOptions.particle.resampling.method1,DynareOptions.particle.resampling.method2) ;
+        indx = index_resample(0,SampleWeights,DynareOptions) ;
         indx = indx(SortedRandomIndx) ;
         StateMu = StateMuPost(:,indx);
         StateSqrtP = StateSqrtPPost(:,:,indx);
@@ -204,7 +204,7 @@ for t=1:sample_size
         Neff = 1/sum(bsxfun(@power,SampleWeights,2)) ;
         if (Neff<.5*sample_size && strcmpi(DynareOptions.particle.resampling.status,'generic')) || strcmpi(DynareOptions.particle.resampling.status,'systematic')
             ks = ks + 1 ;
-            StateParticles = StateParticles(:,resample(SampleWeights',DynareOptions.particle.resampling.method1,DynareOptions.particle.resampling.method2)) ; 
+            StateParticles = resample(StateParticles',SampleWeights,DynareOptions)' ; 
             StateVectorMean = mean(StateParticles,2) ;
             StateVectorVarianceSquareRoot = reduced_rank_cholesky( (StateParticles*StateParticles')/number_of_particles - StateVectorMean*(StateVectorMean') )';
             SampleWeights = 1/number_of_particles ;