Improve no-operand rule specification: automatically insert parentheses

Indeed, parenthesized no-operand rule specification can only be done via
the `verbatim` parameter.

Author: popescu-v

doc/samples/samples.rst

@@ -97,7 +97,7 @@ Samples
     third_dictionary.add_variable_from_spec(
         name="computed",
         type="Numerical",
-        rule=str(kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random()")))),
+        rule=str(kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random")))),
     )
 
     # Add the variables used in a multi-table context in the first dictionary.
@@ -650,7 +650,7 @@ Samples
     # Create fold indexing rule and set it on `fold_index_variable`
     fold_index_variable = dictionary.get_variable("FoldIndex")
     fold_index_variable.rule = str(
-        kh.Rule("Ceil", kh.Rule("Product", fold_number, kh.Rule("Random()"))),
+        kh.Rule("Ceil", kh.Rule("Product", fold_number, kh.Rule("Random"))),
     )
 
     # Add variables that indicate if the instance is in the train dataset:

khiops/core/dictionary.py

@@ -1756,9 +1756,9 @@ def write(self, writer):
             raise TypeError(type_error_message("writer", writer, KhiopsOutputWriter))
 
         # Write standard rule
-        rule_pattern = r"^[A-Z]([a-zA-Z]*)\(?.*\)?$"
-        rule_regex = re.compile(rule_pattern)
-        bytes_rule_regex = re.compile(bytes(rule_pattern, encoding="ascii"))
+        rule_name_pattern = r"^[A-Z]([a-zA-Z]*)$"
+        rule_name_regex = re.compile(rule_name_pattern)
+        bytes_rule_name_regex = re.compile(bytes(rule_name_pattern, encoding="ascii"))
         if self.operands:
             if self.is_reference:
                 writer.write("[")
@@ -1789,11 +1789,14 @@ def write(self, writer):
         # Write no-operand rule
         elif (
             isinstance(self.name, str)
-            and rule_regex.match(self.name)
+            and rule_name_regex.match(self.name)
             or isinstance(self.name, bytes)
-            and bytes_rule_regex.match(self.name)
+            and bytes_rule_name_regex.match(self.name)
         ):
-            writer.write(self.name)
+            writer.write(_format_name(self.name))
+
+            # Add parentheses automatically
+            writer.write("()")
         # Write verbatim-given rule
         elif self._verbatim:
             writer.write(self._verbatim)

khiops/samples/samples.ipynb

@@ -109,7 +109,7 @@
     "third_dictionary.add_variable_from_spec(\n",
     "    name=\"computed\",\n",
     "    type=\"Numerical\",\n",
-    "    rule=str(kh.Rule(\"Ceil\", kh.Rule(\"Product\", 3, kh.Rule(\"Random()\")))),\n",
+    "    rule=str(kh.Rule(\"Ceil\", kh.Rule(\"Product\", 3, kh.Rule(\"Random\")))),\n",
     ")\n",
     "\n",
     "# Add the variables used in a multi-table context in the first dictionary.\n",
@@ -870,7 +870,7 @@
     "# Create fold indexing rule and set it on `fold_index_variable`\n",
     "fold_index_variable = dictionary.get_variable(\"FoldIndex\")\n",
     "fold_index_variable.rule = str(\n",
-    "    kh.Rule(\"Ceil\", kh.Rule(\"Product\", fold_number, kh.Rule(\"Random()\"))),\n",
+    "    kh.Rule(\"Ceil\", kh.Rule(\"Product\", fold_number, kh.Rule(\"Random\"))),\n",
     ")\n",
     "\n",
     "# Add variables that indicate if the instance is in the train dataset:\n",

khiops/samples/samples.py

@@ -111,7 +111,7 @@ def create_dictionary_domain():
     third_dictionary.add_variable_from_spec(
         name="computed",
         type="Numerical",
-        rule=str(kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random()")))),
+        rule=str(kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random")))),
     )
 
     # Add the variables used in a multi-table context in the first dictionary.
@@ -725,7 +725,7 @@ def train_predictor_with_cross_validation():
     # Create fold indexing rule and set it on `fold_index_variable`
     fold_index_variable = dictionary.get_variable("FoldIndex")
     fold_index_variable.rule = str(
-        kh.Rule("Ceil", kh.Rule("Product", fold_number, kh.Rule("Random()"))),
+        kh.Rule("Ceil", kh.Rule("Product", fold_number, kh.Rule("Random"))),
     )
 
     # Add variables that indicate if the instance is in the train dataset:

tests/test_core.py

@@ -1904,9 +1904,7 @@ def test_dictionary_accessors(self):
                     name="fresh_one",
                     type="Categorical",
                     meta_data={"a": 1, "b": 2},
-                    rule=str(
-                        kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random()")))
-                    ),
+                    rule=str(kh.Rule("Ceil", kh.Rule("Product", 3, kh.Rule("Random")))),
                 )
                 self.assertEqual(
                     2,
@@ -2020,7 +2018,7 @@ def test_dictionary_accessors(self):
                         "SomeRuleForVariable" + variable_index * "i",
                         "an_operand",
                         2,
-                        kh.Rule("SomeEmbeddedRule()"),
+                        kh.Rule("SomeEmbeddedRule"),
                     )
                     dictionary_copy.get_variable(variable_name).rule = str(some_rule)
                     self.assertEqual(
@@ -2062,7 +2060,7 @@ def test_dictionary_accessors(self):
                         "SomeRuleForVariableBlock" + variable_block_index * "i",
                         "an_operand",
                         2,
-                        kh.Rule("SomeEmbeddedRule()"),
+                        kh.Rule("SomeEmbeddedRule"),
                     )
                     dictionary_copy.get_variable_block(variable_block_name).rule = str(
                         some_rule
@@ -2083,8 +2081,8 @@ def test_dictionary_accessors(self):
     def test_dictionary_rule_construction(self):
         """Tests the Rule construction and serialization"""
         rule_verbatims = [
-            "SomeRule",
-            b"SomeRule",
+            "SomeRule()",
+            b"SomeRule()",
             'SomeRule("some_operand", 2)',
             b'SomeRule("some_operand", 2)',
             'SomeRule("some""operand", 2)',
@@ -2260,7 +2258,7 @@ def test_dictionary_rule_construction(self):
                     kh.Rule(b"SomeEmbeddedRule", b"some_other_operand"),
                 ),
                 kh.Rule(
-                    (
+                    verbatim=(
                         b'SomeRule("some_operand", 2, '
                         b'SomeEmbeddedRule("some_other_operand"))'
                     )