Commit 50f04096 authored by VIGNET Pierre's avatar VIGNET Pierre
Browse files

[lib] MCLAnalyser: Fix typos

parent 7527d054
......@@ -331,9 +331,8 @@ class MCLAnalyser(object):
:rtype: <DimacsFrontierSol>
"""
# Count the number of activated places in each solution
nb_activated = [sol.nb_activated_frontiers for sol in dimacs_solution_list]
print("nb_activated per dimacs fronts sols", nb_activated)
return dimacs_solution_list[nb_activated.index(min(nb_activated))]
activated_per_sol = [sol.nb_activated_frontiers for sol in dimacs_solution_list]
return dimacs_solution_list[activated_per_sol.index(min(activated_per_sol))]
def __solve_with_inact_fsolution(self, dimacs_front_sol, query, max_step, max_sol):
......@@ -421,6 +420,9 @@ class MCLAnalyser(object):
print("iteration", i, "nb pruned inact solutions", len(dimacs_solutions))
####TODO: regarder si ces solutions sont si différentes et ce qu'on en fait au final...
### en fin de compte il est possible que le solveur ne soit pas si bete...
##TODO: ajuster automatiquement nb_sols_to_be_pruned
# PS: dimacs_solutions should never be None or empty
if len(dimacs_solutions) == 1:
# No new solution has been found,
# the current solution is the best (sol_to_prune)
......@@ -606,8 +608,8 @@ class MCLAnalyser(object):
raw_sols = self.sq_solutions(query, max_step, max_sol, vvars)
# Get unique DimacsFrontierSol objects from RawSolution objects
dimacfrontsol = DimacsFrontierSol.get_unique_dimacs_front_sols_from_raw_sols(raw_sols)
print("Taille dimacsfrontsol", [len(sol) for sol in dimacfrontsol])
print("Nombre demande:", max_sol, "steps", max_step, "obtenu", len(dimacfrontsol))
print("Nb activated in dimacsfrontsols", [len(sol) for sol in dimacfrontsol])
print("Nb queried:", max_sol, "steps", max_step, "obtenu", len(dimacfrontsol))
return dimacfrontsol
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment