Browse Source

updated model properties to include mdLI and mdHI

Snej69420 9 months ago
parent
commit
5a9fd6eb27
1 changed files with 17 additions and 2 deletions
  1. 17 2
      devstone/model_properties.py

+ 17 - 2
devstone/model_properties.py

@@ -43,12 +43,22 @@ def dLI(width: int, depth: int) -> dict:
     properties["Connected"] = (width - 1) * (depth - 1)
     return properties
 
+def mdLI(width: int, depth: int) -> dict:
+    properties = dLI(width, depth)
+    properties["Atomic Models"] += depth
+    return properties
+
 def dHI(width: int, depth: int) -> dict:
     properties = HI(width, depth)
     properties["Created"] = (width - 1) * (depth - 1)
     properties["Connected"] = 2 * (width - 1) * (depth - 1)
     return properties
 
+def mdHI(width: int, depth: int) -> dict:
+    properties = dHI(width, depth)
+    properties["Atomic Models"] += depth
+    return properties
+
 def model_properties(model: str, width: int, depth: int) -> dict:
     match model:
         case "LI":
@@ -65,8 +75,12 @@ def model_properties(model: str, width: int, depth: int) -> dict:
             return {}
         case "dLI":
             return dLI(width, depth)
+        case "mdLI":
+            return mdLI(width, depth)
         case "dHI":
             return dHI(width, depth)
+        case "mdHI":
+            return mdHI(width, depth)
         case _:
             return {}
 
@@ -74,11 +88,12 @@ def display_model_properties(model: str, width: int, depth: int):
     properties = model_properties(model, width, depth)
     print(f"Model: {model}")
     for key, value in properties.items():
-        print(f"Number of {key}: {value}")
+        print(f"Number of {key}: {value:,}")
     print("="*50)
 
+
 if __name__ == "__main__":
     display_model_properties("LI", 100, 100)
     display_model_properties("HI", 100, 100)
     display_model_properties("HO", 100, 100)
-    display_model_properties("HOmod", 100, 100)
+    display_model_properties("HOmod", 30, 30)