Add files via upload

This commit is contained in:
Silviu Marian Udrescu 2020-06-28 20:00:16 -04:00 committed by GitHub
parent cfc4d77e7c
commit 28edde1a36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -36,7 +36,6 @@ def polyfit(maxdeg, filename):
if n_variables>1: if n_variables>1:
C_1_2 = fractional_matrix_power(np.cov(variables.T),-1/2) C_1_2 = fractional_matrix_power(np.cov(variables.T),-1/2)
x = [] x = []
z = [] z = []
for ii in range(len(variables[0])): for ii in range(len(variables[0])):
@ -44,24 +43,34 @@ def polyfit(maxdeg, filename):
x = x + ["x"+str(ii)] x = x + ["x"+str(ii)]
z = z + ["z"+str(ii)] z = z + ["z"+str(ii)]
variables = np.matmul(C_1_2,variables.T).T if np.isnan(C_1_2).any()==False:
res = getBest(variables,f_dependent,maxdeg) variables = np.matmul(C_1_2,variables.T).T
parameters = res[0] res = getBest(variables,f_dependent,maxdeg)
params_error = res[1] parameters = res[0]
deg = res[2] params_error = res[1]
deg = res[2]
x = sympy.Matrix(x) x = sympy.Matrix(x)
M = sympy.Matrix(C_1_2) M = sympy.Matrix(C_1_2)
b = sympy.Matrix(means) b = sympy.Matrix(means)
M_x = M*(x-b) M_x = M*(x-b)
eq = mk_sympy_function(parameters,n_variables,deg) eq = mk_sympy_function(parameters,n_variables,deg)
symb = sympy.Matrix(z) symb = sympy.Matrix(z)
for i in range(len(symb)): for i in range(len(symb)):
eq = eq.subs(symb[i],M_x[i]) eq = eq.subs(symb[i],M_x[i])
eq = simplify(eq) eq = simplify(eq)
else:
res = getBest(variables,f_dependent,maxdeg)
parameters = res[0]
params_error = res[1]
deg = res[2]
eq = mk_sympy_function(parameters,n_variables,deg)
eq = simplify(eq)
else: else:
res = getBest(variables,f_dependent,maxdeg) res = getBest(variables,f_dependent,maxdeg)
@ -76,3 +85,5 @@ def polyfit(maxdeg, filename):
return (eq, params_error) return (eq, params_error)