compiled-knowledge 4.0.0a12__cp312-cp312-win_amd64.whl → 4.0.0a15__cp312-cp312-win_amd64.whl

ck/circuit_compiler/named_circuit_compilers.py

@@ -18,19 +18,19 @@ class NamedCircuitCompiler(Enum):
     Each member itself is callable, conforming to the CircuitCompiler protocol, delegating to the compiler function.
     """
 
-    LLVM_STACK: CircuitCompiler = (partial(llvm_compiler.compile_circuit, flavour=Flavour.STACK),)
-    LLVM_TMPS: CircuitCompiler = (partial(llvm_compiler.compile_circuit, flavour=Flavour.TMPS, opt=0),)
-    LLVM_VM: CircuitCompiler = (llvm_vm_compiler.compile_circuit,)
-    CYTHON_VM: CircuitCompiler = (cython_vm_compiler.compile_circuit,)
-    INTERPRET: CircuitCompiler = (interpret_compiler.compile_circuit,)
+    LLVM_STACK = (partial(llvm_compiler.compile_circuit, flavour=Flavour.STACK),)
+    LLVM_TMPS = (partial(llvm_compiler.compile_circuit, flavour=Flavour.TMPS, opt=0),)
+    LLVM_VM = (llvm_vm_compiler.compile_circuit,)
+    CYTHON_VM = (cython_vm_compiler.compile_circuit,)
+    INTERPRET = (interpret_compiler.compile_circuit,)
 
-    # The following circuit compilers were experimental but are not really useful
+    # The following circuit compilers were experimental but are not really useful.
     #
     # Slow compile and execution:
-    # LLVM_FUNCS: CircuitCompiler = (partial(llvm_compiler.compile_circuit, flavour=Flavour.FUNCS, opt=0),)
+    # LLVM_FUNCS = (partial(llvm_compiler.compile_circuit, flavour=Flavour.FUNCS, opt=0),)
     #
     # Slow compile and same execution as LLVM_VM:
-    # LLVM_VM_COMPILED_ARRAYS: CircuitCompiler = (partial(llvm_vm_compiler.compile_circuit, compile_arrays=True),)
+    # LLVM_VM_COMPILED_ARRAYS = (partial(llvm_vm_compiler.compile_circuit, compile_arrays=True),)
 
     def __call__(
             self,

ck/example/pathfinder.py

@@ -2,25 +2,33 @@ from ck.pgm import PGM
 
 
 class Pathfinder(PGM):
+    """
+    This implementation of the Pathfinder PGM has 93 states for the "Fault" random
+    variable, and its factor has been normalised to be a CPT.
+    """
 
     def __init__(self):
         super().__init__(self.__class__.__name__)
 
         pgm_rv0 = self.new_rv('Fault', (
-        'AIDS early', 'AILD', 'ALIP', 'Cat scratch disease', 'Dermatopathic laden', 'Florid follic hyperp',
-        'GLH hyaline vascular', 'GLH plasma cell', 'Granulomatous laden', 'Histiocytosis x', 'Infectious mono',
-        'Leprosy-lepromatous', 'Lymphangiographic', 'Mantle zone hyperpla', 'Necrotizing Kikuchi',
-        'Necrotiz non-Kikuchi', 'Rheumatoid arthritis', 'Sarcoidosis', 'SHML', 'Sinus histiocytosis', 'Syphilis',
-        'Toxoplasmosis', 'Tuberculosis', 'Viral NOS', "Whipple's disease", 'L&H nodular HD', 'L&H diffuse HD',
-        'Nodular sclerosis HD', 'Cellular phase NSHD', 'Syncytial NSHD', 'Mixed cellularity HD', 'Interfollicular HD',
-        'Diffuse fibrosis HD', 'Reticular-type HD', 'Small cleaved fol', 'Mixed fol', 'Large cell fol',
-        'Small noncleaved fol', 'Small lymphocytic', 'Plasmacytoid lyctic', 'Mantle zone lymphoma', 'Small cleaved dif',
-        'Mixed FCC dif', 'Large cell dif', 'B-immunoblastic', 'T-immunob mixed', 'AILD-like T-cell lym', 'Japanese ATL',
-        'Lymphoblastic', 'Small noncleaved dif', 'True histiocytic', 'Ki-1 LC anaplas T', 'Multiple myeloma',
-        'Mycosis fungoides', 'AML', 'Hairy cell leukemia', 'Carcinoma', 'Melanoma', 'EM plasmacytoma',
-        "Kaposi's sarcoma", 'Mast-cell disease', 'AIDS involutionary', 'T-immunob large', 'Monocytoid B-cell',
-        'Nasopharyngeal CA', 'Seminoma', 'SLE', 'Mycobact histiocytos', 'Mast-cell hyperplas', 'LGV', 'Histoplasmosis',
-        'Coccidioidomycosis', 'CMV', 'Brucellosis', 'Ki-1 LC anaplas B', 'Intermed lymphocytic'))
+            'AIDS early', 'AILD', 'ALIP', 'Cat scratch disease', 'Dermatopathic laden', 'Florid follic hyperp',
+            'GLH hyaline vascular', 'GLH plasma cell', 'Granulomatous laden', 'Histiocytosis x', 'Infectious mono',
+            'Leprosy-lepromatous', 'Lymphangiographic', 'Mantle zone hyperpla', 'Necrotizing Kikuchi',
+            'Necrotiz non-Kikuchi', 'Rheumatoid arthritis', 'Sarcoidosis', 'SHML', 'Sinus histiocytosis', 'Syphilis',
+            'Toxoplasmosis', 'Tuberculosis', 'Viral NOS', "Whipple's disease", 'L&H nodular HD', 'L&H diffuse HD',
+            'Nodular sclerosis HD', 'Cellular phase NSHD', 'Syncytial NSHD', 'Mixed cellularity HD',
+            'Interfollicular HD',
+            'Diffuse fibrosis HD', 'Reticular-type HD', 'Small cleaved fol', 'Mixed fol', 'Large cell fol',
+            'Small noncleaved fol', 'Small lymphocytic', 'Plasmacytoid lyctic', 'Mantle zone lymphoma',
+            'Small cleaved dif',
+            'Mixed FCC dif', 'Large cell dif', 'B-immunoblastic', 'T-immunob mixed', 'AILD-like T-cell lym',
+            'Japanese ATL',
+            'Lymphoblastic', 'Small noncleaved dif', 'True histiocytic', 'Ki-1 LC anaplas T', 'Multiple myeloma',
+            'Mycosis fungoides', 'AML', 'Hairy cell leukemia', 'Carcinoma', 'Melanoma', 'EM plasmacytoma',
+            "Kaposi's sarcoma", 'Mast-cell disease', 'AIDS involutionary', 'T-immunob large', 'Monocytoid B-cell',
+            'Nasopharyngeal CA', 'Seminoma', 'SLE', 'Mycobact histiocytos', 'Mast-cell hyperplas', 'LGV',
+            'Histoplasmosis',
+            'Coccidioidomycosis', 'CMV', 'Brucellosis', 'Ki-1 LC anaplas B', 'Intermed lymphocytic'))
         pgm_rv1 = self.new_rv('ACID', ('Negative', 'Positive'))
         pgm_rv2 = self.new_rv('F_CSA', ('No follicles', 'Absent', 'Present'))
         pgm_rv3 = self.new_rv('F_ISL', ('No follicles', 'Absent', 'Present'))
@@ -58,25 +66,27 @@ class Pathfinder(PGM):
                                ('Absent [0]', 'Rare [1-5]', 'Few [6-25]', 'Many [26-100]', 'Striking [>100]'))
         pgm_rv34 = self.new_rv('LH_NOD', ('Absent', 'Present'))
         pgm_rv35 = self.new_rv('LACUN', (
-        'Absent [0]', 'Rare [1-5]', 'Few [6-25]', 'Many [26 - 100]', 'Striking [>100]', 'Sheets [>50pc of section]'))
+            'Absent [0]', 'Rare [1-5]', 'Few [6-25]', 'Many [26 - 100]', 'Striking [>100]',
+            'Sheets [>50pc of section]'))
         pgm_rv36 = self.new_rv('LANG', ('Absent [0]', 'Present [1-5]', 'Prominent [>5]'))
         pgm_rv37 = self.new_rv('LEUK', ('Absent', 'Present'))
         pgm_rv38 = self.new_rv('LLC_CY', ('No LLCs', 'Scanty', 'Moderate-abundant clear', 'Moderate-abundant deep'))
         pgm_rv39 = self.new_rv('LLC_NS', (
-        'No LLCs', 'Multilobated [some]', 'Cerebriform/Mulberry [some]', 'Convoluted [some]', 'Irregular [most]',
-        'Round/slightly irregular [most]'))
+            'No LLCs', 'Multilobated [some]', 'Cerebriform/Mulberry [some]', 'Convoluted [some]', 'Irregular [most]',
+            'Round/slightly irregular [most]'))
         pgm_rv40 = self.new_rv('LLC', (
-        'Absent [0pc]', 'Sparse [<10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
+            'Absent [0pc]', 'Sparse [<10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
         pgm_rv41 = self.new_rv('F_POPU', (
-        'No follicles', '>80pc 6-12u', '>50pc 13-20u with nucleoli', '>50pc >20u with nucleoli', 'Other'))
+            'No follicles', '>80pc 6-12u', '>50pc 13-20u with nucleoli', '>50pc >20u with nucleoli', 'Other'))
         pgm_rv42 = self.new_rv('MAST', ('Absent [0]', 'Present [1-50]', 'Prominent [>50]'))
         pgm_rv43 = self.new_rv('MLC', (
-        'Absent [0pc]', 'Sparse [<10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
+            'Absent [0pc]', 'Sparse [<10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
         pgm_rv44 = self.new_rv('MELANOMA', ('Absent', 'Present'))
         pgm_rv45 = self.new_rv('MF10HP', ('0-5', '6-15', '16-50', '>50'))
         pgm_rv46 = self.new_rv('MLC_CY', ('No MLCs', 'Scanty', 'Moderate-abundant clear', 'Moderate-abundant deep'))
         pgm_rv47 = self.new_rv('MLC_NS', (
-        'No MLCs', 'Cerebriform [some]', 'Convoluted [some]', 'Irregular [most]', 'Round/slightly irregular [most]'))
+            'No MLCs', 'Cerebriform [some]', 'Convoluted [some]', 'Irregular [most]',
+            'Round/slightly irregular [most]'))
         pgm_rv48 = self.new_rv('MLC_NI', ('No MLCs', 'Absent to rare', 'Large central', 'Peripheral', 'Other'))
         pgm_rv49 = self.new_rv('MCC', ('Absent [0pc]', 'Present [<5pc]', 'Prominent [5-50pc]', 'Confluence [>50pc]'))
         pgm_rv50 = self.new_rv('MONO', ('Absent [0]', 'Rare [1-2]', 'Present [3-20]', 'Many [>20]'))
@@ -90,7 +100,8 @@ class Pathfinder(PGM):
         pgm_rv57 = self.new_rv('PAS', ('No', 'Yes'))
         pgm_rv58 = self.new_rv('PI', ('Absent', 'Present', 'Prominent'))
         pgm_rv59 = self.new_rv('PLASMA', (
-        'Absent [0pc]', 'Few [<5pc]', 'Moderate [6-20pc]', 'Marked [21-50pc]', 'Striking [51-90pc]', 'Sheets [>90pc]'))
+            'Absent [0pc]', 'Few [<5pc]', 'Moderate [6-20pc]', 'Marked [21-50pc]', 'Striking [51-90pc]',
+            'Sheets [>90pc]'))
         pgm_rv60 = self.new_rv('PC_TP', ('No plasma cells', 'Mature', 'Immature', 'Blastic', 'Pleomorphic', 'Mixed'))
         pgm_rv61 = self.new_rv('PLEO', ('Absent [0]', 'Rare [1-5]', 'Few [6-25]', 'Many [26-100]', 'Striking [>100]'))
         pgm_rv62 = self.new_rv('PFP', ('Absent', 'Present'))
@@ -101,10 +112,10 @@ class Pathfinder(PGM):
         pgm_rv67 = self.new_rv('S_RING', ('Absent', 'Present'))
         pgm_rv68 = self.new_rv('SLC_CY', ('No SLCs', 'Scanty', 'Moderate-abundant clear', 'Moderate-abundant deep'))
         pgm_rv69 = self.new_rv('SLC_NS', (
-        'No SLCs', 'Cerebriform [some]', 'Convoluted [some]', 'Moderate-mark irregular [most]',
-        'Round/slightly irregular [most]'))
+            'No SLCs', 'Cerebriform [some]', 'Convoluted [some]', 'Moderate-mark irregular [most]',
+            'Round/slightly irregular [most]'))
         pgm_rv70 = self.new_rv('SLC', (
-        'Absent [0pc]', 'Sparse [1-10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
+            'Absent [0pc]', 'Sparse [1-10pc]', 'Moderate [11-50pc]', 'Numerous [51-90pc]', 'Striking [>90pc]'))
         pgm_rv71 = self.new_rv('SINUSES', ('Distended', 'Patent', 'Part-greatly obliterated', 'Completely obliterated'))
         pgm_rv72 = self.new_rv('VASC_C', ('Absent', 'Present'))
         pgm_rv73 = self.new_rv('VASC_NS', ('Absent', 'Slight', 'Moderate', 'Marked', 'Pronounced'))
@@ -123,11 +134,12 @@ class Pathfinder(PGM):
         pgm_rv86 = self.new_rv('F_SS',
                                ('No follicles', 'Absent [0]', 'Slight [1-15]', 'Moderate [16-30]', 'Marked [>30]'))
         pgm_rv87 = self.new_rv('F_MZSTAT', (
-        'No follicles/no mantle zones', 'Mantle zones absent in most follicles', 'Most incompletely surround follicles',
-        'Most completely surround fol not thick', 'Most thick [>10 lymphocytes]'))
+            'No follicles/no mantle zones', 'Mantle zones absent in most follicles',
+            'Most incompletely surround follicles',
+            'Most completely surround fol not thick', 'Most thick [>10 lymphocytes]'))
         pgm_rv88 = self.new_rv('F_MZCM', ('No follicles/no mantle zones', 'Absent', 'Present'))
         pgm_rv89 = self.new_rv('F_DEF', (
-        'No follicles', 'Almost all well defined', 'Both well and poor defined', 'Almost all poor defined'))
+            'No follicles', 'Almost all well defined', 'Both well and poor defined', 'Almost all poor defined'))
         pgm_rv90 = self.new_rv('F_MITO', ('No follicles', '0-20', '21-50', '>50'))
         pgm_rv91 = self.new_rv('F_MZ', ('No follicles', 'Absent', 'Present'))
         pgm_rv92 = self.new_rv('F_CIO', ('No follicles', 'Most similar', 'Some similar', 'None similar'))
@@ -169,13 +181,14 @@ class Pathfinder(PGM):
         pgm_rv128 = self.new_rv('TB', ('Absent', 'Present', 'Prominent'))
         pgm_rv129 = self.new_rv('MELANIN', ('Absent to normal', 'Present', 'Prominent'))
         pgm_rv130 = self.new_rv('MC_SL_NS', (
-        'No follicles/no mantle zones', 'Round', 'Slightly irregular', 'Moderately irregular', 'Markedly irregular'))
+            'No follicles/no mantle zones', 'Round', 'Slightly irregular', 'Moderately irregular',
+            'Markedly irregular'))
         pgm_rv131 = self.new_rv('FMZ_FUS', (
-        'No thick mantle zones', 'No nodules no fusion', 'Nodules but no fusion', 'Fusion with or without nodules'))
+            'No thick mantle zones', 'No nodules no fusion', 'Nodules but no fusion', 'Fusion with or without nodules'))
         pgm_rv132 = self.new_rv('BH_NOS_L', ('No NOS benign histiocytes', 'Mainly interfollicular', 'Mainly sinusoidal',
                                              'Both interfollicular and sinusoidal'))
         pgm_rv133 = self.new_rv('SLC_NI', (
-        'No SLCs', 'None identifiable', '1 or more peripheral small', '1 central medium to large', 'Other'))
+            'No SLCs', 'None identifiable', '1 or more peripheral small', '1 central medium to large', 'Other'))
         pgm_rv134 = self.new_rv('HYALIN', ('Absent', 'Present', 'Prominent'))
         pgm_factor0 = self.new_factor(pgm_rv0)
         pgm_factor1 = self.new_factor(pgm_rv1, pgm_rv128)
@@ -315,22 +328,82 @@ class Pathfinder(PGM):
 
         pgm_function0 = pgm_factor0.set_dense()
         pgm_function0.set_flat(
-            20.0, 1.5, 5.0, 5.0, 25.0,
-            25.0, 5.0, 5.0, 15.0, 4.0,
-            2.0, 2.0, 5.0, 12.5, 8.0,
-            12.8, 2.0, 2.0, 3.0, 20.0,
-            2.0, 5.0, 4.0, 15.0, 0.5,
-            15.0, 2.5, 90.0, 8.0, 8.0,
-            70.0, 5.0, 3.0, 3.0, 110.0,
-            55.0, 20.0, 5.0, 40.0, 8.0,
-            10.0, 5.0, 6.0, 110.0, 20.0,
-            20.0, 12.0, 2.0, 10.0, 80.0,
-            1.0, 15.0, 2.0, 3.0, 5.0,
-            0.1, 20.0, 8.0, 5.0, 8.0,
-            2.0, 20.0, 25.0, 20.0, 5.0,
-            2.0, 2.0, 2.0, 2.0, 2.0,
-            2.0, 2.0, 5.0, 0.25, 4.0,
-            8.0
+            0.018279029,
+            0.001370927,
+            0.004569757,
+            0.004569757,
+            0.022848787,
+            0.022848787,
+            0.004569757,
+            0.004569757,
+            0.013709272,
+            0.003655806,
+            0.001827903,
+            0.001827903,
+            0.004569757,
+            0.011424393,
+            0.007311612,
+            0.011698579,
+            0.001827903,
+            0.001827903,
+            0.002741854,
+            0.018279029,
+            0.001827903,
+            0.004569757,
+            0.003655806,
+            0.013709272,
+            0.000456976,
+            0.013709272,
+            0.002284879,
+            0.082255632,
+            0.007311612,
+            0.007311612,
+            0.063976603,
+            0.004569757,
+            0.002741854,
+            0.002741854,
+            0.100534662,
+            0.050267331,
+            0.018279029,
+            0.004569757,
+            0.036558059,
+            0.007311612,
+            0.009139515,
+            0.004569757,
+            0.005483709,
+            0.100534662,
+            0.018279029,
+            0.018279029,
+            0.010967418,
+            0.001827903,
+            0.009139515,
+            0.073116118,
+            0.000913951,
+            0.013709272,
+            0.001827903,
+            0.002741854,
+            0.004569757,
+            9.13951E-05,
+            0.018279029,
+            0.007311612,
+            0.004569757,
+            0.007311612,
+            0.001827903,
+            0.018279029,
+            0.022848787,
+            0.018279029,
+            0.004569757,
+            0.001827903,
+            0.001827903,
+            0.001827903,
+            0.001827903,
+            0.001827903,
+            0.001827903,
+            0.001827903,
+            0.004569757,
+            0.000228488,
+            0.003655806,
+            0.007311612,
         )
 
         pgm_function1 = pgm_factor1.set_dense()

ck/in_out/parse_ace_lmap.py

@@ -108,7 +108,7 @@ class Parser(ABC):
         except ParseError as e:
             raise e
         except Exception as e:
-            input_stream.raise_error(e)
+            input_stream.raise_error(str(e))
 
     @abstractmethod
     def comment(self, raise_f, message: str) -> None:

ck/in_out/parse_ace_nnf.py

@@ -64,10 +64,20 @@ def read_nnf_with_literal_map(
         check_header=check_header,
         optimise_ops=optimise_ops,
     )
+    circuit = top_node.circuit
+
+    # Build the slot map from indicator to slot.
+    # Some indicators may not be in `literal_slot_map` because they were not needed
+    # for the arithmetic circuit in the NNF file. For those indicators, we create
+    # dummy circuit vars.
+    def _get_slot(_literal_code: int) -> int:
+        _slot: Optional[int] = literal_slot_map.get(_literal_code)
+        if _slot is None:
+            _slot: int = circuit.new_var().idx
+        return _slot
 
-    # Build the slot map from indicator to slot
     slot_map: Dict[SlotKey, int] = {
-        indicator: literal_slot_map[literal_code]
+        indicator: _get_slot(literal_code)
         for literal_code, indicator in literal_map.indicators.items()
     }
 
@@ -193,7 +203,7 @@ class Parser(ABC):
         except ParseError as e:
             raise e
         except Exception as e:
-            input_stream.raise_error(e)
+            input_stream.raise_error(str(e))
 
     @abstractmethod
     def comment(self, raise_f, message: str) -> None:

ck/pgm_compiler/ace/ace.py

@@ -101,16 +101,13 @@ def compile_pgm(
             node_names: List[str] = render_bayesian_network(pgm, file, check_structure_bayesian=False)
 
         # Run Ace
-        ace_result: subprocess.CompletedProcess = subprocess.run(ace_cmd, capture_output=True, text=True)
-        if print_output:
-            print(ace_result.stdout)
-            print(ace_result.stderr)
+        ace_result: subprocess.CompletedProcess = subprocess.run(ace_cmd, capture_output=(not print_output), text=True)
         if ace_result.returncode != 0:
             raise subprocess.CalledProcessError(
                 returncode=ace_result.returncode,
                 cmd=' '.join(ace_cmd),
-                output=ace_result.stdout,
-                stderr=ace_result.stderr,
+                output=None if print_output else ace_result.stdout,
+                stderr=None if print_output else ace_result.stderr,
             )
 
         # Parse the literal map output from Ace

ck/pgm_compiler/factor_elimination.py

@@ -21,7 +21,7 @@ def compile_pgm(
         *,
         algorithm: JoinTreeAlgorithm = MIN_FILL_THEN_DEGREE,
         limit_product_tree_search: int = DEFAULT_PRODUCT_SEARCH_LIMIT,
-        pre_prune_factor_tables: bool = True,
+        pre_prune_factor_tables: bool = False,
 ) -> PGMCircuit:
     """
     Compile the PGM to an arithmetic circuit, using factor elimination.
