mirror of
https://github.com/Brandon-Rozek/matmod.git
synced 2024-11-08 21:20:33 -05:00
Updates
- Fixed VSP check - Parse magic output files disregarding header row - TODO: Fix parsing multiple implication tables in a row
This commit is contained in:
parent
ff666c326e
commit
cf636eb7fd
2 changed files with 249 additions and 3 deletions
9
model.py
9
model.py
|
@ -59,7 +59,7 @@ class ModelFunction:
|
||||||
for k, v in self.mapping.items():
|
for k, v in self.mapping.items():
|
||||||
inputstr = "(" + ", ".join(str(ki) for ki in k) + ")"
|
inputstr = "(" + ", ".join(str(ki) for ki in k) + ")"
|
||||||
str_dict[inputstr] = str(v)
|
str_dict[inputstr] = str(v)
|
||||||
return str(str_dict)
|
return self.operation_name + " " + str(str_dict)
|
||||||
|
|
||||||
def __call__(self, *args):
|
def __call__(self, *args):
|
||||||
return self.mapping[args]
|
return self.mapping[args]
|
||||||
|
@ -247,11 +247,14 @@ def has_vsp(model: Model, interpretation: Dict[Operation, ModelFunction]) -> boo
|
||||||
if len(carrier_set_left & carrier_set_right) > 0:
|
if len(carrier_set_left & carrier_set_right) > 0:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
invalid = False
|
||||||
for (x2, y2) in product(carrier_set_left, carrier_set_right):
|
for (x2, y2) in product(carrier_set_left, carrier_set_right):
|
||||||
if impfunction(x2, y2) in model.designated_values:
|
if impfunction(x2, y2) in model.designated_values:
|
||||||
continue
|
invalid = True
|
||||||
|
break
|
||||||
|
|
||||||
return True
|
if not invalid:
|
||||||
|
return True
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
243
parse_magic.py
Normal file
243
parse_magic.py
Normal file
|
@ -0,0 +1,243 @@
|
||||||
|
"""
|
||||||
|
Parses the Magic Ugly Data File Format
|
||||||
|
|
||||||
|
Assumes the base logic is R with no extra connectives
|
||||||
|
"""
|
||||||
|
import sys
|
||||||
|
from typing import TextIO, List, Optional, Tuple, Set, Dict
|
||||||
|
|
||||||
|
from model import Model, ModelValue, ModelFunction
|
||||||
|
from logic import (
|
||||||
|
Implication,
|
||||||
|
Conjunction,
|
||||||
|
Negation,
|
||||||
|
Disjunction
|
||||||
|
)
|
||||||
|
|
||||||
|
def parse_matrices(infile: TextIO) -> List[Tuple[Model, Dict]]:
|
||||||
|
next(infile) # Skip header line
|
||||||
|
|
||||||
|
solutions: List[Tuple[Model, Dict]] = []
|
||||||
|
|
||||||
|
while True:
|
||||||
|
size = parse_size(infile)
|
||||||
|
if size is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
carrier_set = carrier_set_from_size(size)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
mnegation = parse_negation(infile, size)
|
||||||
|
if mnegation is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
while True:
|
||||||
|
result = parse_order(infile, size)
|
||||||
|
if result is None:
|
||||||
|
break
|
||||||
|
mconjunction, mdisjunction = result
|
||||||
|
|
||||||
|
while True:
|
||||||
|
designated_values = parse_designated(infile, size)
|
||||||
|
if designated_values is None:
|
||||||
|
break
|
||||||
|
|
||||||
|
while True:
|
||||||
|
result = parse_implication(infile, size)
|
||||||
|
if result is None:
|
||||||
|
break
|
||||||
|
mimplication, hasnext = result
|
||||||
|
|
||||||
|
logical_operations = {
|
||||||
|
mnegation, mconjunction, mdisjunction,
|
||||||
|
mimplication
|
||||||
|
}
|
||||||
|
model = Model(carrier_set, logical_operations, designated_values)
|
||||||
|
interpretation = {
|
||||||
|
Negation: mnegation,
|
||||||
|
Conjunction: mconjunction,
|
||||||
|
Disjunction: mdisjunction,
|
||||||
|
Implication: mimplication
|
||||||
|
}
|
||||||
|
solutions.append((model, interpretation))
|
||||||
|
print(f"Parsed {len(solutions)} so far")
|
||||||
|
|
||||||
|
if not hasnext:
|
||||||
|
break
|
||||||
|
return solutions
|
||||||
|
|
||||||
|
def carrier_set_from_size(size: int):
|
||||||
|
return {
|
||||||
|
mvalue_from_index(i) for i in range(size + 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
def parse_size(infile: TextIO) -> Optional[int]:
|
||||||
|
# Elements are represented in hexidecimal
|
||||||
|
size = int(next(infile), 16)
|
||||||
|
if size == -1:
|
||||||
|
return None
|
||||||
|
assert size > 0, "Unexpected size"
|
||||||
|
return size
|
||||||
|
|
||||||
|
def parse_negation(infile: TextIO, size: int) -> Optional[ModelFunction]:
|
||||||
|
line = next(infile).strip()
|
||||||
|
if line == '-1':
|
||||||
|
return None
|
||||||
|
|
||||||
|
row = line.split(" ")
|
||||||
|
assert len(row) == size + 1, "Negation table doesn't match size"
|
||||||
|
mapping = {}
|
||||||
|
|
||||||
|
for i, j in zip(range(size + 1), row):
|
||||||
|
x = mvalue_from_index(i)
|
||||||
|
y = parse_mvalue(j)
|
||||||
|
mapping[(x, )] = y
|
||||||
|
|
||||||
|
return ModelFunction(1, mapping, "Negation")
|
||||||
|
|
||||||
|
|
||||||
|
def mvalue_from_index(i: int):
|
||||||
|
return ModelValue(f"a{hex(i)[-1]}")
|
||||||
|
|
||||||
|
def parse_mvalue(x: str) -> ModelValue:
|
||||||
|
return mvalue_from_index(int(x, 16))
|
||||||
|
|
||||||
|
def determine_cresult(size: int, ordering: Dict[ModelValue, ModelValue], a: ModelValue, b: ModelValue) -> ModelValue:
|
||||||
|
for i in range(size + 1):
|
||||||
|
c = mvalue_from_index(i)
|
||||||
|
if not ordering[(c, a)]:
|
||||||
|
continue
|
||||||
|
if not ordering[(c, b)]:
|
||||||
|
continue
|
||||||
|
|
||||||
|
invalid = False
|
||||||
|
for j in range(size + 1):
|
||||||
|
d = mvalue_from_index(j)
|
||||||
|
if c == d:
|
||||||
|
continue
|
||||||
|
if ordering[(c, d)]:
|
||||||
|
if ordering[(d, a)] and ordering [(d, b)]:
|
||||||
|
invalid = True
|
||||||
|
|
||||||
|
if not invalid:
|
||||||
|
return c
|
||||||
|
|
||||||
|
print(a, "&", b, "is not defined")
|
||||||
|
|
||||||
|
def determine_dresult(size: int, ordering: Dict[ModelValue, ModelValue], a: ModelValue, b: ModelValue) -> ModelValue:
|
||||||
|
for i in range(size + 1):
|
||||||
|
c = mvalue_from_index(i)
|
||||||
|
if not ordering[(a, c)]:
|
||||||
|
continue
|
||||||
|
if not ordering[(b, c)]:
|
||||||
|
continue
|
||||||
|
|
||||||
|
invalid = False
|
||||||
|
|
||||||
|
for j in range(size + 1):
|
||||||
|
d = mvalue_from_index(j)
|
||||||
|
if d == c:
|
||||||
|
continue
|
||||||
|
if ordering[(d, c)]:
|
||||||
|
if ordering[(a, d)] and ordering[(b, d)]:
|
||||||
|
invalid = True
|
||||||
|
|
||||||
|
if not invalid:
|
||||||
|
return c
|
||||||
|
|
||||||
|
def parse_order(infile: TextIO, size: int) -> Optional[Tuple[ModelFunction, ModelFunction]]:
|
||||||
|
line = next(infile).strip()
|
||||||
|
if line == '-1':
|
||||||
|
return None
|
||||||
|
|
||||||
|
table = line.split(" ")
|
||||||
|
|
||||||
|
assert len(table) == (size + 1)**2
|
||||||
|
|
||||||
|
omapping = {}
|
||||||
|
table_i = 0
|
||||||
|
|
||||||
|
for i in range(size + 1):
|
||||||
|
x = mvalue_from_index(i)
|
||||||
|
for j in range(size + 1):
|
||||||
|
y = mvalue_from_index(j)
|
||||||
|
omapping[(x, y)] = table[table_i] == '1'
|
||||||
|
table_i += 1
|
||||||
|
|
||||||
|
cmapping = {}
|
||||||
|
dmapping = {}
|
||||||
|
|
||||||
|
|
||||||
|
for i in range(size + 1):
|
||||||
|
x = mvalue_from_index(i)
|
||||||
|
for j in range(size + 1):
|
||||||
|
y = mvalue_from_index(j)
|
||||||
|
|
||||||
|
cmapping[(x, y)] = determine_cresult(size, omapping, x, y)
|
||||||
|
dmapping[(x, y)] = determine_dresult(size, omapping, x, y)
|
||||||
|
|
||||||
|
|
||||||
|
mconjunction = ModelFunction(2, cmapping, "Conjunction")
|
||||||
|
mdisjunction = ModelFunction(2, dmapping, "Disjunction")
|
||||||
|
|
||||||
|
return mconjunction, mdisjunction
|
||||||
|
|
||||||
|
def parse_designated(infile: TextIO, size: int) -> Optional[Set[ModelValue]]:
|
||||||
|
line = next(infile).strip()
|
||||||
|
if line == '-1':
|
||||||
|
return None
|
||||||
|
|
||||||
|
row = line.split(" ")
|
||||||
|
assert len(row) == size + 1, "Designated table doesn't match size"
|
||||||
|
|
||||||
|
designated_values = set()
|
||||||
|
|
||||||
|
for i, j in zip(range(size + 1), row):
|
||||||
|
if j == '1':
|
||||||
|
x = mvalue_from_index(i)
|
||||||
|
designated_values.add(x)
|
||||||
|
|
||||||
|
return designated_values
|
||||||
|
|
||||||
|
|
||||||
|
def parse_implication(infile: TextIO, size: int) -> Optional[Tuple[ModelFunction, bool]]:
|
||||||
|
line = next(infile).strip()
|
||||||
|
if line == '-1':
|
||||||
|
return None
|
||||||
|
|
||||||
|
table = line.split(" ")
|
||||||
|
has_next = True
|
||||||
|
if table[-1] == '-1':
|
||||||
|
has_next = False
|
||||||
|
table = table[:-1]
|
||||||
|
|
||||||
|
assert len(table) == (size + 1)**2
|
||||||
|
|
||||||
|
mapping = {}
|
||||||
|
|
||||||
|
table_i = 0
|
||||||
|
|
||||||
|
for i in range(size + 1):
|
||||||
|
x = mvalue_from_index(i)
|
||||||
|
for j in range(size + 1):
|
||||||
|
y = mvalue_from_index(j)
|
||||||
|
|
||||||
|
r = parse_mvalue(table[table_i])
|
||||||
|
table_i += 1
|
||||||
|
|
||||||
|
mapping[(x, y)] = r
|
||||||
|
|
||||||
|
mimplication = ModelFunction(2, mapping, "Implication")
|
||||||
|
return mimplication, has_next
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
from model import has_vsp
|
||||||
|
|
||||||
|
solutions: List[Model] = parse_matrices(sys.stdin)
|
||||||
|
print(f"Parsed {len(solutions)} matrices")
|
||||||
|
for model, interpretation in solutions:
|
||||||
|
# print(model)
|
||||||
|
if has_vsp(model, interpretation):
|
||||||
|
print(model)
|
||||||
|
print("Has VSP")
|
Loading…
Reference in a new issue