Make the fully nonpreemptive model hypothesis more explicit

analysis/facts/preemption/rtc_threshold/nonpreemptive.v

 Require Export prosa.analysis.facts.preemption.job.nonpreemptive.
-
-(** Furthermore, we assume the fully non-preemptive task model. *)
 Require Import prosa.model.preemption.fully_nonpreemptive.
 Require Import prosa.model.task.preemption.fully_nonpreemptive.
  
@@ -10,6 +8,10 @@ Require Import prosa.model.task.preemption.fully_nonpreemptive.
     indeed defines a valid run-to-completion threshold function. *)
 Section TaskRTCThresholdFullyNonPreemptive.
 
+  (** We assume the fully non-preemptive task model. *)
+  #[local] Existing Instance fully_nonpreemptive_model.
+  #[local] Existing Instance fully_nonpreemptive.
+
   (** Consider any type of tasks ... *)
   Context {Task : TaskType}. 
   Context `{TaskCost Task}.

analysis/facts/preemption/task/nonpreemptive.v

 Require Export prosa.analysis.facts.preemption.job.nonpreemptive.
-
-(** Furthermore, we assume the fully non-preemptive task model. *)
 Require Import prosa.model.preemption.fully_nonpreemptive.
 Require Import prosa.model.task.preemption.fully_nonpreemptive.
 
@@ -11,6 +9,10 @@ Require Import prosa.model.task.preemption.fully_nonpreemptive.
     bounded non-preemptive regions. *)
 Section FullyNonPreemptiveModel.
 
+  (** We assume the fully non-preemptive task model. *)
+  #[local] Existing Instance fully_nonpreemptive_model.
+  #[local] Existing Instance fully_nonpreemptive.
+
   (** Consider any type of tasks ... *)
   Context {Task : TaskType}.
   Context `{TaskCost Task}.

model/task/preemption/fully_nonpreemptive.v

@@ -13,10 +13,8 @@ Section FullyNonPreemptiveModel.
   (** In the fully non-preemptive model, no job can be preempted until its
       completion. The maximal non-preemptive segment of a job [j] has length
       [job_cost j], which is bounded by [task_cost tsk].*)
-  Global Program Instance fully_nonpreemptive_model : TaskMaxNonpreemptiveSegment Task :=
-    {
-      task_max_nonpreemptive_segment (tsk : Task) := task_cost tsk
-    }.
+  Definition fully_nonpreemptive_model : TaskMaxNonpreemptiveSegment Task :=
+    fun tsk : Task => task_cost tsk.
 
 End FullyNonPreemptiveModel.
 
@@ -33,9 +31,7 @@ Section TaskRTCThresholdFullyNonPreemptive.
       completion. In other words, once a job starts running, it is guaranteed
       to finish. Thus, we can set the task-level run-to-completion threshold
       to ε. *)
-  Global Program Instance fully_nonpreemptive : TaskRunToCompletionThreshold Task :=
-    {
-      task_rtct (tsk : Task) := ε
-    }.
+  Definition fully_nonpreemptive : TaskRunToCompletionThreshold Task :=
+    fun tsk : Task => ε.
 
 End TaskRTCThresholdFullyNonPreemptive.