Explorar el Código

schema solve cleanup prints

Joseph Brandenburg hace 5 meses
padre
commit
6b942bedc6
Se han modificado 2 ficheros con 4 adiciones y 5 borrados
  1. 0 5
      readtree.py
  2. 4 0
      schema_solve.py

+ 0 - 5
readtree.py

@@ -201,10 +201,6 @@ def solve_schema_to_tree(nc, all_nc, roots=[], error_popups=False):
     from .utilities import get_node_prototype
     np = get_node_prototype(nc.signature, nc.base_tree)
     from .schema_solve import SchemaSolver
-    tree = np.node_tree
-    length = nc.evaluate_input("Schema Length")
-    prOrange(f"Expanding schema {tree.name} in node {nc} with length {length}.")
-
     solver = SchemaSolver(nc, all_nc, np, error_popups=error_popups)
     try:
         solved_nodes = solver.solve()
@@ -213,7 +209,6 @@ def solve_schema_to_tree(nc, all_nc, roots=[], error_popups=False):
         solved_nodes = {}
         nc.base_tree.hash=''
         raise execution_error_cleanup(nc, e, show_error=error_popups)
-    prWhite(f"Schema declared {len(solved_nodes)} nodes.")
 
     # maybe this should be done in schema solver. TODO invesitigate a more efficient way
     del_me = []

+ 4 - 0
schema_solve.py

@@ -49,6 +49,9 @@ class SchemaSolver:
         self.solve_length = self.node.evaluate_input("Schema Length")
         # I'm making this a property of the solver because the solver's data is modified as it solves each iteration
         self.index = 0
+        
+        prOrange(f"\nExpanding schema {self.tree.name} in node {self.node.signature}"
+                 f" with length {self.solve_length}.")
 
         self.init_schema_links()
         self.set_index_strings()
@@ -783,5 +786,6 @@ class SchemaSolver:
         self.finalize(frame_mantis_nodes)
         self.node.solver = self
         self.node.prepared = True
+        prWhite(f"Schema declared {len(self.solved_nodes)} nodes.\n")
         return self.solved_nodes