solver: rewrite as deductive solver -- core features

Implementing basic dependency handling, install_if and awareness
of pinning.

1 files changed, 21 insertions, 27 deletions

diff --git a/src/apk_solver_data.h b/src/apk_solver_data.h
index 8076a08..913829f 100644
--- a/src/apk_solver_data.h
+++ b/src/apk_solver_data.h
@@ -16,39 +16,33 @@
 #include "apk_defines.h"
 #include "apk_provider_data.h"
 
-struct apk_score {
-	uint32_t unsatisfied;
-	uint32_t non_preferred_actions;
-	uint32_t non_preferred_pinnings;
-	uint32_t preference;
-};
-
 struct apk_solver_name_state {
-	/* dynamic */
-	struct list_head unsolved_list;
-	struct apk_score minimum_penalty;
+	struct list_head dirty_list;
+	struct list_head unresolved_list;
 	struct apk_provider chosen;
 
-	unsigned int last_touched_decision;
-	unsigned short requirers;
-	unsigned short install_ifs;
-	unsigned short preferred_pinning;
-	unsigned short locked;
+	unsigned int preferred_pinning;
 
-	/* one time prepare/finish flags */
-	unsigned solver_flags_local : 4;
-	unsigned solver_flags_inheritable : 4;
-
-	unsigned decision_counted : 1;
-	unsigned originally_installed : 1;
-	unsigned has_available_pkgs : 1;
-	unsigned in_changeset : 1;
+	unsigned short requirers;
+	unsigned short merge_index;
+	unsigned short max_dep_chain;
+	unsigned seen : 1;
 	unsigned in_world_dependency : 1;
+	unsigned in_changeset : 1;
+	unsigned reevaluate_deps : 1;
+	unsigned reevaluate_iif : 1;
+	unsigned locked : 1;
+	unsigned has_iif : 1;
+	unsigned has_options : 1;
+};
 
-	/* dynamic state flags */
-	unsigned none_excluded : 1;
-	unsigned name_touched : 1;
-	unsigned preferred_chosen : 1;
+struct apk_solver_package_state {
+	unsigned short conflicts;
+	unsigned seen : 1;
+	unsigned available : 1;
+	unsigned in_changeset : 1;
+	unsigned iif_triggered : 1;
+	unsigned max_dep_chain : 10;
 };
 
 #endif