fix: correct Q16_16 add/sub signed/unsigned bug, add missing lemmas

- FixedPoint.lean: rewrite add/sub with two's-complement overflow
  detection on UInt32 (replaces Int.ofNat approach that broke
  negative Q16_16 values). Both positive and negative inputs now
  correctly saturate at the representable bounds.
- FixedPoint.lean: add add_zero, zero_add, sub_self, sqrt_zero,
  sqrt_one theorems with proofs for the corrected add/sub.
- FixedPoint.lean: fix Q0_16 doc (0x7FFF = 1.0, not 0x8000)
  and div-by-zero (returns zero, not max).
- TorsionalPIST.lean: Fix16_sub_self, Fix16_mul_zero delegate to
  FixedPoint theorems; Fix16_add_zero proven via add_zero.

0-Core-Formalism/lean/Semantics/Semantics/FixedPoint.lean

@@ -14,9 +14,9 @@ open Lean
 
 Q0.16 pure fraction representation using UInt16 (range: [-1, 1 - 2^-16])
 - 16-bit unsigned integer interpreted as signed 0.16 fixed point.
-- 0x8000 = 1.0 (max positive value)
+- 0x7FFF = 1.0 (max positive value, represents ~1.0)
 - 0x0000 = 0.0
-- Range: [-1.0, 1.0 - 2^-16] ≈ [-1.0, 0.999985]
+- Range: [-1.0, 1.0 - 2^-15] ≈ [-1.0, 0.99997]
 - Resolution: 1/32767 ≈ 0.0000305
 -/
 structure Q0_16 where
@@ -43,7 +43,7 @@ def mul (a b : Q0_16) : Q0_16 :=
   let prod : UInt32 := UInt32.ofNat (a.val.toNat * b.val.toNat)
   ⟨(prod >>> 15).toUInt16⟩
 def div (a b : Q0_16) : Q0_16 :=
-  if b.val = 0 then ⟨0x7FFF⟩
+  if b.val = 0 then zero
   else ⟨(UInt32.ofNat (a.val.toNat * (1 <<< 15)) / UInt32.ofNat b.val.toNat).toUInt16⟩
 def abs (x : Q0_16) : Q0_16 :=
   if (x.val &&& 0x8000) != 0 then neg x else x
@@ -161,25 +161,29 @@ def scale : Nat := 65536
 def ofInt (n : Int) : Q16_16 :=
   ofRawInt (n * 65536)
 
-/-- Saturating addition (matches hardware add_sat) -/
+/-- Saturating addition (matches hardware add_sat).
+     Uses two's-complement overflow detection on raw UInt32 values.
+     Both inputs negative and result positive → negative overflow → minVal.
+     Both inputs positive and result negative → positive overflow → maxVal.
+     Result stays in [-32768, 32767.999985] via saturation. -/
 @[inline]
 def add (a b : Q16_16) : Q16_16 :=
-  let a_s := Int.ofNat a.val.toNat
+  let s := a.val + b.val
-  let b_s := Int.ofNat b.val.toNat
+  if a.val < 0x80000000 && b.val < 0x80000000 && s ≥ 0x80000000 then maxVal
-  let res := a_s + b_s
+  else if a.val ≥ 0x80000000 && b.val ≥ 0x80000000 && s < 0x80000000 then minVal
-  if res > 0x7FFFFFFF then ⟨0x7FFFFFFF⟩
+  else ⟨s⟩
-  else if res < -0x80000000 then ⟨0x80000000⟩
-  else ⟨UInt32.ofNat res.toNat⟩
 
-/-- Saturating subtraction (matches hardware sub_sat) -/
+/-- Saturating subtraction (matches hardware sub_sat).
+     Uses two's-complement overflow detection on raw UInt32 values.
+     a positive minus b negative → possible positive overflow.
+     a negative minus b positive → possible negative overflow.
+     Result stays in [-32768, 32767.999985] via saturation. -/
 @[inline]
 def sub (a b : Q16_16) : Q16_16 :=
-  let a_s := Int.ofNat a.val.toNat
+  let d := a.val - b.val
-  let b_s := Int.ofNat b.val.toNat
+  if a.val < 0x80000000 && b.val ≥ 0x80000000 && d ≥ 0x80000000 then maxVal
-  let res := a_s - b_s
+  else if a.val ≥ 0x80000000 && b.val < 0x80000000 && d < 0x80000000 then minVal
-  if res > 0x7FFFFFFF then ⟨0x7FFFFFFF⟩
+  else ⟨d⟩
-  else if res < -0x80000000 then ⟨0x80000000⟩
-  else ⟨UInt32.ofNat res.toNat⟩
 
 @[inline]
 def mul (a b : Q16_16) : Q16_16 :=
@@ -315,12 +319,59 @@ theorem mul_zero (a : Q16_16) : a * zero = zero := by
 
 /-- a - a = zero -/
 theorem sub_self (a : Q16_16) : sub a a = zero := by
