Skip to content

make integer division explicit #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ioannis-vm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make integer division explicit #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RESSPyLab/solution_vis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def get_initial_cep_constraint(xx, x_vary, ind):
f = []

def constr(x2):
n_backstresses = int(len(x2) - 6) / 2
n_backstresses = int((len(x2) - 6) / 2)
g = x2[4] * x2[5] - x2[2] * x2[3]
for ii in range(0, n_backstresses):
ck_ind = 6 + 2 * ii
Expand Down
10 changes: 5 additions & 5 deletions RESSPyLab/uvc_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def g_constraint(x, ep):
:param float ep: Plastic strain value.
:return float: Value of g.
"""
n_backstresses = int(len(x) - 6) / 2
n_backstresses = int((len(x) - 6) / 2)

g = x[4] * x[5] * np.exp(-x[5] * ep) - x[2] * x[3] * np.exp(-x[3] * ep)
for i in range(0, n_backstresses):
Expand All @@ -29,7 +29,7 @@ def g_gradient(x, ep):
:param float ep: Plastic strain value.
:return np.array: (n, 1) Gradient of g, n = len(x).
"""
n_backstresses = int(len(x) - 6) / 2
n_backstresses = int((len(x) - 6) / 2)

grad = np.zeros((len(x), 1))
grad[2] = -x[3] * np.exp(-x[3] * ep)
Expand All @@ -51,7 +51,7 @@ def g_hessian(x, ep):
:param float ep: Plastic strain value.
:return np.array: (n, n) Hessian of g, n = len(x).
"""
n_backstresses = int(len(x) - 6) / 2
n_backstresses = int((len(x) - 6) / 2)
hess = np.zeros((len(x), len(x)))

# row 2
Expand Down Expand Up @@ -136,7 +136,7 @@ def g2_gradient(x, constants, variables):
:param dict variables: Defines constraint values that depend on x.
:return float: Value of the constraint in standard form.
"""
n_backstresses = int(len(x) - 6) / 2
n_backstresses = int((len(x) - 6) / 2)

grad = np.zeros((len(x), 1))
grad[2] = x[3] ** 2
Expand All @@ -159,7 +159,7 @@ def g2_hessian(x, constants, variables):
:param dict variables: Defines constraint values that depend on x.
:return float: Value of the constraint in standard form.
"""
n_backstresses = int(len(x) - 6) / 2
n_backstresses = int((len(x) - 6) / 2)

hess = np.zeros((len(x), len(x)))
# 2nd row
Expand Down
10 changes: 5 additions & 5 deletions RESSPyLab/vc_limited_info_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def vc_tensile_opt_scipy(x_0, file_list, rho_iso_inf, rho_iso_sup, rho_yield_inf
g6_sup_constr = opt.NonlinearConstraint(g_6_high.f, constr_lb, constr_ub, jac=g_6_high.gf, hess=g_6_high.hf)

# Make the tuple of constraints
n_backstresses = int((len(x_0) - 4) // 2)
n_backstresses = int((len(x_0) - 4) / 2)
if n_backstresses == 2:
constraints = (g3_inf_constr, g3_sup_constr, g4_inf_constr, g4_sup_constr, g5_inf_constr, g5_sup_constr,
g6_inf_constr, g6_sup_constr)
Expand Down Expand Up @@ -158,7 +158,7 @@ def vc_tensile_opt_auglag(x_0, file_list, rho_iso_inf, rho_iso_sup, rho_yield_in
'rho_gamma_inf': rho_gamma_b_inf, 'rho_gamma_sup': rho_gamma_b_sup,
'rho_gamma_12_inf': rho_gamma_12_inf, 'rho_gamma_12_sup': rho_gamma_12_sup}
# Set-up constraints
n_backstresses = int((len(x_0) - 4) // 2)
n_backstresses = int((len(x_0) - 4) / 2)
if n_backstresses == 2:
constraint_dict = {'constants': g_constants, 'variables': {},
'functions': [g3_vco_lower, g3_vco_upper, g4_vco_lower, g4_vco_upper,
Expand Down Expand Up @@ -237,7 +237,7 @@ def vc_tensile_opt_linesearch(x_0, file_list, rho_iso_inf, rho_iso_sup, rho_yiel
'rho_gamma_inf': rho_gamma_b_inf, 'rho_gamma_sup': rho_gamma_b_sup,
'rho_gamma_12_inf': rho_gamma_12_inf, 'rho_gamma_12_sup': rho_gamma_12_sup}
# Set-up constraints
n_backstresses = int((len(x_0) - 4) // 2)
n_backstresses = int((len(x_0) - 4) / 2)
if n_backstresses == 2:
constraint_dict = {'constants': g_constants, 'variables': {},
'functions': [g3_vco_lower, g3_vco_upper, g4_vco_lower, g4_vco_upper,
Expand Down Expand Up @@ -300,7 +300,7 @@ def make_feasible(x_0, c):
- x_0 should follow: x0 = [200000, 355, 1, 1, 1, 1] for one backstress
- x_0 should follow: x0 = [200000, 355, 1, 1, 1, rho_gamma_12_inf, 1, 1] for two backstresses
"""
n_backstresses = int((len(x_0) - 4) // 2)
n_backstresses = int((len(x_0) - 4) / 2)
# Get the average of the bounds
rho_yield_avg = 0.5 * (c['rho_yield_inf'] + c['rho_yield_sup'])
rho_iso_avg = 0.5 * (c['rho_iso_inf'] + c['rho_iso_sup'])
Expand All @@ -320,7 +320,7 @@ def make_feasible(x_0, c):
def vc_constraint_check(x_opt, rho_iso_inf, rho_iso_sup, rho_yield_inf, rho_yield_sup, rho_gamma_b_inf,
rho_gamma_b_sup):
""" Checks if each of g_3, g_4, and g_5 were satisfied. """
n_backstresses = int((len(x_opt) - 4) // 2)
n_backstresses = int((len(x_opt) - 4) / 2)
sum_c_gamma = 0.
for i in range(n_backstresses):
sum_c_gamma += x_opt[4 + 2 * i] / x_opt[5 + 2 * i]
Expand Down