Merge 312e1aeda5 into 84e4d3d1e1

parse_magic.py

@@ -4,7 +4,6 @@ Parses the Magic Ugly Data File Format
 Assumes the base logic is R with no extra connectives
 """
 import argparse
-import re
 import sys
 from typing import TextIO, List, Optional, Tuple, Set, Dict
 
@@ -22,35 +21,11 @@ class SourceFile:
     def __init__(self, fileobj: TextIO):
         self.fileobj = fileobj
         self.current_line = 0
-        self.reststr = ""
-
-    def next_line(self):
-        if self.reststr != "":
-            reststr = self.reststr
-            self.reststr = ""
-            return reststr
-
-        contents = next(self.fileobj).strip()
-        self.current_line += 1
-        return contents
 
     def __next__(self):
-        """
+        contents = next(self.fileobj)
-        Grabs the next word token from the stream
+        self.current_line += 1
-        """
+        return contents
-        if self.reststr == "":
-            self.reststr = next(self.fileobj).strip()
-            self.current_line += 1
-
-        tokens = self.reststr.split(" ")
-        next_token = tokens[0]
-        self.reststr = " ".join(tokens[1:])
-
-        return next_token
-
-
-    def set_reststr(self, reststr: str):
-        self.reststr = reststr
 
 class UglyHeader:
     def __init__(self, negation: bool, necessitation: bool, custom_model_functions: List[Tuple[int, str]]):
@@ -62,287 +37,146 @@ class ModelBuilder:
     def __init__(self):
         self.size : int = 0
         self.carrier_set : Set[ModelValue] = set()
+        self.num_negation: int = 0
         self.mnegation: Optional[ModelFunction] = None
+        self.num_order: int = 0
         self.mconjunction: Optional[ModelFunction] = None
         self.mdisjunction: Optional[ModelFunction] = None
+        self.num_designated: int = 0
         self.designated_values: Set[ModelValue] = set()
+        self.num_implication: int = 0
         self.mimplication: Optional[ModelFunction] = None
+        self.num_necessitation: int = 0
         self.mnecessitation: Optional[ModelFunction] = None
-        self.custom_model_functions: Dict[str,  ModelFunction] = {}
-
-class Stage:
-    def __init__(self, name: str):
-        self.name = name
-        self.next: Optional['Stage'] = None
-        self.previous: Optional['Stage'] = None
-        self.num = 0
-
-    def increment(self):
-        self.num += 1
-
-    def reset(self):
-        self.num = 0
-
-    def __str__(self):
-        return self.name
-
-class Stages:
-    def __init__(self):
-        self.stages: Dict[str, Stage] = {}
-        self.last_added_stage: Optional[Stage] = None
-        self.first_stage: Optional[Stage] = None
-
-    def add(self, name: str):
-        stage = Stage(name)
-        stage.next = stage
-
-        if self.last_added_stage is not None:
-            stage.previous = self.last_added_stage
-            self.last_added_stage.next = stage
-        else:
-            # The previous of the first stage
-            # is the end
-            self.first_stage = stage
-            stage.previous = Stage("end")
-
-        self.stages[name] = stage
-        self.last_added_stage = stage
-
-    def next_stage(self, name):
-        return self.stages[name].next
-
-    def previous_stage(self, name):
-        return self.stages[name].previous
-
-    def reset_after(self, name):
-        stage = self.stages[name]
-        stage.reset()
-        if stage.next.name == "process_model":
-            return
-        next_stage = stage.next
-        while next_stage is not None:
-            next_stage.reset()
-            if next_stage.next.name == "process_model":
-                next_stage = None
-            else:
-                next_stage = next_stage.next
-
-    def get(self, name):
-        return self.stages[name]
-
-    def name(self):
-        result = ""
-        stage = self.first_stage
-        if stage is None:
-            return ""
-
-        result = f"{stage.num}"
-        if stage.next == "process_model":
-            return result
-
-        stage = stage.next
-        while stage is not None:
-            result += f".{stage.num}"
-            if stage.next.name != "process_model":
-                stage = stage.next
-            else:
-                stage = None
-
-        return result
-
-
-def derive_stages(header: UglyHeader) -> Stages:
-    stages = Stages()
-    stages.add("size")
-    if header.negation:
-        stages.add("negation")
-    stages.add("order")
-    stages.add("designated")
-    stages.add("implication")
-    if header.necessitation:
-        stages.add("necessitation")
-    for (adicity, symbol) in header.custom_model_functions:
-        stages.add(f"custom--{adicity}--{symbol}")
-    stages.add("process_model")
-
-    # After processing the model, go to the previous stage
-    stages.get("process_model").next = stages.get("process_model").previous
-
-    return stages
 
 def parse_matrices(infile: SourceFile) -> List[Tuple[Model, Dict]]:
     solutions = [] # Reset
     header = parse_header(infile)
-    stages = derive_stages(header)
-    first_run = True
     current_model_parts = ModelBuilder()
-    stage = stages.get("size")
+    process_sizes(infile, header, current_model_parts, solutions)
-    while True:
-        match stage.name:
-            case "end":
-                break
-            case "process_model":
-                process_model(stages.name(), current_model_parts, solutions)
-                stage = stage.next
-            case "size":
-                processed = process_sizes(infile, current_model_parts, first_run)
-                first_run = False
-                if processed:
-                    stage.num = current_model_parts.size + 1
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case "negation":
-                processed = process_negations(infile, current_model_parts)
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case "order":
-                processed = process_orders(infile, current_model_parts)
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case "designated":
-                processed = process_designateds(infile, current_model_parts)
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case "implication":
-                processed = process_implications(infile, current_model_parts)
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case "necessitation":
-                processed = process_necessitations(infile, current_model_parts)
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-            case _:
-                custom_stage = re.search(r"custom--(\d+)--(\S+)", stage.name)
-                if custom_stage is None or len(custom_stage.groups()) != 2:
-                    raise NotImplementedError(f"Unrecognized Stage: {stage.name}")
-                adicity, symbol = custom_stage.groups()
-                adicity = int(adicity)
-                processed = True
-                if adicity == 0:
-                    # We don't need to do anything here
-                    stage = stage.next
-                elif adicity == 1:
-                    processed = process_custom_monadic_connective(infile, symbol, current_model_parts)
-                elif adicity == 2:
-                    processed = process_custom_dyadic_connective(infile, symbol, current_model_parts)
-                else:
-                    raise NotImplementedError("Unable to process connectives of adicity greater than c2")
-
-                if processed:
-                    stage.increment()
-                    stage = stage.next
-                else:
-                    stages.reset_after(stage.name)
-                    stage = stage.previous
-
-
     return solutions
 
-def process_sizes(infile: SourceFile, current_model_parts: ModelBuilder, first_run: bool) -> bool:
+def process_sizes(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
-    try:
+    """Stage 1"""
-        size = parse_size(infile, first_run)
-    except StopIteration:
-        return False
-    if size is None:
-        return False
 
-    carrier_set = carrier_set_from_size(size)
+    first_run = True
-    current_model_parts.carrier_set = carrier_set
-    current_model_parts.size = size
 
-    return True
+    while True:
+        print("Processing next size")
+        try:
+            size = parse_size(infile, first_run)
+            first_run = False
+        except StopIteration:
+            # For some reason, when necessitation is enabled this doesn't
+            # have a -1 on the last line
+            break
+        if size is None:
+            break
 
-def process_negations(infile: SourceFile, current_model_parts: ModelBuilder) -> bool:
+        carrier_set = carrier_set_from_size(size)
+        current_model_parts.size = size
+        current_model_parts.carrier_set = carrier_set
+        process_negations(infile, header, current_model_parts, solutions)
+
+def process_negations(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
     """Stage 2 (Optional)"""
-    mnegation = parse_single_negation(infile, current_model_parts.size)
+    num_negation = 0
-    if mnegation is None:
+    while True:
-        return False
+        print("Processing next negation")
+        mnegation = None
+        if header.negation:
+            mnegation = parse_single_negation(infile, current_model_parts.size)
+            if mnegation is None:
+                break
+            num_negation += 1
 
-    current_model_parts.mnegation = mnegation
+        current_model_parts.num_negation = num_negation
-    return True
+        current_model_parts.mnegation = mnegation
 
-def process_orders(infile: SourceFile, current_model_parts: ModelBuilder) -> bool:
+        process_orders(infile, header, current_model_parts, solutions)
+
+        if not header.negation:
+            break
+
+def process_orders(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
     """Stage 3"""
-    result = parse_single_order(infile, current_model_parts.size)
+    num_order = 0
-    if result is None:
+    while True:
-        return False
+        print("Processing next order")
+        result = parse_single_order(infile, current_model_parts.size)
+        if result is None:
+            break
+        num_order += 1
+        mconjunction, mdisjunction = result
+        current_model_parts.num_order = num_order
+        current_model_parts.mconjunction = mconjunction
+        current_model_parts.mdisjunction = mdisjunction
+        process_designateds(infile, header, current_model_parts, solutions)
 
-    mconjunction, mdisjunction = result
+def process_designateds(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
-    current_model_parts.mconjunction = mconjunction
-    current_model_parts.mdisjunction = mdisjunction
-
-    return True
-
-def process_designateds(infile: SourceFile, current_model_parts: ModelBuilder) -> bool:
     """Stage 4"""
-    designated_values = parse_single_designated(infile, current_model_parts.size)
+    num_designated = 0
-    if designated_values is None:
+    while True:
-        return False
+        print("Processing next designated")
+        designated_values = parse_single_designated(infile, current_model_parts.size)
+        if designated_values is None:
+            break
+        num_designated += 1
+        current_model_parts.num_designated = num_designated
+        current_model_parts.designated_values = designated_values
+        process_implications(infile, header, current_model_parts, solutions)
 
-    current_model_parts.designated_values = designated_values
+def process_implications(
-    return True
+    infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
-
-def process_implications(infile: SourceFile, current_model_parts: ModelBuilder) -> bool:
     """Stage 5"""
-    mimplication = parse_single_implication(infile, current_model_parts.size)
+    if header.necessitation:
-    if mimplication is None:
+        num_implication = 0
-        return False
+        while True:
+            print("Processing next implication")
+            instr = next(infile).strip()
+            mimplication, reststr = parse_single_implication(instr, infile.current_line, current_model_parts.size)
+            if mimplication is None:
+                break
+            num_implication += 1
+            current_model_parts.num_implication = num_implication
+            current_model_parts.mimplication = mimplication
+            process_necessitations(infile, reststr, header, current_model_parts, solutions)
+    else:
+        results = parse_implications(infile, current_model_parts.size)
+        for num_implication, mimplication in enumerate(results, 1):
+            current_model_parts.num_implication = num_implication
+            current_model_parts.mimplication = mimplication
+            process_model(current_model_parts, solutions)
 
-    current_model_parts.mimplication = mimplication
+def process_necessitations(infile: SourceFile, instr: str, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
-    return True
 
-def process_necessitations(infile: SourceFile, current_model_parts: ModelBuilder) -> bool:
+    # NOTE: For some reason, one necessitation table will be on the same line as the implication table
-    mnecessitation = parse_single_necessitation(infile, current_model_parts.size)
+    mnecessitation = parse_single_necessitation_from_str(instr, infile.current_line, current_model_parts.size)
-    if mnecessitation is None:
+    assert mnecessitation is not None, f"Expected Necessitation Table at line {infile.current_line}"
-        return False
+    num_necessitation = 1
 
+    current_model_parts.num_necessitation = num_necessitation
     current_model_parts.mnecessitation = mnecessitation
-    return True
+    process_model(current_model_parts, solutions)
 
-def process_custom_monadic_connective(infile: SourceFile, symbol: str, current_model_parts: ModelBuilder) -> bool:
+    while True:
-    mfunction = parse_single_monadic_connective(infile, symbol, current_model_parts.size)
+        print("Processing next necessitation")
-    if mfunction is None:
+        mnecessitation = parse_single_necessitation(infile, current_model_parts.size)
-        return False
+        if mnecessitation is None:
+            break
+        num_necessitation += 1
 
-    current_model_parts.custom_model_functions[symbol] = mfunction
+        current_model_parts.num_necessitation = num_necessitation
-    return True
+        current_model_parts.mnecessitation = mnecessitation
+        process_model(current_model_parts, solutions)
 
-def process_custom_dyadic_connective(infile: SourceFile, symbol: str, current_model_parts: ModelBuilder) -> bool:
+def process_model(mp: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
-    mfunction = parse_single_dyadic_connective(infile, symbol, current_model_parts.size)
-    if mfunction is None:
-        return False
-
-    current_model_parts.custom_model_functions[symbol] = mfunction
-    return True
-
-def process_model(model_name: str, mp: ModelBuilder,  solutions: List[Tuple[Model, Dict]]):
     """Create Model"""
     assert mp.mimplication is not None
-    assert mp.size + 1 == len(mp.carrier_set)
+    assert len(mp.carrier_set) > 0
 
     logical_operations = { mp.mimplication }
+    model_name = f"{mp.size}{'.' + str(mp.num_negation) if mp.num_negation != 0 else ''}.{mp.num_order}.{mp.num_designated}.{mp.num_implication}{'.' + str(mp.num_necessitation) if mp.num_necessitation != 0 else ''}"
     model = Model(mp.carrier_set, logical_operations, mp.designated_values, name=model_name)
     interpretation = {
         Implication: mp.mimplication
@@ -360,12 +194,6 @@ def process_model(model_name: str, mp: ModelBuilder,  solutions: List[Tuple[Mode
         logical_operations.add(mp.mnecessitation)
         interpretation[Necessitation] = mp.mnecessitation
 
-    for custom_mf in mp.custom_model_functions.values():
-        if custom_mf is not None:
-            logical_operations.add(custom_mf)
-            # NOTE: No need to assign interpretation
-            # for VSP check
-
     solutions.append((model, interpretation))
     print(f"Parsed Matrix {model.name}")
 
@@ -373,7 +201,7 @@ def parse_header(infile: SourceFile) -> UglyHeader:
     """
     Parse the header line from the ugly data format.
     """
-    header_line = infile.next_line()
+    header_line = next(infile).strip()
     header_tokens = header_line.split(" ")
     assert header_tokens[0] in ["0", "1"]
     assert header_tokens[6] in ["0", "1"]
@@ -388,7 +216,7 @@ def parse_header(infile: SourceFile) -> UglyHeader:
         custom_model_functions.append((arity, symbol))
     return UglyHeader(negation_defined, necessitation_defined, custom_model_functions)
 
-def carrier_set_from_size(size: int) -> Set[ModelValue]:
+def carrier_set_from_size(size: int):
     """
     Construct a carrier set of model values
     based on the desired size.