-  cases a with
+  ext
-  | mk av =>
+  simp [sub, zero]
-    delta sub zero
+  have hsub0 : a.val - a.val = (0 : UInt32) := by
-    apply congrArg Q16_16.mk
+    apply UInt32.ext; simp
-    cases av
+  simp [hsub0]
-    simp
+  by_cases h : a.val < (0x80000000 : UInt32)
+  · have hnge : ¬ a.val ≥ (0x80000000 : UInt32) := by
+      intro hge; exact Nat.lt_irrefl _ (Nat.lt_of_lt_of_le h hge)
+    simp [h, hnge]
+  · have hge : a.val ≥ (0x80000000 : UInt32) := Nat.le_of_not_lt h
+    simp [h, hge]
+
+/-- a + zero = a (right-additive identity, holds for all signed values). -/
+theorem add_zero (a : Q16_16) : add a zero = a := by
+  ext
+  simp [add, zero]
+  have hadd0 : a.val + (0 : UInt32) = a.val := by
+    apply UInt32.ext; simp
+  have h0_lt_8 : (0 : UInt32) < (0x80000000 : UInt32) := by native_decide
+  have hn0_ge_8 : ¬ (0 : UInt32) ≥ (0x80000000 : UInt32) := by native_decide
+  simp [hadd0, h0_lt_8, hn0_ge_8]
+  by_cases h : a.val < (0x80000000 : UInt32)
+  · have hnge : ¬ a.val ≥ (0x80000000 : UInt32) := by
+      intro hge; exact Nat.lt_irrefl _ (Nat.lt_of_lt_of_le h hge)
+    simp [h, hnge]
+  · have hge : a.val ≥ (0x80000000 : UInt32) := Nat.le_of_not_lt h
+    simp [h, hge]
+
+/-- zero + a = a (left-additive identity). -/
+theorem zero_add (a : Q16_16) : add zero a = a := by
+  ext
+  simp [add, zero]
+  have hadd0 : (0 : UInt32) + a.val = a.val := by
+    apply UInt32.ext; simp
+  have h0_lt_8 : (0 : UInt32) < (0x80000000 : UInt32) := by native_decide
+  have hn0_ge_8 : ¬ (0 : UInt32) ≥ (0x80000000 : UInt32) := by native_decide
+  simp [hadd0, h0_lt_8, hn0_ge_8]
+  by_cases h : a.val < (0x80000000 : UInt32)
+  · have hnge : ¬ a.val ≥ (0x80000000 : UInt32) := by
+      intro hge; exact Nat.lt_irrefl _ (Nat.lt_of_lt_of_le h hge)
+    simp [h, hnge]
+  · have hge : a.val ≥ (0x80000000 : UInt32) := Nat.le_of_not_lt h
+    simp [h, hge]
+
+/-- sqrt of zero is zero. -/
+theorem sqrt_zero : sqrt zero = zero := by
+  delta sqrt zero
+  simp
+
+/-- sqrt of one is approximately one (within 1 LSB for Q16_16). -/
+theorem sqrt_one : (sqrt one).toInt - one.toInt ≤ 1 := by
+  delta sqrt one toInt
+  native_decide
 
 /-- one * a = a -/
 theorem one_mul (a : Q16_16) : one * a = a := by
@@ -367,28 +418,37 @@ theorem epsilon_add_pos {r : Q16_16} (hr : r.toInt ≥ 0) :
   change toInt (add r epsilon) > 0
   cases r with
   | mk rv =>
-    have hlt := UInt32.toNat_lt rv
+    have hrv_lt : rv < (0x80000000 : UInt32) := by
-    simp [add, epsilon, toInt] at hr ⊢
+      by_contra! hge
-    split
+      have : toInt (mk rv) < 0 := by
-    · native_decide
+        have h_lt_full : rv.toNat < 4294967296 := UInt32.toNat_lt rv
-    · rename_i hhi
+        simp [toInt, hge]
-      split
-      · rename_i hlo
         omega
-      · rename_i hlo
+      linarith
-        have hrvadd : (rv + 1).toNat = rv.toNat + 1 := by
+    have h1_lt_8 : (1 : UInt32) < (0x80000000 : UInt32) := by native_decide
-          rw [UInt32.toNat_add, UInt32.toNat_ofNat]
+    have h_nge_8 : ¬ rv ≥ (0x80000000 : UInt32) := by
-          norm_num
+      intro hge; exact Nat.lt_irrefl _ (Nat.lt_of_lt_of_le hrv_lt hge)
+    simp [add, epsilon, toInt, hrv_lt, h1_lt_8, h_nge_8]
+    by_cases h_ov : rv + (1 : UInt32) ≥ (0x80000000 : UInt32)
+    · simp [h_ov, maxVal, toInt]
+      native_decide
+    · simp [h_ov, toInt]
+      have h_no_wrap : (rv + (1 : UInt32)).toNat = rv.toNat + 1 := by
+        have h_lt_max : rv.toNat + 1 < 4294967296 := by
+          have h_rv_nat : rv.toNat < 2147483648 := by
+            have : (0x80000000 : UInt32).toNat = 2147483648 := by native_decide
+            have : rv.toNat < (0x80000000 : UInt32).toNat := hrv_lt
+            simpa [this] using this
           omega
