From f05cb5ede32c2e17fc9062b7f4bc9d99be5123a7 Mon Sep 17 00:00:00 2001 From: Silviu Marian Udrescu Date: Sun, 28 Jun 2020 20:51:17 -0400 Subject: [PATCH] Add files via upload --- Code/S_add_snap_expr_on_pareto.py | 6 +++--- Code/S_snap.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/S_add_snap_expr_on_pareto.py b/Code/S_add_snap_expr_on_pareto.py index 87ae589..5dda1eb 100644 --- a/Code/S_add_snap_expr_on_pareto.py +++ b/Code/S_add_snap_expr_on_pareto.py @@ -79,7 +79,7 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""): # for w in range(len(eq_numbers)): # try: # param_dict = {} -# unsnapped_param_dict = {'p':1} +# unsnapped_param_dict = {'pp':1} # eq = unsnap_recur(expr,param_dict,unsnapped_param_dict) # new_numbers = zeroSnap(eq_numbers,w+1) # for kk in range(len(new_numbers)): @@ -102,7 +102,7 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""): for w in range(len(eq_numbers)): try: param_dict = {} - unsnapped_param_dict = {'p':1} + unsnapped_param_dict = {'pp':1} eq = unsnap_recur(expr,param_dict,unsnapped_param_dict) del unsnapped_param_dict["pp"] temp_unsnapped_param_dict = copy.deepcopy(unsnapped_param_dict) @@ -127,7 +127,7 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""): for w in range(len(eq_numbers)): try: param_dict = {} - unsnapped_param_dict = {'p':1} + unsnapped_param_dict = {'pp':1} eq = unsnap_recur(expr,param_dict,unsnapped_param_dict) del unsnapped_param_dict["pp"] temp_unsnapped_param_dict = copy.deepcopy(unsnapped_param_dict) diff --git a/Code/S_snap.py b/Code/S_snap.py index 02cdcbd..5272d93 100644 --- a/Code/S_snap.py +++ b/Code/S_snap.py @@ -74,7 +74,7 @@ def zeroSnap(p, top=1): def rationalSnap(p, top=1): """Snap to nearest rational number using continued fraction.""" p = np.array(p) - snaps = np.array(list(bestApproximation(x,100) for x in p)) + snaps = np.array(list(bestApproximation(x,10) for x in p)) chosen = np.argsort(snaps[:, 3])[:top] d = dict(list(zip(chosen, snaps[chosen, 1:3]))) d = {k: f"{val[0]}/{val[1]}" for k,val in d.items()}