@@ -60,7 +60,7 @@ def compile_pgm_best_jointree(
         const_parameters: bool = True,
         *,
         limit_product_tree_search: int = DEFAULT_PRODUCT_SEARCH_LIMIT,
-        pre_prune_factor_tables: bool = True,
+        pre_prune_factor_tables: bool = False,
 ) -> PGMCircuit:
     """
     Try multiple elimination heuristics, and use the join tree that has
@@ -114,7 +114,7 @@ def join_tree_to_circuit(
         join_tree: JoinTree,
         const_parameters: bool = True,
         limit_product_tree_search: int = DEFAULT_PRODUCT_SEARCH_LIMIT,
-        pre_prune_factor_tables: bool = True,
+        pre_prune_factor_tables: bool = False,
 ) -> PGMCircuit:
     """
     Construct a PGMCircuit from a join-tree.

ck/pgm_compiler/named_pgm_compilers.py

@@ -18,32 +18,32 @@ class NamedPGMCompiler(Enum):
     """
     # @formatter:off
 
-    VE_MIN_DEGREE: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE')
-    VE_MIN_DEGREE_THEN_FILL: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE_THEN_FILL')
-    VE_MIN_FILL: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_FILL')
-    VE_MIN_FILL_THEN_DEGREE: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_FILL_THEN_DEGREE')
-    VE_MIN_WEIGHTED_DEGREE: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_WEIGHTED_DEGREE')
-    VE_MIN_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_WEIGHTED_FILL')
-    VE_MIN_TRADITIONAL_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(variable_elimination, 'MIN_TRADITIONAL_WEIGHTED_FILL')
-
-    FE_MIN_DEGREE: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_DEGREE')
-    FE_MIN_DEGREE_THEN_FILL: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_DEGREE_THEN_FILL')
-    FE_MIN_FILL: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_FILL')
-    FE_MIN_FILL_THEN_DEGREE: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_FILL_THEN_DEGREE')
-    FE_MIN_WEIGHTED_DEGREE: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_WEIGHTED_DEGREE')
-    FE_MIN_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_WEIGHTED_FILL')
-    FE_MIN_TRADITIONAL_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(factor_elimination, 'MIN_TRADITIONAL_WEIGHTED_FILL')
-    FE_BEST_JOINTREE: PGMCompiler = factor_elimination.compile_pgm_best_jointree,
-
-    RC_MIN_DEGREE: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_DEGREE')
-    RC_MIN_DEGREE_THEN_FILL: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_DEGREE_THEN_FILL')
-    RC_MIN_FILL: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_FILL')
-    RC_MIN_FILL_THEN_DEGREE: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_FILL_THEN_DEGREE')
-    RC_MIN_WEIGHTED_DEGREE: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_WEIGHTED_DEGREE')
-    RC_MIN_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_WEIGHTED_FILL')
-    RC_MIN_TRADITIONAL_WEIGHTED_FILL: PGMCompiler = _get_compiler_algorithm(recursive_conditioning, 'MIN_TRADITIONAL_WEIGHTED_FILL')
-
-    ACE: PGMCompiler = _get_compiler(ace)
+    VE_MIN_DEGREE = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE')
+    VE_MIN_DEGREE_THEN_FILL = _get_compiler_algorithm(variable_elimination, 'MIN_DEGREE_THEN_FILL')
+    VE_MIN_FILL = _get_compiler_algorithm(variable_elimination, 'MIN_FILL')
+    VE_MIN_FILL_THEN_DEGREE = _get_compiler_algorithm(variable_elimination, 'MIN_FILL_THEN_DEGREE')
+    VE_MIN_WEIGHTED_DEGREE = _get_compiler_algorithm(variable_elimination, 'MIN_WEIGHTED_DEGREE')
+    VE_MIN_WEIGHTED_FILL = _get_compiler_algorithm(variable_elimination, 'MIN_WEIGHTED_FILL')
+    VE_MIN_TRADITIONAL_WEIGHTED_FILL = _get_compiler_algorithm(variable_elimination, 'MIN_TRADITIONAL_WEIGHTED_FILL')
+
+    FE_MIN_DEGREE = _get_compiler_algorithm(factor_elimination, 'MIN_DEGREE')
+    FE_MIN_DEGREE_THEN_FILL = _get_compiler_algorithm(factor_elimination, 'MIN_DEGREE_THEN_FILL')
+    FE_MIN_FILL = _get_compiler_algorithm(factor_elimination, 'MIN_FILL')
+    FE_MIN_FILL_THEN_DEGREE = _get_compiler_algorithm(factor_elimination, 'MIN_FILL_THEN_DEGREE')
+    FE_MIN_WEIGHTED_DEGREE = _get_compiler_algorithm(factor_elimination, 'MIN_WEIGHTED_DEGREE')
+    FE_MIN_WEIGHTED_FILL = _get_compiler_algorithm(factor_elimination, 'MIN_WEIGHTED_FILL')
+    FE_MIN_TRADITIONAL_WEIGHTED_FILL = _get_compiler_algorithm(factor_elimination, 'MIN_TRADITIONAL_WEIGHTED_FILL')
+    FE_BEST_JOINTREE = factor_elimination.compile_pgm_best_jointree,
+
+    RC_MIN_DEGREE = _get_compiler_algorithm(recursive_conditioning, 'MIN_DEGREE')
+    RC_MIN_DEGREE_THEN_FILL = _get_compiler_algorithm(recursive_conditioning, 'MIN_DEGREE_THEN_FILL')
+    RC_MIN_FILL = _get_compiler_algorithm(recursive_conditioning, 'MIN_FILL')
+    RC_MIN_FILL_THEN_DEGREE = _get_compiler_algorithm(recursive_conditioning, 'MIN_FILL_THEN_DEGREE')
+    RC_MIN_WEIGHTED_DEGREE = _get_compiler_algorithm(recursive_conditioning, 'MIN_WEIGHTED_DEGREE')
+    RC_MIN_WEIGHTED_FILL = _get_compiler_algorithm(recursive_conditioning, 'MIN_WEIGHTED_FILL')
+    RC_MIN_TRADITIONAL_WEIGHTED_FILL = _get_compiler_algorithm(recursive_conditioning, 'MIN_TRADITIONAL_WEIGHTED_FILL')
+
+    ACE = _get_compiler(ace)
 
     # @formatter:on
 

ck/pgm_compiler/recursive_conditioning.py

@@ -28,7 +28,7 @@ def compile_pgm(
         const_parameters: bool = True,
         *,
         algorithm: ClusterAlgorithm = MIN_FILL_THEN_DEGREE,
-        pre_prune_factor_tables: bool = True,
+        pre_prune_factor_tables: bool = False,
 ) -> PGMCircuit:
     """
     Compile the PGM to an arithmetic circuit, using recursive conditioning.

