diff options
| author | Matt Argao <mcargao@email.wm.edu> | 2012-11-08 17:16:39 -0500 |
|---|---|---|
| committer | Matt Argao <mcargao@email.wm.edu> | 2012-11-08 17:16:39 -0500 |
| commit | a0f747be9349e7954a0116b362772403d88219b3 (patch) | |
| tree | 0ee3da126badc403662b7fd1eba6c1f24d66948d /mode_match.m | |
| parent | 7890155ab9f1808cbbd0295057274c003e8cefdd (diff) | |
| download | mode_match-a0f747be9349e7954a0116b362772403d88219b3.tar.gz mode_match-a0f747be9349e7954a0116b362772403d88219b3.zip | |
Merge fix
Diffstat (limited to 'mode_match.m')
| -rw-r--r-- | mode_match.m | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mode_match.m b/mode_match.m index 27affcb..c08ccd6 100644 --- a/mode_match.m +++ b/mode_match.m @@ -45,10 +45,6 @@ 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 |