@@ -402,12 +230,12 @@ def parse_size(infile: SourceFile, first_run: bool) -> Optional[int]:
     Parse the line representing the matrix size.
     """
 
-    size = int(infile.next_line())
+    size = int(next(infile))
     # HACK: When necessitation and custom connectives are enabled
     # MaGIC may produce -1s at the beginning of the file
     if first_run:
         while size == -1:
-            size = int(infile.next_line())
+            size = int(next(infile))
 
     if size == -1:
         return None
@@ -418,9 +246,23 @@ def parse_single_negation(infile: SourceFile, size: int) -> Optional[ModelFuncti
     """
     Parse the line representing the negation table.
     """
-    return parse_single_monadic_connective(infile, "¬", size)
+    line = next(infile).strip()
+    if line == '-1':
+        return None
 
-def mvalue_from_index(i: int) -> ModelValue:
+    row = line.split(" ")
+    assert len(row) == size + 1, f"Negation table doesn't match size at line {infile.current_line}"
+    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, "¬")
+
+
+def mvalue_from_index(i: int):
     """
     Given an index, return the
     representation of the model value.
@@ -485,7 +327,7 @@ def parse_single_order(infile: SourceFile, size: int) -> Optional[Tuple[ModelFun
     """
     Parse the line representing the ordering table
     """
-    line = infile.next_line()
+    line = next(infile).strip()
     if line == '-1':
         return None
 
@@ -536,7 +378,7 @@ def parse_single_designated(infile: SourceFile, size: int) -> Optional[Set[Model
     """
     Parse the line representing which model values are designated.
     """
-    line = infile.next_line()
+    line = next(infile).strip()
     if line == '-1':
         return None
 
@@ -552,49 +394,18 @@ def parse_single_designated(infile: SourceFile, size: int) -> Optional[Set[Model
 
     return designated_values
 
-def parse_single_implication(infile: SourceFile, size: int) -> Tuple[ModelFunction]:
+
+def parse_single_implication(instr: str, line: int, size: int) -> Tuple[ModelFunction, str]:
     """
-    Take the current string, parse an implication table from it.
+    Take the current string, parse an implication table from it,
+    and return along with it the remainder of the string
     """
-    return parse_single_dyadic_connective(infile, "→", size)
+    if instr == "-1":
+        return None, ""
 
-def parse_single_necessitation(infile: SourceFile, size: int) -> Optional[ModelFunction]:
+    table = instr.split(" ")
-    """
-    Parse the line representing the necessitation table.
-    """
-    return parse_single_monadic_connective(infile, "!", size)
 
-def parse_single_monadic_connective(infile: SourceFile, symbol: str, size: int) -> Optional[ModelFunction]:
+    assert len(table) >= (size + 1)**2, f"Implication table does not match expected size at line {line}"
-    line = infile.next_line()
-    if line == '-1':
-        return None
-
-    row = line.split(" ")
-    assert len(row) == size + 1, f"{symbol} table doesn't match size at line {infile.current_line}"
-    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, symbol)
-
-def parse_single_dyadic_connective(infile: SourceFile, symbol: str, size: int) -> Optional[ModelFunction]:
-    try:
-        first_token = next(infile)
-        if first_token == "-1":
-            return None
-    except StopIteration:
-        return None
-
-    table = []
-    try:
-        table = [first_token] + [next(infile) for _ in range((size + 1)**2 - 1)]
-    except StopIteration:
-        pass
-
-    assert len(table) == (size + 1)**2, f"{symbol} table does not match expected size at line {infile.current_line}"
 
     mapping = {}
     table_i = 0
@@ -608,7 +419,65 @@ def parse_single_dyadic_connective(infile: SourceFile, symbol: str, size: int) -
 
             mapping[(x, y)] = r
 
-    return ModelFunction(2, mapping, symbol)
+    mimplication = ModelFunction(2, mapping, "→")
+    reststr = " ".join(table[(size + 1)**2:])
+    return mimplication, reststr
+
+
+def parse_implications(infile: SourceFile, size: int) -> List[ModelFunction]:
+    """
+    Parse the line representing the list of implication
+    tables.
+    """
+    line = next(infile).strip()
+
+    # Split and remove the last '-1' character
+    table = line.split(" ")[:-1]
+
+    assert len(table) % (size + 1)**2 == 0, f"Implication table does not match expected size at line {infile.current_line}"
+
+    table_i = 0
+    mimplications: List[ModelFunction] = []
+
+    for _ in range(len(table) // (size + 1)**2):
+        mapping = {}
+
+        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, "→")
+        mimplications.append(mimplication)
+
+    return mimplications
+
+def parse_single_necessitation_from_str(instr: str, line: int, size: int) -> Optional[ModelFunction]:
+    """
+    Parse the line representing the necessitation table.
+    """
+    if instr == "-1":
+        return None
+
+    row = instr.split(" ")
+    assert len(row) == size + 1, f"Necessitation table doesn't match size at line {line}"
+    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, "!")
+
+def parse_single_necessitation(infile: SourceFile, size: int) -> Optional[ModelFunction]:
+    line = next(infile).strip()
+    return parse_single_necessitation_from_str(line, infile.current_line, size)
 
 
 if __name__ == "__main__":