summaryrefslogtreecommitdiff
path: root/mode_match.m
diff options
context:
space:
mode:
Diffstat (limited to 'mode_match.m')
-rw-r--r--mode_match.m8
1 files changed, 6 insertions, 2 deletions
diff --git a/mode_match.m b/mode_match.m
index 596cff1..27affcb 100644
--- a/mode_match.m
+++ b/mode_match.m
@@ -1,9 +1,9 @@
-function [ possible_lens_placement, possible_lens_set, possible_sample_energy, n_possible_lens_placement, index ] = mode_match( q0, qf, Ltot, lambda, lens_permutations )
+function [ possible_lens_placement, possible_lens_set, possible_sample_energy, pick_of_n_best_lens_placements, index ] = mode_match( q0, qf, Ltot, lambda, lens_permutations )
%MODE_MATCH Summary of this function goes here
% Detailed explanation goes here
n_perms = size(lens_permutations,1);
-n_shuffles=1; %number of random placements of lenses
+n_shuffles=20; %number of random placements of lenses
%Initialize sample arrays
N = n_perms * n_shuffles;
@@ -45,6 +45,10 @@ n=4;
possible_lens_placement_trunc = round(possible_lens_placement*10^n)./10^n;
[possible_lens_placement_uniq, index] = unique(possible_lens_placement_trunc,'rows','stable'); %Unique solutions only
+<<<<<<< HEAD
n_possible_lens_placement = min(5,size(possible_lens_placement_uniq,1));
+=======
+pick_of_n_best_lens_placements = min(5,size(possible_lens_placement_uniq,1));
+>>>>>>> exper
end