Completed first results tests

main_package/classes/estimators/fam_score_calculator.py

@@ -22,8 +22,6 @@ import structure_graph.conditional_intensity_matrix as cim_class
 
 '''
 TODO: Parlare dell'idea di ciclare sulle cim senza filtrare
-TODO: Parlare del problema con gamma in scipy e math(overflow)
-TODO: Problema warning overflow durante l'esecuzione
 '''
 
 
@@ -105,6 +103,9 @@ class FamScoreCalculator:
         'remove the index because of the x != x^ condition in the summation '
         values.remove(index)
 
+        'uncomment for alpha xx not uniform'
+        #alpha_xxu = alpha_xu * cim.state_transition_matrix[index,index_x_first] / cim.state_transition_matrix[index, index])
+
         return (loggamma(alpha_xu) - loggamma(alpha_xu + cim.state_transition_matrix[index, index])) \
                 + \
                 np.sum([self.single_internal_cim_xxu_marginal_likelihood_theta(

main_package/tests/estimators/test_structure_score_based_estimator.py

@@ -23,7 +23,7 @@ class TestStructureScoreBasedEstimator(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         #cls.read_files = glob.glob(os.path.join('../../data', "*.json"))
-        cls.importer = ji.JsonImporter("../../data/networks_and_trajectories_quaternary_data_01_3.json", 'samples', 'dyn.str', 'variables', 'Time', 'Name')
+        cls.importer = ji.JsonImporter("../../data/networks_and_trajectories_binary_data_01_3.json", 'samples', 'dyn.str', 'variables', 'Time', 'Name')
         cls.s1 = sp.SamplePath(cls.importer)
         cls.s1.build_trajectories()
         cls.s1.build_structure()