ck/pgm_compiler/support/factor_tables.py

@@ -269,40 +269,48 @@ def _pre_prune_factor_tables(factor_rows: Sequence[_FactorRows]) -> None:
     will be formed, which may eliminate rows. This method identifies and removes
     such rows.
     """
+    # Find all pairs of factors that have at least one common random variable.
     pairs_to_check: List[_FactorPair] = [
         _FactorPair(f1, f2)
         for f1, f2 in pairs(factor_rows)
         if not set(f1.rv_indexes).isdisjoint(f1.rv_indexes)
     ]
 
-    pairs_done: List[_FactorPair] = []
-
-    while len(pairs_to_check) > 0:
-        pair = pairs_to_check.pop()
-        x = pair.x
-        y = pair.y
-
-        x_size = len(x)
-        y_size = len(y)
+    # Simple version.
+    for pair in pairs_to_check:
         pair.prune()
 
-        # See if any pairs need re-checking
-        rvs_affected: Set[int] = set()
-        if x_size != len(x):
-            rvs_affected.update(x.rv_indexes)
-        if y_size != len(y):
-            rvs_affected.update(y.rv_indexes)
-        if len(rvs_affected) > 0:
-            next_pairs_done: List[_FactorPair] = []
-            for pair in pairs_done:
-                if rvs_affected.isdisjoint(pair.all_rv_indexes):
-                    next_pairs_done.append(pair)
-                else:
-                    pairs_to_check.append(pair)
-            pairs_done = next_pairs_done
-
-        # Mark the current pair as done.
-        pairs_done.append(pair)
+    # Earlier version.
+    # This version re-checks processed pairs that may get benefit from a subsequent pruning.
+    # Unfortunately, this is computationally expensive, and provides no practical benefit.
+    #
+    # pairs_done: List[_FactorPair] = []
+    # while len(pairs_to_check) > 0:
+    #     pair: _FactorPair = pairs_to_check.pop()
+    #     x: _FactorRows = pair.x
+    #     y: _FactorRows = pair.y
+    #
+    #     x_size = len(x)
+    #     y_size = len(y)
+    #     pair.prune()
+    #
+    #     # See if any pairs need re-checking
+    #     rvs_affected: Set[int] = set()
+    #     if x_size != len(x):
+    #         rvs_affected.update(x.rv_indexes)
+    #     if y_size != len(y):
+    #         rvs_affected.update(y.rv_indexes)
+    #     if len(rvs_affected) > 0:
+    #         next_pairs_done: List[_FactorPair] = []
+    #         for pair in pairs_done:
+    #             if rvs_affected.isdisjoint(pair.all_rv_indexes):
+    #                 next_pairs_done.append(pair)
+    #             else:
+    #                 pairs_to_check.append(pair)
+    #         pairs_done = next_pairs_done
+    #
+    #     # Mark the current pair as done.
+    #     pairs_done.append(pair)
 
 
 def _make_factor_table(

ck/pgm_compiler/variable_elimination.py

@@ -25,7 +25,7 @@ def compile_pgm(
         const_parameters: bool = True,
         *,
         algorithm: ClusterAlgorithm = MIN_FILL_THEN_DEGREE,
-        pre_prune_factor_tables: bool = True,
+        pre_prune_factor_tables: bool = False,
 ) -> PGMCircuit:
     """
     Compile the PGM to an arithmetic circuit, using variable elimination.

