mirror of
https://github.com/Brandon-Rozek/matmod.git
synced 2025-12-11 04:40:25 +00:00
Changed from model to matrix
This commit is contained in:
parent
2fbdf26274
commit
18c2bcb673
3 changed files with 5 additions and 5 deletions
2
model.py
2
model.py
|
|
@ -202,7 +202,7 @@ class Model:
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
result = ("=" * 25) + f"""
|
result = ("=" * 25) + f"""
|
||||||
Model Name: {self.name}
|
Matrix Name: {self.name}
|
||||||
Carrier Set: {set_to_str(self.carrier_set)}
|
Carrier Set: {set_to_str(self.carrier_set)}
|
||||||
Designated Values: {set_to_str(self.designated_values)}
|
Designated Values: {set_to_str(self.designated_values)}
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
4
vsp.py
4
vsp.py
|
|
@ -21,8 +21,8 @@ class VSP_Result:
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if not self.has_vsp:
|
if not self.has_vsp:
|
||||||
return f"Model {self.model_name} does not have the variable sharing property."
|
return f"Matrix {self.model_name} does not have the variable sharing property."
|
||||||
return f"""Model {self.model_name} has the variable sharing property.
|
return f"""Matrix {self.model_name} has the variable sharing property.
|
||||||
Subalgebra 1: {set_to_str(self.subalgebra1)}
|
Subalgebra 1: {set_to_str(self.subalgebra1)}
|
||||||
Subalgebra 2: {set_to_str(self.subalgebra2)}
|
Subalgebra 2: {set_to_str(self.subalgebra2)}
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ def multi_process_runner(num_cpu: int, data_file_path: str, skip_to: Optional[st
|
||||||
if vsp_result.has_vsp:
|
if vsp_result.has_vsp:
|
||||||
num_has_vsp += 1
|
num_has_vsp += 1
|
||||||
|
|
||||||
print_with_timestamp(f"Tested {num_tested} models, {num_has_vsp} of which satisfy VSP")
|
print_with_timestamp(f"Tested {num_tested} matrices, {num_has_vsp} of which satisfy VSP")
|
||||||
|
|
||||||
def single_process_runner(data_file_path: str, skip_to: Optional[str]):
|
def single_process_runner(data_file_path: str, skip_to: Optional[str]):
|
||||||
num_tested = 0
|
num_tested = 0
|
||||||
|
|
@ -189,7 +189,7 @@ def single_process_runner(data_file_path: str, skip_to: Optional[str]):
|
||||||
if vsp_result.has_vsp:
|
if vsp_result.has_vsp:
|
||||||
num_has_vsp += 1
|
num_has_vsp += 1
|
||||||
|
|
||||||
print_with_timestamp(f"Tested {num_tested} models, {num_has_vsp} of which satisfy VSP")
|
print_with_timestamp(f"Tested {num_tested} matrices, {num_has_vsp} of which satisfy VSP")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue