Add files via upload

This commit is contained in:
Silviu Marian Udrescu 2020-05-10 20:29:00 -04:00 committed by GitHub
parent fe5b8025a2
commit 735e1d43ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View file

@ -18,7 +18,7 @@ from sympy.abc import x,y
from sympy.parsing.sympy_parser import parse_expr
from sympy import Symbol, lambdify, N
from S_get_number_DL import get_number_DL
from S_get_number_DL_snapped import get_number_DL_snapped
# parameters: path to data, RPN expression (obtained from bf)
def RPN_to_pytorch(data_file, math_expr, lr = 1e-2, N_epochs = 500):
@ -117,7 +117,7 @@ def RPN_to_pytorch(data_file, math_expr, lr = 1e-2, N_epochs = 500):
ii = ii + 1
else:
eq = eq.subs(parm, trainable_parameters[ii])
complexity = complexity + get_number_DL(trainable_parameters[ii].detach().numpy())
complexity = complexity + get_number_DL_snapped(trainable_parameters[ii].detach().numpy())
n_variables = len(eq.free_symbols)
n_operations = len(count_ops(eq,visual=True).free_symbols)
if n_operations!=0 or n_variables!=0:

View file

@ -18,7 +18,7 @@ from sympy.abc import x,y
from sympy.parsing.sympy_parser import parse_expr
from sympy import Symbol, lambdify, N
from S_get_number_DL import get_number_DL
from S_get_number_DL_snapped import get_number_DL_snapped
# parameters: path to data, RPN expression (obtained from bf)
def final_gd(data_file, math_expr, lr = 1e-2, N_epochs = 5000):
@ -133,7 +133,7 @@ def final_gd(data_file, math_expr, lr = 1e-2, N_epochs = 5000):
ii = ii + 1
else:
eq = eq.subs(parm, trainable_parameters[ii])
complexity = complexity + get_number_DL(trainable_parameters[ii].detach().numpy())
complexity = complexity + get_number_DL_snapped(trainable_parameters[ii].detach().numpy())
n_variables = len(eq.free_symbols)
n_operations = len(count_ops(eq,visual=True).free_symbols)
if n_operations!=0 or n_variables!=0:

View file

@ -7,7 +7,7 @@ import numpy as np
import matplotlib.pyplot as plt
from S_brute_force import brute_force
from S_combine_pareto import combine_pareto
from S_get_number_DL import get_number_DL
from S_get_number_DL_snapped import get_number_DL_snapped
from sympy.parsing.sympy_parser import parse_expr
from sympy import preorder_traversal, count_ops
from S_polyfit import polyfit
@ -72,7 +72,7 @@ def run_bf_polyfit(pathdir,pathdir_transformed,filename,BF_try_time,BF_ops_file_
compl = 0
for j in numbers_expr:
try:
compl = compl + get_number_DL(float(j))
compl = compl + get_number_DL_snapped(float(j))
except:
compl = compl + 1000000
@ -150,7 +150,7 @@ def run_bf_polyfit(pathdir,pathdir_transformed,filename,BF_try_time,BF_ops_file_
compl = 0
for j in numbers_expr:
try:
compl = compl + get_number_DL(float(j))
compl = compl + get_number_DL_snapped(float(j))
except:
compl = compl + 1000000
@ -215,7 +215,7 @@ def run_bf_polyfit(pathdir,pathdir_transformed,filename,BF_try_time,BF_ops_file_
numbers_expr = [subexpression for subexpression in preorder_traversal(expr) if is_atomic_number(subexpression)]
complexity = 0
for j in numbers_expr:
complexity = complexity + get_number_DL(float(j))
complexity = complexity + get_number_DL_snapped(float(j))
try:
# Add the complexity due to symbols
n_variables = len(polyfit_result[0].free_symbols)