ck_demos/ace/demo_ace.py

@@ -17,7 +17,7 @@ def main() -> None:
     # Here is an example showing how to copy Ace to the default
     # location from a source directory.
     #
-    # ace.copy_ace_to_default_location(r'E:\Dropbox\Research\Ace\all')
+    # ace.copy_ace_to_default_location(r'C:\Research\Ace\ace_v3.0_windows')
 
     pgm_cct: PGMCircuit = ace.compile_pgm(pgm, print_output=True)
 

ck_demos/pgm_compiler/compare_pgm_compilers.py

@@ -9,6 +9,14 @@ from ck_demos.utils.compare import compare
 
 # @formatter:off
 
+# =========================================
+#  Experiment configuration
+# =========================================
+
+CACHE_CIRCUITS: bool = True
+BREAK_BETWEEN_PGMS: bool = True
+COMMA_NUMBERS: bool = True
+
 PGMS: Sequence[PGM] = [
     example.Rain(),
     example.Cancer(),
@@ -25,14 +33,14 @@ PGMS: Sequence[PGM] = [
     # example.Mildew(),
 ]
 
-CCT_COMPILERS: Sequence[NamedCircuitCompiler] = [DEFAULT_CIRCUIT_COMPILER]
-
 PGM_COMPILERS: Sequence[NamedPGMCompiler] = [
     named_compiler
     for named_compiler in NamedPGMCompiler
     if named_compiler.name.startswith('FE_') and 'WEIGHTED' not in named_compiler.name
 ] + [NamedPGMCompiler.ACE]
 
+CCT_COMPILERS: Sequence[NamedCircuitCompiler] = [DEFAULT_CIRCUIT_COMPILER]
+
 # @formatter:on
 
 
@@ -41,6 +49,9 @@ def main() -> None:
         pgms=PGMS,
         pgm_compilers=PGM_COMPILERS,
         cct_compilers=CCT_COMPILERS,
+        cache_circuits=CACHE_CIRCUITS,
+        break_between_pgms=BREAK_BETWEEN_PGMS,
+        comma_numbers=COMMA_NUMBERS,
     )
     print()
     print('Done.')

