Merge remote-tracking branch 'proofsearch-import/master'

3 files changed, 169 insertions, 0 deletions

diff --git a/proofsearch/include/atp/infer/resolution.h b/proofsearch/include/atp/infer/resolution.h
new file mode 100644
index 0000000..6e2954d
--- /dev/null
+++ b/proofsearch/include/atp/infer/resolution.h
@@ -0,0 +1,50 @@
+/*
+ * richard-atp-engine: A saturation-based automated theorem prover for first-order logic.
+ * Copyright (C) 2026 Richard Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/// @file resolution.h
+/// @brief Binary resolution and factoring inference rules.
+
+#include "atp/core/clause.h"
+#include "atp/core/term_bank.h"
+#include "atp/infer/unification.h"
+
+#include <optional>
+#include <vector>
+
+namespace atp {
+
+/// Attempt binary resolution between two clauses on the specified literal indices.
+/// @return The resolvent clause if resolution succeeds, std::nullopt otherwise.
+std::optional<Clause> resolve(TermBank& bank, const Clause& c1, size_t lit_idx1, const Clause& c2,
+                              size_t lit_idx2, const UnificationConfig& uconfig = {});
+
+/// Generate all possible resolvents between two clauses.
+std::vector<Clause> allResolvents(TermBank& bank, const Clause& c1, const Clause& c2,
+                                  const UnificationConfig& uconfig = {});
+
+/// Attempt factoring on a single clause (merge two unifiable literals).
+std::vector<Clause> factor(TermBank& bank, const Clause& c, const UnificationConfig& uconfig = {});
+
+/// Rename all variables in a clause to fresh ones, avoiding conflicts
+/// with variables already in the bank.
+Clause renameVariables(const Clause& c, TermBank& bank, SymbolTable& symbols,
+                       uint32_t& next_var_id);
+
+}  // namespace atp
diff --git a/proofsearch/include/atp/infer/substitution.h b/proofsearch/include/atp/infer/substitution.h
new file mode 100644
index 0000000..671f6d7
--- /dev/null
+++ b/proofsearch/include/atp/infer/substitution.h
@@ -0,0 +1,76 @@
+/*
+ * richard-atp-engine: A saturation-based automated theorem prover for first-order logic.
+ * Copyright (C) 2026 Richard Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/// @file substitution.h
+/// @brief Variable binding map: Var -> Term.
+///
+/// Short-lived object created during unification, applied to build resolvents,
+/// then discarded. Never stored long-term.
+
+#include "atp/core/term_bank.h"
+#include "atp/core/types.h"
+
+#include <unordered_map>
+
+namespace atp {
+
+/// A substitution σ maps variable TermIds to their bound TermIds.
+///
+/// Example: σ = { X → f(a), Y → Z }
+///   lookup(X) = f(a)     (direct binding)
+///   resolve(X) = f(a)    (same — f(a) is not a variable)
+///   resolve(Y) = Z       (if Z is unbound, stops at Z)
+///   resolve(Y) = f(b)    (if Z → f(b) also in σ, walks the chain)
+class Substitution {
+  public:
+    Substitution() = default;
+
+    /// Bind a variable to a term. Returns false if already bound to a different term.
+    bool bind(TermId var, TermId term);
+
+    /// Look up what a variable is directly bound to. Returns kInvalidId if unbound.
+    [[nodiscard]] TermId lookup(TermId var) const;
+
+    /// Walk the binding chain to the final value.
+    /// If var → Y → f(a), returns f(a).
+    /// Requires TermBank to check whether intermediate values are variables.
+    [[nodiscard]] TermId resolve(TermId id, const TermBank& bank) const;
+
+    /// Apply this substitution to a term recursively, creating new terms in the bank.
+    /// Free (unbound) variables are left as-is.
+    [[nodiscard]] TermId apply(TermId term, TermBank& bank) const;
+
+    /// Check if a variable occurs anywhere inside a term (for occurs check).
+    [[nodiscard]] bool occursIn(TermId var, TermId term, const TermBank& bank) const;
+
+    /// Clear all bindings.
+    void clear();
+
+    /// Number of bindings.
+    [[nodiscard]] size_t size() const { return bindings_.size(); }
+
+    /// Check if empty.
+    [[nodiscard]] bool empty() const { return bindings_.empty(); }
+
+  private:
+    std::unordered_map<TermId, TermId> bindings_;
+};
+
+}  // namespace atp
diff --git a/proofsearch/include/atp/infer/unification.h b/proofsearch/include/atp/infer/unification.h
new file mode 100644
index 0000000..870be66
--- /dev/null
+++ b/proofsearch/include/atp/infer/unification.h
@@ -0,0 +1,43 @@
+/*
+ * richard-atp-engine: A saturation-based automated theorem prover for first-order logic.
+ * Copyright (C) 2026 Richard Qin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/// @file unification.h
+/// @brief Most General Unifier (MGU) computation.
+
+#include "atp/core/term_bank.h"
+#include "atp/infer/substitution.h"
+
+namespace atp {
+
+/// Configuration for the unification algorithm.
+struct UnificationConfig {
+    bool enable_occurs_check_ = false;  ///< Set true for sound but slower unification
+};
+
+/// Attempt to unify two terms, producing a most general unifier.
+/// @return true if unification succeeds, with the MGU in `subst`.
+bool unify(const TermBank& bank, TermId t1, TermId t2, Substitution& subst,
+           const UnificationConfig& config = {});
+
+/// Apply a substitution to a term recursively, creating new terms in the bank.
+/// Free (unbound) variables are left unchanged.
+TermId applySubstitution(const Substitution& subst, TermId term, TermBank& bank);
+
+}  // namespace atp