@bramas/simulant-lean 0.1.0 → 0.1.1

package/Simulant/Exec.lean

@@ -4,7 +4,7 @@ import Simulant.Round
 # Executions, tasks and non-vacuity (plan, Sections 3.9, 3.10 and 5.2)
 
 Every execution permitted by the round is considered (no fairness on the
-adversary's choices), except that a semi-synchronous round only admits
+adversary's choices), except that semi-synchronous and sequential rounds only admit
 scheduler-fair executions: every agent that acts forever is activated
 infinitely often.
 -/
@@ -48,7 +48,7 @@ def Fair (e : Execution σ) : Prop :=
     ∀ n, ∃ j, n ≤ j ∧ a ∈ e.active j
 
 def Admissible (e : Execution σ) : Prop :=
-  m.Valid act0 init e ∧ (m.round = .ssync → Fair e)
+  m.Valid act0 init e ∧ (m.round ≠ .fsync → Fair e)
 
 /-- The correctness statement: every admissible execution satisfies the goal. -/
 def Correct (verdict : Config σ → Verdict) (goal : Goal) : Prop :=
@@ -144,7 +144,7 @@ theorem toExecution_valid (m : Model σ) (act0 : σ.A) (init : ND (Config σ)) (
 theorem hasExecution (m : Model σ) (act0 : σ.A) (init : ND (Config σ)) (l : Lasso σ)
     (hround : m.round = .fsync) (hv : l.Valid m act0) (hinit : ND.Can init l.start) :
     m.HasExecution act0 init :=
-  ⟨l.toExecution hv.1, toExecution_valid m act0 init l hv hinit, fun h => by rw [hround] at h; cases h⟩
+  ⟨l.toExecution hv.1, toExecution_valid m act0 init l hv hinit, fun h => False.elim (h hround)⟩
 
 end Lasso
 end Simulant

package/Simulant/NonVacuity.lean

@@ -65,6 +65,11 @@ theorem activate_total (C : Config σ) : ∃ a, ND.Can (m.activate C) a := by
       refine ⟨[x], ND.can_choose.2 ?_⟩
       simp only [nonemptySubsets, List.mem_flatMap, List.mem_range]
       exact ⟨0, List.length_pos_of_mem hx, by rw [combos_one]; exact List.mem_map_of_mem hx⟩
+  · split
+    · exact ⟨_, ND.can_pure.2 rfl⟩
+    · rename_i h
+      obtain ⟨x, hx⟩ := List.exists_mem_of_ne_nil _ (fun he => h (List.isEmpty_iff.2 he))
+      exact ⟨[x], ND.can_choose.2 (List.mem_map_of_mem hx)⟩
 
 omit [FlagSet σ.F] in
 theorem frames_ne_nil (a : Agent σ) : m.frames a ≠ [] := by
@@ -127,7 +132,7 @@ theorem hasExecution (init : ND (Config σ)) (hround : m.round = .fsync) (hinit
   refine ⟨⟨config, fun n => (next (config n)).1, fun n => (next (config n)).2.1⟩, ⟨?_, fun n => ?_⟩, ?_⟩
   · exact Classical.choose_spec hinit
   · exact Classical.choose_spec (Classical.choose_spec (Classical.choose_spec (htot (config n))))
-  · intro h; rw [hround] at h; cases h
+  · intro h; exact False.elim (h hround)
 
 end Model
 end Simulant

package/Simulant/Round.lean

@@ -140,7 +140,7 @@ inductive FrameModel (σ : Sig) where
   | persistent (get : σ.X → Bool)
 
 inductive RoundKind where
-  | fsync | ssync
+  | fsync | ssync | sequential
 deriving DecidableEq, Repr
 
 structure Model (σ : Sig) where
@@ -196,12 +196,13 @@ namespace Model
 
 variable [FlagSet σ.F] (m : Model σ)
 
-/-- FSYNC activates every agent that acts; SSYNC lets the adversary choose a nonempty set of them. -/
+/-- FSYNC: all eligible agents; SSYNC: a nonempty subset; sequential: a singleton. -/
 def activate (C : Config σ) : ND (List (Fin σ.k)) :=
   let eligible := (List.finRange σ.k).filter fun i => FlagSet.acts C.agents[i].flags != .never
   match m.round with
   | .fsync => pure eligible
   | .ssync => if eligible.isEmpty then pure eligible else ND.choose "activation" (nonemptySubsets eligible)
+  | .sequential => if eligible.isEmpty then pure eligible else ND.choose "activation" (eligible.map ([·]))
 
 def frames (a : Agent σ) : List Bool :=
   match m.frame with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bramas/simulant-lean",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Lean semantic core and generated component library for Simulant",
   "license": "CECILL-B",
   "private": false,