ck_demos/utils/compare.py

@@ -7,13 +7,15 @@ from ck.pgm_circuit.wmc_program import WMCProgram
 from ck.pgm_compiler import NamedPGMCompiler
 from ck_demos.utils.stop_watch import StopWatch
 
-CACHE_CIRCUIT: bool = True
-
 
 def compare(
         pgms: Sequence[PGM],
         pgm_compilers: Sequence[NamedPGMCompiler],
         cct_compilers: Sequence[NamedCircuitCompiler],
+        *,
+        cache_circuits: bool = True,
+        break_between_pgms: bool = True,
+        comma_numbers: bool = True,
 ) -> None:
     """
     For each combination of the given arguments, construct a PGMCircuit (using a
@@ -35,22 +37,34 @@ def compare(
         pgms: a sequence of PGM objects.
         pgm_compilers: a sequence of named PGM compilers.
         cct_compilers: a sequence of named circuit compilers.
+        cache_circuits: if true, then circuits are reused across different circuit compilers.
+        break_between_pgms: if true, print a blank line  between different workload PGMs.
+        comma_numbers: if true, commas are used in large numbers.
     """
-    # work out column widths for names.
-    max_pgm_name: int = max(len(pgm.name) for pgm in pgms)
-    max_pgm_compiler_name: int = max(len(pgm_compiler.name) for pgm_compiler in pgm_compilers)
-    max_cct_compiler_name: int = max(len(cct_compiler.name) for cct_compiler in cct_compilers)
+    # Work out column widths for names.
+    col_pgm_name: int = max(len(pgm.name) for pgm in pgms)
+    col_pgm_compiler_name: int = max(len(pgm_compiler.name) for pgm_compiler in pgm_compilers)
+    col_cct_compiler_name: int = max(len(cct_compiler.name) for cct_compiler in cct_compilers)
+    col_cct_ops: int = 10
+    col_pgm_compile_time: int = 10
+    col_cct_compile_time: int = 10
+    col_execute_time: int = 10
 
