Teach ANALYZE to take an optional analysis program.

Author: riastradh-probcomp

src/ast.py

@@ -117,6 +117,7 @@
     'ckpt_iterations',
     'ckpt_seconds',
     'wait',
+    'program',
 ])
 DropModels = namedtuple('DropModels', [
     'generator',

src/grammar.y

@@ -113,7 +113,8 @@ command(init_models)	::= K_INITIALIZE L_INTEGER(n) K_MODEL|K_MODELS
 command(analyze_models)	::= K_ANALYZE generator_name(generator)
 				anmodelset_opt(models) anlimit(anlimit)
 				anckpt_opt(anckpt)
-				wait_opt(wait).
+				wait_opt(wait)
+				analysis_program_opt(program).
 command(drop_models)	::= K_DROP K_MODEL|K_MODELS modelset_opt(models)
 				K_FROM generator_name(generator).
 
@@ -148,6 +149,13 @@ anduration(seconds)	::= L_INTEGER(n) K_SECOND|K_SECONDS.
 wait_opt(none)		::= .
 wait_opt(some)		::= K_WAIT.
 
+analysis_program_opt(none)	::= .
+analysis_program_opt(some)	::= T_LROUND analysis_program(p) T_RROUND.
+analysis_program(empty)		::= .
+analysis_program(nonempty)	::= analysis_program(p) analysis_token(t).
+analysis_token(compound)	::= T_LROUND analysis_program(p) T_RROUND.
+analysis_token(primitive)	::= ANY(t).
+
 simulate(s)		::= K_SIMULATE simulate_columns(cols)
 				K_FROM population_name(population)
 				modelledby_opt(generator)

src/parse.py

@@ -218,7 +218,7 @@ def p_stattype_s(self, name):
     def p_command_init_models(self, n, ifnotexists, generator):
         return ast.InitModels(ifnotexists, generator, n)
     def p_command_analyze_models(self, generator, models, anlimit, anckpt,
-            wait):
+            wait, program):
         self._ensure_wizard_mode(generator)
         iterations = anlimit[1] if anlimit[0] == 'iterations' else None
         seconds = anlimit[1] if anlimit[0] == 'seconds' else None
@@ -228,7 +228,7 @@ def p_command_analyze_models(self, generator, models, anlimit, anckpt,
             ckpt_iterations = anckpt[1] if anckpt[0] == 'iterations' else None
             ckpt_seconds = anckpt[1] if anckpt[0] == 'seconds' else None
         return ast.AnalyzeModels(generator, models, iterations, seconds,
-            ckpt_iterations, ckpt_seconds, wait)
+            ckpt_iterations, ckpt_seconds, wait, program)
     def p_command_drop_models(self, models, generator):
         return ast.DropModels(generator, models)
 
@@ -259,6 +259,13 @@ def p_anduration_seconds(self, n):          return ('seconds', n)
     def p_wait_opt_none(self):                  return False
     def p_wait_opt_some(self):                  return True
 
+    def p_analysis_program_opt_none(self):      return None
+    def p_analysis_program_opt_some(self, p):   return p
+    def p_analysis_program_empty(self):         return []
+    def p_analysis_program_nonempty(self, p, t): p += t; return p
+    def p_analysis_token_compound(self, p):     return ['('] + p + [')']
+    def p_analysis_token_primitive(self, t):    return [t]
+
     def p_simulate_s(self, cols, population, generator, constraints, lim):
         return ast.Simulate(cols, population, generator, constraints,
             lim.limit)

tests/test_parse.py

@@ -547,37 +547,42 @@ def test_trivial_commands():
     assert parse_bql_string('initialize 2 models if not exists for t;') == \
         [ast.InitModels(True, 't', 2)]
     assert parse_bql_string('analyze t for 1 iteration;') == \
-        [ast.AnalyzeModels('t', None, 1, None, None, None, False)]
+        [ast.AnalyzeModels('t', None, 1, None, None, None, False, None)]
     assert parse_bql_string('analyze t for 1 iteration wait;') == \
-        [ast.AnalyzeModels('t', None, 1, None, None, None, True)]
+        [ast.AnalyzeModels('t', None, 1, None, None, None, True, None)]
     assert parse_bql_string('analyze t for 1 minute;') == \
-        [ast.AnalyzeModels('t', None, None, 60, None, None, False)]
+        [ast.AnalyzeModels('t', None, None, 60, None, None, False, None)]
     assert parse_bql_string('analyze t for 1 minute wait;') == \
-        [ast.AnalyzeModels('t', None, None, 60, None, None, True)]
+        [ast.AnalyzeModels('t', None, None, 60, None, None, True, None)]
     assert parse_bql_string('analyze t for 2 minutes;') == \
-        [ast.AnalyzeModels('t', None, None, 120, None, None, False)]
+        [ast.AnalyzeModels('t', None, None, 120, None, None, False, None)]
     assert parse_bql_string('analyze t for 2 minutes wait;') == \
-        [ast.AnalyzeModels('t', None, None, 120, None, None, True)]
+        [ast.AnalyzeModels('t', None, None, 120, None, None, True, None)]
     assert parse_bql_string('analyze t for 1 second;') == \
-        [ast.AnalyzeModels('t', None, None, 1, None, None, False)]
+        [ast.AnalyzeModels('t', None, None, 1, None, None, False, None)]
     assert parse_bql_string('analyze t for 1 second wait;') == \
-        [ast.AnalyzeModels('t', None, None, 1, None, None, True)]
+        [ast.AnalyzeModels('t', None, None, 1, None, None, True, None)]
     assert parse_bql_string('analyze t for 2 seconds;') == \
-        [ast.AnalyzeModels('t', None, None, 2, None, None, False)]
+        [ast.AnalyzeModels('t', None, None, 2, None, None, False, None)]
     assert parse_bql_string('analyze t for 2 seconds wait;') == \
-        [ast.AnalyzeModels('t', None, None, 2, None, None, True)]
+        [ast.AnalyzeModels('t', None, None, 2, None, None, True, None)]
     assert parse_bql_string('analyze t model 1 for 1 iteration;') == \
-        [ast.AnalyzeModels('t', [1], 1, None, None, None, False)]
+        [ast.AnalyzeModels('t', [1], 1, None, None, None, False, None)]
     assert parse_bql_string('analyze t models 1,2,3 for 1 iteration;') == \
-        [ast.AnalyzeModels('t', [1,2,3], 1, None, None, None, False)]
+        [ast.AnalyzeModels('t', [1,2,3], 1, None, None, None, False, None)]
     assert parse_bql_string('analyze t models 1-3,5 for 1 iteration;') == \
-        [ast.AnalyzeModels('t', [1,2,3,5], 1, None, None, None, False)]
+        [ast.AnalyzeModels('t', [1,2,3,5], 1, None, None, None, False, None)]
     assert parse_bql_string('analyze t for 10 iterations'
             ' checkpoint 3 iterations') == \
-        [ast.AnalyzeModels('t', None, 10, None, 3, None, False)]
+        [ast.AnalyzeModels('t', None, 10, None, 3, None, False, None)]
+    assert parse_bql_string('analyze t for 10 iterations wait'
+            ' (mh(default, one, 10))') == \
+        [ast.AnalyzeModels('t', None, 10, None, None, None, True, [
+            'mh', '(', 'default', ',', 'one', ',', 10, ')'
+        ])]
     assert parse_bql_string('analyze t for 10 seconds'
             ' checkpoint 3 seconds') == \
-        [ast.AnalyzeModels('t', None, None, 10, None, 3, False)]
+        [ast.AnalyzeModels('t', None, None, 10, None, 3, False, None)]
     assert parse_bql_string('create temporary table tx as'
             ' infer explicit x, predict x as xi confidence xc from t_cc') == \
         [ast.CreateTabAs(True, False, 'tx',