[natural_translit] Refactored nodes_str() and states_str() of Lattice…

…. Added test for Feature.__str__.

PiperOrigin-RevId: 723139492

nisaba/scripts/natural_translit/utils/feature.py

@@ -756,18 +756,13 @@ def table_contents(self) -> list[list[str]]:
 
     def get(self, aspect: 'Feature.Aspect') -> 'Feature.Set':
       """Gets the value set for the given aspect."""
+      if aspect.inventory == self.inventory:
+        inventory_alias = 'missing'
+      else:
+        inventory_alias = aspect.inventory.alias
       return super().get(
           aspect.alias,
-          Feature.Set(
-              aspect.n_a,
-              alias='%s_%s'
-              % (
-                  'missing'
-                  if aspect.inventory == self.inventory
-                  else aspect.inventory.alias,
-                  aspect.alias,
-              ),
-          ),
+          Feature.Set(aspect.n_a, alias=f'{inventory_alias}_{aspect.alias}'),
       )
 
     def copy(self, alias: str) -> 'Feature.Profile':

nisaba/scripts/natural_translit/utils/feature_test.py

@@ -158,6 +158,19 @@ class FeatureTest(test_op.TestCase):
   def test_feature_text(self):
     self.assertEqual(_R.warmth.vcold.text, 'very_cold')
 
+  def test_feature_str(self):
+    self.AssertStrEqual(
+        _R.warmth.vcold,
+        '  vcold (very_cold) = {\n'
+        '        cold (cold): 0.50\n'
+        '        chl (chilly): 1.00\n'
+        '        tpd (tepid): 1.50\n'
+        '        warm (warm): 2.00\n'
+        '        hot (hot): 2.50\n'
+        '        vhot (very_hot): 3.00\n'
+        '  }\n'
+    )
+
   def test_aspect_of_feature(self):
     self.assertEqual(_R.warmth.warm.aspect, _R.warmth)
 

nisaba/scripts/natural_translit/utils/lattice.py

@@ -104,20 +104,33 @@ def __init__(
   def __str__(self):
     return self.text
 
+  def _str_nodes(self, state_str: bool) -> str:
+    """Returns a string representation of the nodes or states in the lattice.
+
+    Args:
+      state_str: If True, nodes are represented as the int value in the FST they
+      belong to. If the node has no state, it's represented as ∅. If False,
+      nodes are represented as the alias of the lattice they belong to and their
+      coordinates on the lattice.
+
+    Returns:
+      A string representation of the nodes in the lattice.
+    """
+    return '\n'.join([
+        '\t'.join(
+            [node.state_str() if state_str else node.text for node in row]
+        )
+        for row in self._nodes
+    ])
+
   def nodes_str(self) -> str:
-    return 'Lattice: %s\nNodes:\n%s\n' % (
-        self.alias,
-        '\n'.join(
-            ['\t'.join([node.text for node in row]) for row in self._nodes]
-        ),
+    return (
+        f'Lattice: {self.alias}\nNodes:\n{self._str_nodes(state_str=False)}\n'
     )
 
   def states_str(self) -> str:
-    return 'Lattice: %s\nStates:\n%s\n' % (
-        self.alias,
-        '\n'.join([
-            '\t'.join([node.state_str() for node in row]) for row in self._nodes
-        ]),
+    return (
+        f'Lattice: {self.alias}\nStates:\n{self._str_nodes(state_str=True)}\n'
     )
 
   def _new_node(self, x: int, y: int, populate: bool = False) -> Node: