Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 08cc3c9
More simple assignment.
Vsevolod Stakhov committed 11 years ago
commit 08cc3c99884b73f51daf7a1655f5b42fd370f406
parent b2638e3
1 file changed +14 -3
modified libpkg/pkg_solve.c
@@ -1202,10 +1202,20 @@ pkg_solve_sat_problem(struct pkg_solve_problem *problem)
	}

	/* Set initial guess */

	for (i = 0; i < problem->nvars; i ++)
- 
		picosat_set_default_phase_lit(sat, i + 1,
- 
			pkg_solve_initial_guess(problem, &problem->variables[i]));
+ 
	{
+ 
		struct pkg_solve_variable *var = &problem->variables[i];
+ 
		bool is_installed = var->unit->pkg->type == PKG_INSTALLED;
+
+ 
		if (is_installed) {
+ 
			picosat_set_default_phase_lit(sat, i + 1, 1);
+ 
			picosat_set_more_important_lit(sat, i + 1);
+ 
		}
+ 
		else {
+ 
			picosat_set_default_phase_lit(sat, i + 1, -1);
+ 
			picosat_set_less_important_lit(sat, i + 1);
+ 
		}
+ 
	}
- 
	picosat_set_verbosity(sat, 10);

	res = picosat_sat(sat, -1);



	if (res != PICOSAT_SATISFIABLE) {
@@ -1218,6 +1228,7 @@ pkg_solve_sat_problem(struct pkg_solve_problem *problem)
	for (i = 0; i < problem->nvars; i ++) {

		int val = picosat_deref(sat, i + 1);

		struct pkg_solve_variable *var = &problem->variables[i];
+ 


		if (val > 0)

			var->to_install = true;

		else