Pass analysis program through to metamodels.

Author: riastradh-probcomp

src/bql.py

@@ -460,7 +460,8 @@ def execute_phrase(bdb, phrase, bindings=()):
             iterations=phrase.iterations,
             max_seconds=phrase.seconds,
             ckpt_iterations=phrase.ckpt_iterations,
-            ckpt_seconds=phrase.ckpt_seconds)
+            ckpt_seconds=phrase.ckpt_seconds,
+            program=phrase.program)
         return empty_cursor(bdb)
 
     if isinstance(phrase, ast.DropModels):

src/metamodel.py

@@ -151,7 +151,8 @@ def drop_models(self, bdb, generator_id, modelnos=None):
         raise NotImplementedError
 
     def analyze_models(self, bdb, generator_id, modelnos=None, iterations=1,
-            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None):
+            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None,
+            program=None):
         """Analyze the specified model numbers of a generator.
 
         If none are specified, analyze all of them.
@@ -163,6 +164,7 @@ def analyze_models(self, bdb, generator_id, modelnos=None, iterations=1,
             results of analysis to the database
         :param int ckpt_seconds: number of seconds before committing results of
             anlaysis to the database
+        :param object program: None, or list of tokens of analysis program
         """
         raise NotImplementedError
 

src/metamodels/cgpm_metamodel.py

@@ -246,12 +246,16 @@ def drop_models(self, bdb, generator_id, modelnos=None):
             del cache.engine[generator_id]
 
     def analyze_models(self, bdb, generator_id, modelnos=None, iterations=1,
-            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None):
+            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None,
+            program=None):
         assert modelnos is None
 
         if ckpt_iterations is not None or ckpt_seconds is not None:
             # XXX
             raise NotImplementedError('cgpm analysis checkpoint')
+        if program is not None:
+            # XXX
+            raise NotImplementedError('cgpm analysis programs')
 
         # Get the engine.
         engine = self._engine(bdb, generator_id)

src/metamodels/crosscat.py

@@ -864,7 +864,12 @@ def drop_models(self, bdb, generator_id, modelnos=None):
                     del cc_cache.thetas[generator_id]
 
     def analyze_models(self, bdb, generator_id, modelnos=None, iterations=1,
-            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None):
+            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None,
+            program=None):
+        if program is not None:
+            # XXX
+            raise NotImplementedError('crosscat analysis programs')
+
         # XXX What about a schema change or insert in the middle of
         # analysis?
         M_c = self._crosscat_metadata(bdb, generator_id)

src/metamodels/nig_normal.py

@@ -158,7 +158,12 @@ def drop_models(self, bdb, generator_id, modelnos=None):
                     bdb.sql_execute(delete_models_sql, (generator_id, modelno))
 
     def analyze_models(self, bdb, generator_id, modelnos=None, iterations=1,
-            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None):
+            max_seconds=None, ckpt_iterations=None, ckpt_seconds=None,
+            program=None):
+        if program is not None:
+            # XXX
+            raise NotImplementedError('nig_normal analysis programs')
+
         # Ignore analysis timing control, because one step reaches the
         # posterior anyway.
         # NOTE: Does not update the model iteration count.  This would