Add files via upload
This commit is contained in:
parent
1675deb3d2
commit
5904f5a972
1 changed files with 8 additions and 8 deletions
|
|
@ -41,7 +41,7 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""):
|
|||
from sympy import Symbol
|
||||
if isinstance(expr, sympy.numbers.Float) or isinstance(expr, sympy.numbers.Integer) or isinstance(expr, sympy.numbers.Rational) or isinstance(expr, sympy.numbers.Pi):
|
||||
used_param_names = list(param_dict.keys()) + list(unsnapped_param_dict)
|
||||
unsnapped_param_name = get_next_available_key(used_param_names, "p", is_underscore=False)
|
||||
unsnapped_param_name = get_next_available_key(used_param_names, "pp", is_underscore=False)
|
||||
unsnapped_param_dict[unsnapped_param_name] = float(expr)
|
||||
unsnapped_expr = Symbol(unsnapped_param_name)
|
||||
return unsnapped_expr
|
||||
|
|
@ -86,7 +86,7 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""):
|
|||
# eq_numbers[new_numbers[kk][0]] = new_numbers[kk][1]
|
||||
# jj = 0
|
||||
# for parm in unsnapped_param_dict:
|
||||
# if parm!="p":
|
||||
# if parm!="pp":
|
||||
# eq = eq.subs(parm, eq_numbers[jj])
|
||||
# jj = jj + 1
|
||||
# zero_snapped_expr = zero_snapped_expr + [eq]
|
||||
|
|
@ -104,14 +104,14 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""):
|
|||
param_dict = {}
|
||||
unsnapped_param_dict = {'p':1}
|
||||
eq = unsnap_recur(expr,param_dict,unsnapped_param_dict)
|
||||
del unsnapped_param_dict["p"]
|
||||
del unsnapped_param_dict["pp"]
|
||||
temp_unsnapped_param_dict = copy.deepcopy(unsnapped_param_dict)
|
||||
new_numbers = integerSnap(eq_numbers,w+1)
|
||||
new_numbers = {"p"+str(k): v for k, v in new_numbers.items()}
|
||||
new_numbers = {"pp"+str(k): v for k, v in new_numbers.items()}
|
||||
temp_unsnapped_param_dict.update(new_numbers)
|
||||
#for kk in range(len(new_numbers)):
|
||||
# eq_numbers[new_numbers[kk][0]] = new_numbers[kk][1]
|
||||
new_eq = re.sub(r"(p\d*)",r"{\1}",str(eq))
|
||||
new_eq = re.sub(r"(pp\d*)",r"{\1}",str(eq))
|
||||
new_eq = new_eq.format_map(temp_unsnapped_param_dict)
|
||||
integer_snapped_expr = integer_snapped_expr + [parse_expr(new_eq)]
|
||||
except:
|
||||
|
|
@ -129,14 +129,14 @@ def add_snap_expr_on_pareto(pathdir, filename, math_expr, PA, DR_file=""):
|
|||
param_dict = {}
|
||||
unsnapped_param_dict = {'p':1}
|
||||
eq = unsnap_recur(expr,param_dict,unsnapped_param_dict)
|
||||
del unsnapped_param_dict["p"]
|
||||
del unsnapped_param_dict["pp"]
|
||||
temp_unsnapped_param_dict = copy.deepcopy(unsnapped_param_dict)
|
||||
new_numbers = rationalSnap(eq_numbers,w+1)
|
||||
new_numbers = {"p"+str(k): v for k, v in new_numbers.items()}
|
||||
new_numbers = {"pp"+str(k): v for k, v in new_numbers.items()}
|
||||
temp_unsnapped_param_dict.update(new_numbers)
|
||||
#for kk in range(len(new_numbers)):
|
||||
# eq_numbers_snap[new_numbers[kk][0]] = new_numbers[kk][1][1:3]
|
||||
new_eq = re.sub(r"(p\d*)",r"{\1}",str(eq))
|
||||
new_eq = re.sub(r"(pp\d*)",r"{\1}",str(eq))
|
||||
new_eq = new_eq.format_map(temp_unsnapped_param_dict)
|
||||
rational_snapped_expr = rational_snapped_expr + [parse_expr(new_eq)]
|
||||
except:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue