projects
/
picoclvr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[picoclvr.git]
/
expr.py
diff --git
a/expr.py
b/expr.py
index
ca33daf
..
7b31b8c
100755
(executable)
--- a/
expr.py
+++ b/
expr.py
@@
-24,7
+24,7
@@
def random_expr(variables, budget):
else:
return str(torch.randint(10, (1,)).item())
else:
else:
return str(torch.randint(10, (1,)).item())
else:
- op = torch.randint(
4
, (1,)).item()
+ op = torch.randint(
3
, (1,)).item()
if op == 0:
e = random_expr(variables, budget - 2)
if ("+" in e or "-" in e or "*" in e) and (e[0] != "(" or e[-1] != ")"):
if op == 0:
e = random_expr(variables, budget - 2)
if ("+" in e or "-" in e or "*" in e) and (e[0] != "(" or e[-1] != ")"):
@@
-38,14
+38,13
@@
def random_expr(variables, budget):
if op == 1:
return e1 + "+" + e2
elif op == 2:
if op == 1:
return e1 + "+" + e2
elif op == 2:
- return e1 + "+" + e2
- elif op == 3:
return e1 + "*" + e2
def generate_program(nb_variables, length):
s = ""
variables = set()
return e1 + "*" + e2
def generate_program(nb_variables, length):
s = ""
variables = set()
+ length = min(length, 1+torch.randint(length*2, (1,)).item())
while len(s) < length:
v = random_var(nb_variables=nb_variables)
s += v + "=" + random_expr(variables, budget=20) + ";"
while len(s) < length:
v = random_var(nb_variables=nb_variables)
s += v + "=" + random_expr(variables, budget=20) + ";"
@@
-63,6
+62,7
@@
def extract_results(seq):
def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
+ assert nb_variables <= 26
sequences = []
for n in range(nb):
result = None
sequences = []
for n in range(nb):
result = None
@@
-78,7
+78,7
@@
def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
k = list(result.keys())
k.sort()
k = list(result.keys())
k.sort()
- sequences.append(p + " " + "
;".join([v + ":" + str(result[v])
for v in k]))
+ sequences.append(p + " " + "
".join([v + ":" + str(result[v]) + ";"
for v in k]))
return sequences
return sequences
@@
-87,7
+87,7
@@
if __name__ == "__main__":
import time
start_time = time.perf_counter()
import time
start_time = time.perf_counter()
- sequences = generate_sequences(1000)
+ sequences = generate_sequences(1000
, length=40
)
end_time = time.perf_counter()
for s in sequences[:10]:
print(s)
end_time = time.perf_counter()
for s in sequences[:10]:
print(s)