brozek/matmod
1
0
Fork 0
mirror of https://github.com/Brandon-Rozek/matmod.git synced 2024-12-12 08:03:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Reworked hack

Browse source
This commit is contained in:
Brandon Rozek 2024-10-15 10:28:16 -04:00
parent 46e570103f
commit a421e24544
No known key found for this signature in database
GPG key ID: 26E457DA82C9F480
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
parse_magic.py
View file

@ -58,14 +58,13 @@ def parse_matrices(infile: SourceFile) -> List[Tuple[Model, Dict]]:
def process_sizes(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]): def process_sizes(infile: SourceFile, header: UglyHeader, current_model_parts: ModelBuilder, solutions: List[Tuple[Model, Dict]]):
"""Stage 1""" """Stage 1"""
# NOTE: In R3-PN the first size line is -1? first_run = True
if header.necessitation:
next(infile)
while True: while True:
print("Processing next size") print("Processing next size")
try: try:
size = parse_size(infile) size = parse_size(infile, first_run)
first_run = False
except StopIteration: except StopIteration:
# For some reason, when necessitation is enabled this doesn't # For some reason, when necessitation is enabled this doesn't
# have a -1 on the last line # have a -1 on the last line
@ -219,11 +218,15 @@ def carrier_set_from_size(size: int):
mvalue_from_index(i) for i in range(size + 1) mvalue_from_index(i) for i in range(size + 1)
} }
def parse_size(infile: SourceFile) -> Optional[int]: def parse_size(infile: SourceFile, first_run: bool) -> Optional[int]:
""" """
Parse the line representing the matrix size. Parse the line representing the matrix size.
""" """
size = int(next(infile)) size = int(next(infile))
# HACK: The first size line may be -1 due to a bug. Skip it
if size == -1 and first_run:
size = int(next(infile))
if size == -1: if size == -1:
return None return None
assert size > 0, f"Unexpected size at line {infile.current_line}" assert size > 0, f"Unexpected size at line {infile.current_line}"