-    # variables for when CACHE_CIRCUIT is true
+    # Variables for when cache_circuits is true
     prev_pgm = None
     prev_pgm_compiler = None
 
+    if comma_numbers:
+        comma = ','
+    else:
+        comma = ''
+
     for pgm in pgms:
-        pgm_name: str = pgm.name.ljust(max_pgm_name)
+        pgm_name: str = pgm.name.ljust(col_pgm_name)
         for pgm_compiler in pgm_compilers:
-            pgm_compiler_name: str = pgm_compiler.name.ljust(max_pgm_compiler_name)
+            pgm_compiler_name: str = pgm_compiler.name.ljust(col_pgm_compiler_name)
             for cct_compiler in cct_compilers:
-                cct_compiler_name: str = cct_compiler.name.ljust(max_cct_compiler_name)
+                cct_compiler_name: str = cct_compiler.name.ljust(col_cct_compiler_name)
 
                 print(f'{pgm_name}  ', end='')
                 print(f'{pgm_compiler_name}  ', end='')
@@ -59,30 +73,34 @@ def compare(
                 try:
                     time = StopWatch()
 
-                    if CACHE_CIRCUIT and pgm is prev_pgm and pgm_compiler is prev_pgm_compiler:
-                        print(f'{"":10} ', end='')
-                        print(f'{"":10}  ', end='')
+                    if cache_circuits and pgm is prev_pgm and pgm_compiler is prev_pgm_compiler:
+                        print(f'{"":{col_cct_ops}} ', end='')
+                        print(f'{"":{col_pgm_compile_time}}  ', end='')
                     else:
                         time.start()
                         pgm_cct: PGMCircuit = pgm_compiler(pgm)
                         time.stop()
-                        print(f'{pgm_cct.circuit_top.circuit.number_of_operations:10,} ', end='')
-                        print(f'{time.seconds():10.3f}s ', end='')
+                        num_ops: int = pgm_cct.circuit_top.circuit.number_of_operations
+                        print(f'{num_ops:{col_cct_ops}{comma}} ', end='')
+                        print(f'{time.seconds():{col_pgm_compile_time}{comma}.3f} ', end='')
                         prev_pgm = pgm
                         prev_pgm_compiler = pgm_compiler
 
                     time.start()
+                    # `pgm_cct` will always be set but the IDE can't work that out.
+                    # noinspection PyUnboundLocalVariable
                     wmc = WMCProgram(pgm_cct, compiler=cct_compiler.compiler)
                     time.stop()
-                    print(f'{time.seconds():10.3f}s ', end='')
+                    print(f'{time.seconds():{col_cct_compile_time}{comma}.3f} ', end='')
 
                     time.start()
                     for _ in range(1000):
                         wmc.compute()
                     time.stop()
-                    print(f'{time.seconds() * 1000:10.3f}μs ', end='')
+                    print(f'{time.seconds() * 1000:{col_execute_time}{comma}.3f} ', end='')
                 except Exception as err:
                     print(repr(err), end='')
 
                 print()
-        print()
+        if break_between_pgms:
+            print()

{compiled_knowledge-4.0.0a12.dist-info → compiled_knowledge-4.0.0a15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiled-knowledge
-Version: 4.0.0a12
+Version: 4.0.0a15
 Summary: A Python package for compiling and querying discrete probabilistic graphical models.
 Author-email: Barry Drake <barry@compiledknowledge.org>
 License-Expression: MIT
@@ -43,7 +43,7 @@ Refer to the project online documentation at
 The primary repository for the project is 
 [github.com/ropeless/compiled_knowledge](https://github.com/ropeless/compiled_knowledge). 
 
-The Python package is available on PyPi, see
+The Python package is available on PyPI, see
 [pypi.org/project/compiled-knowledge](https://pypi.org/project/compiled-knowledge/).
 
 For more information email

{compiled_knowledge-4.0.0a12.dist-info → compiled_knowledge-4.0.0a15.dist-info}/RECORD

@@ -2,7 +2,7 @@ ck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck/pgm.py,sha256=rbqgP-clfSvgpzUXxVjk_6SdM9neHmpChku6qpyeidk,120700
 ck/circuit/__init__.py,sha256=tozFNNVzsgQDwFrtGzrgcFS4XTszhgyFmbMGfV5pimc,212
 ck/circuit/circuit.c,sha256=_DN78mWLcGdXOKoZv6Eq-m50KLpOP0SY_GjFrhLJoj0,1773051
-ck/circuit/circuit.cp312-win_amd64.pyd,sha256=AEIxR4g_x4BvVsJw3U_Gv0RqQXA3M5ryM-rHiTgo5qI,252416
+ck/circuit/circuit.cp312-win_amd64.pyd,sha256=TCkj4oiRcRFb0av5YyizlygbYKtFJn8LAqjT7nO8Zjw,252416
 ck/circuit/circuit.pyx,sha256=Y35CZMalySX8_uhNH6wIaZzS6ACn3rh3L99bog1lQx8,28060
 ck/circuit/circuit_node.pyx,sha256=8RuEC1ngYxnsGryzQ1lOEPc4ewTxvKwc56sOxWLB9zs,4103
 ck/circuit/circuit_py.py,sha256=_k8H1yZsfp2vERkX_CIo8VxxOf1ICw2zL8i2ckoaSlE,28127
@@ -12,10 +12,10 @@ ck/circuit_compiler/circuit_compiler.py,sha256=8BLB8DUnPbpl5PXZsIopydPbItytdn2rz
 ck/circuit_compiler/interpret_compiler.py,sha256=Vlu4VnZ_VWGoBb4yx6wuJOlhJ2nGVhkzQpIyJ8xyjbI,7350
 ck/circuit_compiler/llvm_compiler.py,sha256=ejeNPkO5Og2FyjjyA5JAexxUl1f8IJ6mwU5Ng5EafAA,14009
 ck/circuit_compiler/llvm_vm_compiler.py,sha256=I46_XV5FrClDKO06zIjn8T3ME5XQ9RYJ_1aAE8e_YzM,21873
-ck/circuit_compiler/named_circuit_compilers.py,sha256=Fsk2HANYhw25uxAdOo5-7aSnVZxlPgsaPz9wO_1YdRg,2400
+ck/circuit_compiler/named_circuit_compilers.py,sha256=gKhRvYLflSCkk6CBI-CBQ2UwR-bhEhMxLvnefPm8288,2282
 ck/circuit_compiler/cython_vm_compiler/__init__.py,sha256=pEAwTleuZgdYhTAQMea2f9YsFK54eoNbZSbrWkW8aeE,49
 ck/circuit_compiler/cython_vm_compiler/_compiler.c,sha256=xpYybtj-aRcMJV1oKkB-p0kciZVW3gLRd0OJBfDg3sc,757006
-ck/circuit_compiler/cython_vm_compiler/_compiler.cp312-win_amd64.pyd,sha256=Ddr_g8kTVwQ6CDq0pZGUX-2E4KGZYcuuWFsUBsdtAtw,92160
+ck/circuit_compiler/cython_vm_compiler/_compiler.cp312-win_amd64.pyd,sha256=hq07LvGfpD8VsssyCmmbecF38YCIws2efly317jvPug,92160
 ck/circuit_compiler/cython_vm_compiler/_compiler.pyx,sha256=hHuNo99TbodNpWgQwQ8qzW1cTwGXZj5SW0tKAo9u6cw,7718
 ck/circuit_compiler/cython_vm_compiler/cython_vm_compiler.py,sha256=yUkBNr5HnoVXyWjJdXHp8lyAXFiIDYapvMvHtzKuhI8,3140
 ck/circuit_compiler/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +41,7 @@ ck/example/insurance.py,sha256=Nq8WqpMtWgYv8XgTQo3iL2DzDu-PdmsJBL6fpQjOI-0,31708
 ck/example/loop.py,sha256=9Au9FABY_0X7W-6M4vQljepul010vMIMOh9OA6be14w,1451
 ck/example/mildew.py,sha256=qblE1Fx_P_eYJqu_uptwoCUvIDXhGmO67G6sHLSu0zc,1830957
 ck/example/munin.py,sha256=HbkEOqzq9ZrYzm4uSSOnfVv_rt_NDxmN7Wy4JwDf3Z0,1680209
-ck/example/pathfinder.py,sha256=BxEg-peUzg6vHVopqlL6pUdNcEUfcO7PFhg38_TbRXU,2309107
+ck/example/pathfinder.py,sha256=U1RHp0L6OzdfL4Dh0x6CAb9eMqd6kzkuLavvc16BCjg,2310872
 ck/example/rain.py,sha256=el8cOP51IKjDXw_F4dnh0FIqI5xw0qFRdmg-GyFymsE,1226
 ck/example/rectangle.py,sha256=srcBu90-RsMqYtRKngVxdXS8OQDMIiucx78VcFyN49M,6995
 ck/example/run.py,sha256=HHCfHwrkRCSuplV2msXuZ3azkgC4bjtN8C5cL6UWtp0,994
@@ -54,8 +54,8 @@ ck/example/survey.py,sha256=KrqDgzU1V-yJHy4BEAAJQatqH9YAy8acrp6rVYAqQag,1611
 ck/example/triangle_square.py,sha256=D-ADGOSxCffsgukLTySsb6HVQpUnOJ-ZyMGBz_qGna4,2148
 ck/example/truss.py,sha256=5ud1qvPZMSKqSx0Sq1ZKcEeD_ZVUdKbEBfk5eyqhpm4,1974
 ck/in_out/__init__.py,sha256=PKhy5qeUrmmUaECSQIkoLQ2McAfQFSwB06vQZk3vpmo,112
-ck/in_out/parse_ace_lmap.py,sha256=JAwYL4TDlO4GhJmg-v8-3hl67lYyKYLKSvQUI8mTvgw,7886
-ck/in_out/parse_ace_nnf.py,sha256=7O8B5LdoICq0nFAAZfHK-mWkuzrGY_h2WOaNzLghCWw,11403
+ck/in_out/parse_ace_lmap.py,sha256=EZnSLhsZwdPnk2Fbe2El0YXYqvjd_cBh7PZro7ZeR04,7891
+ck/in_out/parse_ace_nnf.py,sha256=Hkc24qn4ziA4-VunBEinURDGsnmCWICj73w3bopecR0,11843
 ck/in_out/parse_net.py,sha256=cBY7X4k5U8v9x_dtFZWdOpSPh-q-U47gdImNo2Tf9dY,14302
 ck/in_out/parser_utils.py,sha256=Js_BaOmNji4mM7UYDm6pGd56wYcQoere7TuB0tkztko,5440
 ck/in_out/pgm_pickle.py,sha256=i5LYxez356we7MzHwsQBmFdOvBJOLVKBp4u4lSwBOjU,1004
@@ -74,21 +74,21 @@ ck/pgm_circuit/wmc_program.py,sha256=WtABU74FOCCJuKRCoDL4CyZ4CJXFmt9RSxiNNHsOhRY
 ck/pgm_circuit/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck/pgm_circuit/support/compile_circuit.py,sha256=RuYzDCRpfXZcY96sSW8v7x6ev9ScQ4IZkVqMdJUoMp8,3484
 ck/pgm_compiler/__init__.py,sha256=XCK1AWBBB9UYi6kbFnxMFzBL9a25EWfHnz_yn3ZKYuM,112
-ck/pgm_compiler/factor_elimination.py,sha256=iZe7Y-YIm0P9I-h4jLomUS49QiEedAbWQ1btU5JRBLg,13244
-ck/pgm_compiler/named_pgm_compilers.py,sha256=zqRR8gER4zhl_RjXPHy8U0j5G-bQhYQZuG9hWptAHms,3720
+ck/pgm_compiler/factor_elimination.py,sha256=Eu7wJWYjRK4aTEsJP4P_femktbqqZkWN3aI-nqHyNzU,13247
+ck/pgm_compiler/named_pgm_compilers.py,sha256=kYMomYlsW7xbL0hzTWQb41EckkugaCfuYHUJqbEWBBs,3421
 ck/pgm_compiler/pgm_compiler.py,sha256=F44PtlwqMG0FS6KzOYKZuyZT6olWAVtBH-QXZPzz4O8,616
-ck/pgm_compiler/recursive_conditioning.py,sha256=dlLAKdV7KUf7hHRVIndBsMC1bGUvrOCXeOY0vGs6yHE,7935
-ck/pgm_compiler/variable_elimination.py,sha256=wNNntrng2OGSsnGHWr8cLHsMHDQgJodQxhu6h7RMung,3459
+ck/pgm_compiler/recursive_conditioning.py,sha256=U0NdIns8yLQtYR_MOf1w__CChpOMDlgRCL2nFRhtnzU,7936
+ck/pgm_compiler/variable_elimination.py,sha256=YNBurWTz8_BoaZgRZFj-T9gRVGek7ZutGkvjegyLkCM,3460
 ck/pgm_compiler/ace/__init__.py,sha256=BkZXAF32Pk8QU7jhkuKvHqtsFasPjf8gxiZbyrGDDbQ,82
-ck/pgm_compiler/ace/ace.py,sha256=SpOX8s0PsNP0I9X5_TagHo5Gh4kZYxciKuEQbuvpyE4,10131
+ck/pgm_compiler/ace/ace.py,sha256=Q3d76rwAMsNFQeRXdxycy_KUJeE29g7bURryKAdq-aI,10095
 ck/pgm_compiler/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck/pgm_compiler/support/clusters.py,sha256=96Up5XUgERh-t6KzSIOF2gtP5T4Ul83JK_aPtIR72Ic,20821
-ck/pgm_compiler/support/factor_tables.py,sha256=LAZbWtDVyTpxps7C4d3q38uUVkNnzRBO8JpYl9Qly-c,15081
+ck/pgm_compiler/support/factor_tables.py,sha256=N7BNBBA-BX6RN-eiDwENtMLczW3JAkV-qW0i0k8OZEM,15558
 ck/pgm_compiler/support/join_tree.py,sha256=tRHev655cwRsOSyLK9HYwfX8EEkubmlg1fw748Kztb4,10418
 ck/pgm_compiler/support/named_compiler_maker.py,sha256=tQ79JOI8MknAziUiFhFGV9n4y6PPKrnbq3-quMmnrwY,974
 ck/pgm_compiler/support/circuit_table/__init__.py,sha256=eWMP5ywgd51RJexKkhcpKJb_8iEluL0C4_hyOpzlAvQ,167
 ck/pgm_compiler/support/circuit_table/circuit_table.c,sha256=aO3bq3V-FwbmJDzWVYwigOFeQUC6gFz-nAq091XQp2E,702527
-ck/pgm_compiler/support/circuit_table/circuit_table.cp312-win_amd64.pyd,sha256=O5PF35hHGlDg_00hn5Cdy_idn_1JxEbjAQKldDC7_Qk,94720
+ck/pgm_compiler/support/circuit_table/circuit_table.cp312-win_amd64.pyd,sha256=eVXmnKKG8k-V0v_RfhH9_n8nHfB6zZtC5LPDAvHitY0,94720
 ck/pgm_compiler/support/circuit_table/circuit_table.pyx,sha256=jhzstay-3EUgu0CIbWKd0eNDNToX1tmm9IQxk0ZgpYM,11904
 ck/pgm_compiler/support/circuit_table/circuit_table_py.py,sha256=1WFCxgBFu4oaYRCdk_1uXeufFQu6PqMOsYIQ_SkXDS4,10156
 ck/probability/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -120,7 +120,7 @@ ck_demos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck_demos/all_demos.py,sha256=E1SZDvG0l_j1PfHZLemHocezw10uY5uGl3yE3BX87DE,2556
 ck_demos/ace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck_demos/ace/copy_ace_to_ck.py,sha256=TJHPGcUbd1a6OjH3Fw7c3fno8ULPbf5p3V_lBmiNR-k,303
-ck_demos/ace/demo_ace.py,sha256=68Q27XFpGaj_bUZuQ35-p2jpqgFN9zVWKLuA_dWBQRw,1360
+ck_demos/ace/demo_ace.py,sha256=yF35GsYtFZxzTFqXlD_yoEg25BA8wROB5HbuOaxLPUs,1365
 ck_demos/circuit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ck_demos/circuit/demo_circuit_dump.py,sha256=CQC5cxXaaRuVZ3d8h-SqXs8EJo0Tm5H5l7T9ad6pyEk,458
 ck_demos/circuit/demo_derivatives.py,sha256=3JoWVAEKLEoLjq6QzWkq4Z-qVq1l0tHvGDn5erVuozc,1186
@@ -133,7 +133,7 @@ ck_demos/pgm/demo_pgm_dump_stress.py,sha256=L9S3yp0EQM56kWztV4A6XzEqITOGbThImZIU
 ck_demos/pgm/demo_pgm_string_rendering.py,sha256=JTf_M6pPwl9RtOLlpJFQIgNgGuHnsddJbxhgbZOChos,285
 ck_demos/pgm/show_examples.py,sha256=KxK37hKqWD9w9k9RoMCdJgkBIMePf8udQbqaFs-s91c,461
 ck_demos/pgm_compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ck_demos/pgm_compiler/compare_pgm_compilers.py,sha256=UQtMa_z4EQIZKjFpm-QCiAZrDmT4BJxr9GZuxsQQoYM,1209
+ck_demos/pgm_compiler/compare_pgm_compilers.py,sha256=0dm77DygI9E4WMOAD-M8Kzrf4xlPmZuZX6zUdy5fZ4Y,1548
 ck_demos/pgm_compiler/demo_compiler_dump.py,sha256=OlLJi1wwdFQxave5lpceyVx0-ihHEn2-d-0XFFTjowY,1370
 ck_demos/pgm_compiler/demo_factor_elimination.py,sha256=KDzYwNZJ9HTcPoNxg6lxFoaXJ26QW-nnBI-0Ux_yWoM,1320
 ck_demos/pgm_compiler/demo_join_tree.py,sha256=E7ZqFrRuAmnSRmBTDqNGxD-KFlHOtd_jIju8UJssUfM,574
@@ -161,12 +161,12 @@ ck_demos/sampling/demo_marginal_direct_sampler.py,sha256=RhNunuIUnYI_GXp9m8wzadM
 ck_demos/sampling/demo_uniform_sampler.py,sha256=Z6tX_OYKGLc_w3-kEPK4KEZlJo7F5HOq_tUVppB_VQE,962
 ck_demos/sampling/demo_wmc_direct_sampler.py,sha256=c7maxTmZyIijaVdFs2h_KQbK30LvI-oCm2BXSUXVoD8,1113
 ck_demos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ck_demos/utils/compare.py,sha256=eC1rJXuWQhEfq4yQlXggn2O_sk-xAVEn6PpVuIaZJoo,3447
+ck_demos/utils/compare.py,sha256=WGCYv6rbT_vU1ldndnIoflmF2EDAQ2ckCw2i2QVVPng,4357
 ck_demos/utils/convert_network.py,sha256=TSKj8q7L7J5rhrvwjaDkdYZ0Sg8vV5FRL_vCanX1CQw,1363
 ck_demos/utils/sample_model.py,sha256=in-Nlv-iuNIu6y9fDuMyo7nzgimBuTAnCWcpnVqvqDQ,8839
 ck_demos/utils/stop_watch.py,sha256=VzXHRWx0V8vPSD-bLgLlEYkCkR2FA0-KmM_pfKx-Pxo,13205
-compiled_knowledge-4.0.0a12.dist-info/licenses/LICENSE.txt,sha256=uMYx7tmroEKNASizbCOwPveMQsD5UErLDC1_SANmNn8,1089
-compiled_knowledge-4.0.0a12.dist-info/METADATA,sha256=YTNCVL1c9vIe7N3_YyKMfchNdM76LEIni9yJv3dvegw,1838
-compiled_knowledge-4.0.0a12.dist-info/WHEEL,sha256=b7PoVIxzH_MOHKjftqMzQiGKfdHRlRFepVBVPg0y3vc,101
-compiled_knowledge-4.0.0a12.dist-info/top_level.txt,sha256=Cf8DAfd2vcnLiA7HlxoduOzV0Q-8surE3kzX8P9qdks,12
-compiled_knowledge-4.0.0a12.dist-info/RECORD,,
+compiled_knowledge-4.0.0a15.dist-info/licenses/LICENSE.txt,sha256=uMYx7tmroEKNASizbCOwPveMQsD5UErLDC1_SANmNn8,1089
+compiled_knowledge-4.0.0a15.dist-info/METADATA,sha256=2pLUAaU9vrC3iWkLGsj6SPKfKQDSZ8UL2eBh9xdkF4k,1838
+compiled_knowledge-4.0.0a15.dist-info/WHEEL,sha256=b7PoVIxzH_MOHKjftqMzQiGKfdHRlRFepVBVPg0y3vc,101
+compiled_knowledge-4.0.0a15.dist-info/top_level.txt,sha256=Cf8DAfd2vcnLiA7HlxoduOzV0Q-8surE3kzX8P9qdks,12
+compiled_knowledge-4.0.0a15.dist-info/RECORD,,