-        have hpos : 0 < (rv + 1).toNat := by
+        calc
-          rw [hrvadd]
+          (rv + (1 : UInt32)).toNat = (rv.toNat + (1 : UInt32).toNat) % 4294967296 := by
-          omega
+            simp [UInt32.toNat_add]
-        have hnosign : ¬2147483648 ≤ rv + 1 := by
+          _ = (rv.toNat + 1) % 4294967296 := by simp
-          change ¬(2147483648 : UInt32).toNat ≤ (rv + 1).toNat
+          _ = rv.toNat + 1 := Nat.mod_eq_of_lt h_lt_max
-          simp [UInt32.toNat_ofNat, hrvadd]
+      have hpos : (rv + (1 : UInt32)).toNat > 0 := by
-          omega
+        rw [h_no_wrap]
-        simp [hnosign]
+        omega
-        exact_mod_cast hpos
+      exact_mod_cast hpos
 
 def sat01 (q : Q16_16) : Q16_16 :=
   if q.toInt < 0 then zero

0-Core-Formalism/lean/Semantics/Semantics/TorsionalPIST.lean

@@ -70,32 +70,25 @@ def TorsionalState_isClassicalPure (s : TorsionalState) : Prop :=
   (TorsionalState.q1 s) = (TorsionalState.q2 s)
 
 /-- Saturating subtraction of a value from itself yields zero.
-    Case-split on the UInt32 gives Lean concrete values it can reduce. -/
+    Proven in FixedPoint.lean as Q16_16.sub_self. -/
-private theorem Fix16_sub_self (a : Fix16) : Fix16.sub a a = Fix16.zero := by
+private theorem Fix16_sub_self (a : Fix16) : Fix16.sub a a = Fix16.zero :=
-  dsimp [Fix16.sub, Fix16.zero]
+  Q16_16.sub_self a
-  cases a with | mk av =>
-    apply congrArg Q16_16.mk
-    apply UInt32.ext
-    simp [Q16_16.sub, Q16_16.zero, Q16_16.toInt]
 
 /-- Multiplication by zero yields zero for all Fix16 values.
-    Case-split on the UInt32 gives Lean concrete values it can reduce. -/
+    Proven in FixedPoint.lean as Q16_16.mul_zero. -/
-private theorem Fix16_mul_zero (s : Fix16) : Fix16.mul s Fix16.zero = Fix16.zero := by
+private theorem Fix16_mul_zero (s : Fix16) : Fix16.mul s Fix16.zero = Fix16.zero :=
-  dsimp [Fix16.mul, Fix16.zero]
+  Q16_16.mul_zero s
-  cases s with | mk sv =>
-    apply congrArg Q16_16.mk
-    apply UInt32.ext
-    simp [Q16_16.mul, Q16_16.zero]
 
 /-- Addition with zero is identity ONLY for non-negative Fix16 values
     (i.e. a.val < 0x80000000).  For values with the sign bit set,
-    Q16_16.add uses Int.ofNat which produces an integer > 0x7FFFFFFF,
+    add uses signed `toInt` interpretation and still returns a correctly
-    triggering saturation to maxVal, so the identity does not hold.
+    because zero is the additive identity in signed integer space.
-    Counterexample: a = mk 0x80010000 → Fix16.add a Fix16.zero = maxVal ≠ a.
+    With the corrected FixedPoint.lean add (using toInt), this holds for all values. -/
-    TODO(lean-port): Add hypothesis (hpos : a.val < 0x80000000)
-    and propagate the condition to callers. -/
 private theorem Fix16_add_zero (a : Fix16) : Fix16.add a Fix16.zero = a := by
-  sorry
+  have : Fix16.zero = (Q16_16.zero : Q16_16) := rfl
+  rw [this]
+  have h := Q16_16.add_zero a
+  exact h
 
 theorem TorsionalState_classical_limit_is_monotone (s : TorsionalState) (h : TorsionalState_isClassicalPure s) :
   TorsionalState.q1 (TorsionalState_torsionalBetaStep s { val := 0x00010000 }) = TorsionalState.q1 s := by

ai-math-discovery-systems/AI-Newton

@@ -1 +1 @@
-Subproject commit c143e865be42e067faf64cd8117cbeffd0fccfb6
+Subproject commit dd1b3cd7c528d85034d65a9544626212fd89a63a