aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Argao <mcargao@email.wm.edu>2012-11-29 16:37:14 -0500
committerMatt Argao <mcargao@email.wm.edu>2012-11-29 16:37:14 -0500
commite88386747ced3b121c23a6afdad2bc1f2ef362ab (patch)
tree6f75de7808cf0acda8fd37bf3a58e95d1f1bde71
parent086a61dd58c53ad35d8cf7aa97f8acb9194027a3 (diff)
downloadmode_match-e88386747ced3b121c23a6afdad2bc1f2ef362ab.tar.gz
mode_match-e88386747ced3b121c23a6afdad2bc1f2ef362ab.zip
Additional comments and function compatability
-rw-r--r--fitter_check.m11
-rw-r--r--remove_similar_soln.m2
2 files changed, 5 insertions, 8 deletions
diff --git a/fitter_check.m b/fitter_check.m
index 9d59c9d..ebb3ad1 100644
--- a/fitter_check.m
+++ b/fitter_check.m
@@ -20,14 +20,11 @@ qf=wr2q(wf,rf,lambda);
[ possible_lens_placement, possible_lens_set, possible_sample_energy] = mode_match( q0, qf, Ltot, lambda, lens_permutations );
%Remove similar solutions
-n_truncate = 4;
-[ possible_lens_placement_uniq, possible_lens_placement, possible_lens_set, index ] = remove_similar_soln( possible_sample_energy, possible_lens_placement, possible_lens_set, n_truncate );
+n_truncate = 3; %number of digits in truncated solution
+[ possible_lens_placement_uniq, possible_lens_placement, possible_sample_energy, possible_lens_set, index ] = remove_similar_soln( possible_sample_energy, possible_lens_placement, possible_lens_set, n_truncate );
-%Visualize five best solutions
-n_visualizations = 5;
-pick_visualization( possible_lens_placement_uniq, possible_lens_placement, possible_lens_set, index, n_visualizations, q0, qf, Ltot, lambda );
-
-possible_sample_energy(index(1:n_visualizations),:)
+n_visualizations = 5; %number of best solutions to visualize
+pick_visualization( possible_sample_energy, possible_lens_placement_uniq, possible_lens_placement, possible_lens_set, index, n_visualizations, q0, qf, Ltot, lambda );
% %Visualize fitness function for fixed f2 and f3
diff --git a/remove_similar_soln.m b/remove_similar_soln.m
index 4e554ab..9bea732 100644
--- a/remove_similar_soln.m
+++ b/remove_similar_soln.m
@@ -1,4 +1,4 @@
-function [ possible_lens_placement_uniq, possible_lens_placement, possible_lens_set, index ] = remove_similar_soln( possible_sample_energy, possible_lens_placement, possible_lens_set, n_truncate )
+function [ possible_lens_placement_uniq, possible_lens_placement, possible_sample_energy, possible_lens_set, index ] = remove_similar_soln( possible_sample_energy, possible_lens_placement, possible_lens_set, n_truncate )
%REMOVE_SIMILAR_SOLN Summary of this function goes here
% Detailed explanation goes here