jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solver: consider world dependencies to determining exit score

cute-signatures
Timo Teräs 2011-11-01 08:29:24 +02:00
parent e36e99f31d
commit f13ec9cf5e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/solver.c
View File

@ -947,6 +947,7 @@ int apk_solver_solve(struct apk_database *db,
{ {
struct apk_solver_state *ss; struct apk_solver_state *ss;
struct apk_installed_package *ipkg; struct apk_installed_package *ipkg;
struct apk_score zero_score;
int i, r; int i, r;
ss = calloc(1, sizeof(struct apk_solver_state)); ss = calloc(1, sizeof(struct apk_solver_state));
@ -962,6 +963,8 @@ int apk_solver_solve(struct apk_database *db,
sort_name(ss, ipkg->pkg->name); sort_name(ss, ipkg->pkg->name);
foreach_dependency(ss, world, apply_constraint); foreach_dependency(ss, world, apply_constraint);
zero_score = ss->score;
do { do {
if (cmpscore(&ss->score, &ss->best_score) < 0) { if (cmpscore(&ss->score, &ss->best_score) < 0) {
r = expand_branch(ss); r = expand_branch(ss);
@ -973,8 +976,7 @@ int apk_solver_solve(struct apk_database *db,
if (cmpscore(&ss->score, &ss->best_score) < 0) if (cmpscore(&ss->score, &ss->best_score) < 0)
record_solution(ss); record_solution(ss);
if (ss->score.unsatisfiable == 0 && if (cmpscore(&zero_score, &ss->score) <= 0) {
ss->score.preference == 0) {
/* found solution - it is optimal because we permutate /* found solution - it is optimal because we permutate
* each preferred local option first, and permutations * each preferred local option first, and permutations
* happen in topologally sorted order. */ * happen in topologally sorted order. */