brozek/vspursuer
1
0
Fork 0
mirror of https://github.com/Brandon-Rozek/matmod.git synced 2025-12-19 05:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Draft] Changing OrderTable (Currently non-functional)

Browse source
This commit is contained in:
Brandon Rozek 2025-05-03 12:54:37 -04:00
parent 6f5074584b
commit fa9e5026ca
2 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
parse_magic.py
View file

@ -507,18 +507,23 @@ def parse_single_order(infile: SourceFile, size: int, carrier_list: List[ModelVa
dmapping = {}
for x, y in product(carrier_list, carrier_list):
cresult = determine_cresult(size, omapping, x, y)
cresult = ordering.meet(x, y)
if cresult is None:
print("[Warning] Conjunction and Disjunction are not well-defined")
print(f"{x} ∧ {y} = ??")
return None, None
else:
print(f"{x} ∧ {y} = {cresult}")
cmapping[(x, y)] = cresult
dresult = determine_dresult(size, omapping, x, y)
dresult = ordering.join(x, y)
# dresult = determine_dresult(size, omapping, x, y)
if dresult is None:
print("[Warning] Conjunction and Disjunction are not well-defined")
print(f"{x} ∨ {y} = ??")
return None, None
else:
print(f"{x} ∨ {y} = {dresult}")
dmapping[(x, y)] = dresult
mconjunction = ModelFunction(2, cmapping, "∧")