diff options
Diffstat (limited to 'food_delivery')
| -rwxr-xr-x | food_delivery/food-to-table.py | 6 | ||||
| -rwxr-xr-x | food_delivery/generate-food.py | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/food_delivery/food-to-table.py b/food_delivery/food-to-table.py index c66a774..4cb77c3 100755 --- a/food_delivery/food-to-table.py +++ b/food_delivery/food-to-table.py @@ -45,9 +45,9 @@ if False: for step, cells in enumerate(matrix): line = "%3d" % step for col, value in enumerate(cells): - if nextNodes.get(step + 1) == col: - #line += r" & \bf%2d" % value - line += r" & %4d." % value + if nextNodes.get(step) == col and col > 0: + line += r" &\bf%3d" % value + #line += r" & %4d." % value else: line += " & %5d" % value line += r" & %s \\" % "SABCD"[nextNodes[step]] diff --git a/food_delivery/generate-food.py b/food_delivery/generate-food.py index 192131b..ef9a00d 100755 --- a/food_delivery/generate-food.py +++ b/food_delivery/generate-food.py @@ -124,18 +124,17 @@ if is_b: literals += ["k0", "k1"] for k in range(1, m + 1): for j in range(1, m + 1): - if k >= j: + if j >= k: continue - jprev = j - 1 highers = " ".join([ - "(>= s{i}_{j} s{i}_{k})".format(i=i, j=j, k=k) - for i in range(1, len(states)) + "(<= s{i}_{j} s{i}_{k})".format(i=i, j=j, k=k) + for i in range(len(states)) ]) stuff += fillin([ - "(and {highers} (= l{j} l{k}) (= k0 {j}) (= k1 {k}))" + "(and (= k0 {j}) (= k1 {k}) (= l{j} l{k}) {highers})" ], vars()) - preds += ["(or %s)" % " ".join(stuff)] + preds += ["(or %s)" % "\n".join(stuff)] # Begin generator s = """(benchmark test.smt |