mirror of
https://github.com/Brandon-Rozek/matmod.git
synced 2025-12-19 05:10:25 +00: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():
|
||||
inputstr = "(" + ", ".join(str(ki) for ki in k) + ")"
|
||||
str_dict[inputstr] = str(v)
|
||||
return str(str_dict)
|
||||
return self.operation_name + " " + str(str_dict)
|
||||
|
||||
def __call__(self, *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:
|
||||
continue
|
||||
|
||||
invalid = False
|
||||
for (x2, y2) in product(carrier_set_left, carrier_set_right):
|
||||
if impfunction(x2, y2) in model.designated_values:
|
||||
continue
|
||||
invalid = True
|
||||
break
|
||||
|
||||
return True
|
||||
if not invalid:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue