Skip to content
GitLab
Commit bba4d359 authored by BOLDO Sylvie's avatar BOLDO Sylvie
Browse files

Still WIP renaming

parent db75d6e5
Hide whitespace changes
Inline Side-by-side
examples/Average.v
View file @ bba4d359
......@@ -759,7 +759,7 @@ Qed.
Lemma average1_correct_weak1: Rabs (av -a) <= /2*ulp_flt a.
Proof with auto with typeclass_instances.
rewrite average1_correct.
apply ulp_half_error...
apply error_le_half_ulp...
Qed.
Lemma average1_correct_weak2: Rabs (av -a) <= 3/2*ulp_flt a.
......@@ -1537,7 +1537,7 @@ rewrite L, Rplus_0_l; assumption.
(* . initial lemma *)
assert (Y:(Rabs (round_flt (v - u) - (v-u)) <= ulp_flt b)).
apply Rle_trans with (/2*ulp_flt (v-u)).
apply ulp_half_error...
apply error_le_half_ulp...
apply Rmult_le_reg_l with 2.
now auto with real.
rewrite <- Rmult_assoc, Rinv_r, Rmult_1_l.
......@@ -1587,7 +1587,7 @@ apply Rle_trans with (1:=Rabs_triang _ _).
apply Rle_trans with (ulp_flt b+/2*ulp_flt b);[idtac|right; field].
apply Rplus_le_compat.
apply Rle_trans with (/2*ulp_flt (u + round_flt (v - u) / 2)).
apply ulp_half_error...
apply error_le_half_ulp...
apply Rmult_le_reg_l with 2.
auto with real.
rewrite <- Rmult_assoc, Rinv_r, Rmult_1_l.
......@@ -1670,7 +1670,7 @@ replace (u + round_flt ((v-u) / 2)) with (b+((round_flt ((v-u) / 2) - (v-u)/2)))
pose (eps:=(round_flt ((v - u) / 2) - (v - u) / 2)%R); fold eps.
assert (Rabs eps <= /2*bpow emin).
unfold eps.
apply Rle_trans with (1:=ulp_half_error _ _ _ _)...
apply Rle_trans with (1:=error_le_half_ulp _ _ _ _)...
right; apply f_equal.
apply ulp_FLT_small...
rewrite Zplus_comm; apply Rle_lt_trans with (2:=H1).
......@@ -1688,7 +1688,7 @@ replace (round_flt (b + eps) - b) with ((round_flt (b+eps) -(b+eps)) + eps) by r
apply Rle_trans with (1:=Rabs_triang _ _).
apply Rle_trans with (/2*ulp_flt (b+eps) + /2*bpow emin).
apply Rplus_le_compat.
apply ulp_half_error...
apply error_le_half_ulp...
assumption.
apply Rmult_le_reg_l with 2.
now auto with real.
......
examples/Double_round_beta_odd.v
View file @ bba4d359
......@@ -596,7 +596,7 @@ destruct (Zle_or_lt (fexp1 ex) (fexp2 ex)) as [H2|H2].
now rewrite Zr2, round_0; [|apply valid_rnd_N]. }
(* r2 <> 0 *)
assert (B1 : Rabs (r2 - x) <= / 2 * ulp beta fexp2 x);
[now apply ulp_half_error|].
[now apply error_le_half_ulp|].
rewrite ulp_neq_0 in B1; try now apply Rgt_not_eq.
unfold round, F2R, scaled_mantissa, canonic_exp; simpl.
apply (Rmult_eq_reg_r (bpow (- fexp1 (ln_beta r2))));
......@@ -2120,7 +2120,7 @@ destruct (Zle_or_lt (fexp1 ex) (fexp2 ex)) as [H2|H2].
now rewrite Zr2, round_0; [|apply valid_rnd_N]. }
(* r2 <> 0 *)
assert (B1 : Rabs (r2 - x) <= / 2 * ulp beta fexp2 x);
[now apply ulp_half_error|].
[now apply error_le_half_ulp|].
unfold round, F2R, scaled_mantissa, canonic_exp; simpl.
apply (Rmult_eq_reg_r (bpow (- fexp1 (ln_beta r2))));
[|now apply Rgt_not_eq, bpow_gt_0].
......
src/Appli/Fappli_double_round.v
View file @ bba4d359
......@@ -74,7 +74,7 @@ assert (Hx2 : x - round beta fexp1 Zfloor x
set (x'' := round beta fexp2 (Znearest choice2) x).
assert (Hr1 : Rabs (x'' - x) <= / 2 * bpow (fexp2 (ln_beta x))).
apply Rle_trans with (/ 2 * ulp beta fexp2 x).
now unfold x''; apply ulp_half_error...
now unfold x''; apply error_le_half_ulp...
rewrite ulp_neq_0;[now right|now apply Rgt_not_eq].
assert (Pxx' : 0 <= x - x').
{ apply Rle_0_minus.
......@@ -332,7 +332,7 @@ set (x'' := round beta fexp2 (Znearest choice2) x).
intros Hx1 Hx2.
assert (Hr1 : Rabs (x'' - x) <= / 2 * bpow (fexp2 (ln_beta x))).
apply Rle_trans with (/2* ulp beta fexp2 x).
now unfold x''; apply ulp_half_error...
now unfold x''; apply error_le_half_ulp...
rewrite ulp_neq_0;[now right|now apply Rgt_not_eq].
assert (Px'x : 0 <= x' - x).
{ apply Rle_0_minus.
......@@ -436,7 +436,7 @@ assert (Hx''pow : x'' = bpow (ln_beta x)).
{ apply Rle_lt_trans with (x + / 2 * ulp beta fexp2 x).
- apply (Rplus_le_reg_r (- x)); ring_simplify.
apply Rabs_le_inv.
apply ulp_half_error.
apply error_le_half_ulp.
exact Vfexp2.
- apply Rplus_lt_compat_r.
rewrite <- Rabs_right at 1; [|now apply Rle_ge; apply Rlt_le].
......@@ -462,7 +462,7 @@ assert (Hx''pow : x'' = bpow (ln_beta x)).
assert (Hr : Rabs (x - x'') < / 2 * ulp beta fexp1 x).
{ apply Rle_lt_trans with (/ 2 * ulp beta fexp2 x).
- rewrite Rabs_minus_sym.
apply ulp_half_error.
apply error_le_half_ulp.
exact Vfexp2.
- apply Rmult_lt_compat_l; [lra|].
rewrite 2!ulp_neq_0; try now apply Rgt_not_eq.
......@@ -2814,7 +2814,7 @@ destruct (Req_dec a 0) as [Za|Nza].
+ now apply Rle_trans with x.
Qed.
(* --> Fcore_Raux *)
(* TODO --> Fcore_Raux *)
Lemma sqrt_neg : forall x, x <= 0 -> sqrt x = 0.
Proof.
intros x Npx.
......@@ -3694,7 +3694,7 @@ split.
replace (bpow _) with (bpow (ln_beta x) - / 2 * u2 + / 2 * u2) by ring.
apply Rplus_lt_le_compat; [exact Hx|].
apply Rabs_le_inv.
now apply ulp_half_error.
now apply error_le_half_ulp.
Qed.
Lemma double_round_all_mid_cases :
......
src/Core/Fcore_ulp.v
View file @ bba4d359
......@@ -919,7 +919,7 @@ rewrite ulp_neq_0; trivial.
apply bpow_gt_0.
Qed.
Theorem id_lt_succ : (* TODO succ_gt_id *)
Theorem succ_gt_id :
forall x, (x <> 0)%R ->
(x < succ x)%R.
Proof.
......@@ -943,18 +943,18 @@ Proof.
intros x Zx; unfold pred.
pattern x at 2; rewrite <- (Ropp_involutive x).
apply Ropp_lt_contravar.
apply id_lt_succ.
apply succ_gt_id.
now auto with real.
Qed.
Theorem id_le_succ :(* TODO succ_ge_id *)
Theorem succ_ge_id :
forall x, (x <= succ x)%R.
Proof.
intros x; case (Req_dec x 0).
intros V; rewrite V.
unfold succ; rewrite Rle_bool_true;[idtac|now right].
rewrite Rplus_0_l; apply ulp_ge_0.
intros; left; now apply id_lt_succ.
intros; left; now apply succ_gt_id.
Qed.
......@@ -964,7 +964,7 @@ Proof.
intros x; unfold pred.
pattern x at 2; rewrite <- (Ropp_involutive x).
apply Ropp_le_contravar.
apply id_le_succ.
apply succ_ge_id.
Qed.
......@@ -1391,7 +1391,7 @@ now apply Ropp_lt_contravar.
Qed.
Theorem succ_lt_le: (* TODO lt_succ_le *)
Theorem lt_succ_le:
forall x y,
F x -> F y -> (y <> 0)%R ->
(x <= y)%R ->
......@@ -1401,10 +1401,10 @@ intros x y Fx Fy Zy Hxy.
case (Rle_or_lt (succ y) x); trivial; intros H.
absurd (succ y = y)%R.
apply Rgt_not_eq.
now apply id_lt_succ.
now apply succ_gt_id.
apply Rle_antisym.
now apply Rle_trans with x.
apply id_le_succ.
apply succ_ge_id.
Qed.
......@@ -1417,7 +1417,7 @@ rewrite succ_eq_pos.
now apply pred_pos_plus_ulp.
Qed.
Theorem succ_pred_aux_0 : (pred (succ 0)=0)%R. (* TODO pred_succ_aux_0 *)
Theorem pred_succ_aux_0 : (pred (succ 0)=0)%R.
Proof.
unfold succ; rewrite Rle_bool_true.
2: apply Rle_refl.
......@@ -1523,7 +1523,7 @@ destruct Hx as [Hx|Hx].
now apply succ_pred_aux.
rewrite <- Hx.
rewrite pred_eq_opp_succ_opp, succ_opp, Ropp_0.
rewrite succ_pred_aux_0; ring.
rewrite pred_succ_aux_0; ring.
rewrite pred_eq_opp_succ_opp, succ_opp.
rewrite pred_succ_aux.
ring.
......@@ -1538,7 +1538,7 @@ case (Rle_or_lt 0 x); intros Hx.
destruct Hx as [Hx|Hx].
now apply pred_succ_aux.
rewrite <- Hx.
apply succ_pred_aux_0.
apply pred_succ_aux_0.
rewrite succ_eq_opp_pred_opp, pred_opp.
rewrite succ_pred_aux.
ring.
......@@ -1549,7 +1549,8 @@ Qed.
(** Error of a rounding, expressed in number of ulps *)
(** false for x=0 in the FLX format *)
Theorem ulp_error : (* TODO error_lt_ulp *)
(* was ulp_error *)
Theorem error_lt_ulp :
forall rnd { Zrnd : Valid_rnd rnd } x,
(x <> 0)%R ->
(Rabs (round beta fexp rnd x - x) < ulp x)%R.
......@@ -1595,7 +1596,8 @@ apply Rle_0_minus.
apply round_UP_pt...
Qed.
Theorem ulp_error_le : (* TODO error_le_ulp *)
(* was ulp_error_le *)
Theorem error_le_ulp :
forall rnd { Zrnd : Valid_rnd rnd } x,
(Rabs (round beta fexp rnd x - x) <= ulp x)%R.
Proof with auto with typeclass_instances.
......@@ -1605,10 +1607,11 @@ intros Zx; rewrite Zx, round_0...
unfold Rminus; rewrite Rplus_0_l, Ropp_0, Rabs_R0.
apply ulp_ge_0.
intros Zx; left.
now apply ulp_error.
now apply error_lt_ulp.
Qed.
Theorem ulp_half_error :(* TODO error_le_half_ulp *)
(* was ulp_half_error *)
Theorem error_le_half_ulp :
forall choice x,
(Rabs (round beta fexp (Znearest choice) x - x) <= /2 * ulp x)%R.
Proof with auto with typeclass_instances.
......@@ -1676,7 +1679,7 @@ apply Rlt_irrefl.
now apply Rgt_not_eq.
Qed.
Theorem negligible_exp_None: (* TODO round_neq_0_negligible_exp *)
Theorem round_neq_0_negligible_exp:
negligible_exp=None -> forall rnd { Zrnd : Valid_rnd rnd } x,
(x <> 0)%R -> (round beta fexp rnd x <> 0)%R.
Proof with auto with typeclass_instances.
......@@ -1694,7 +1697,8 @@ Qed.
(** allows rnd x to be 0 *)
Theorem ulp_error_f : (* TODO error_lt_ulp_round *)
(* was ulp_error_f *)
Theorem error_lt_ulp_round :
forall { Hm : Monotone_exp fexp } rnd { Zrnd : Valid_rnd rnd } x,
( x <> 0)%R ->
(Rabs (round beta fexp rnd x - x) < ulp (round beta fexp rnd x))%R.
......@@ -1726,7 +1730,7 @@ now left.
(* . 0 < round Zfloor x *)
intros Hx2.
apply Rlt_le_trans with (ulp x).
apply ulp_error...
apply error_lt_ulp...
now apply Rgt_not_eq.
rewrite <- ulp_DN; trivial.
apply ulp_le_pos.
......@@ -1776,7 +1780,7 @@ apply generic_format_bpow.
now apply valid_exp.
(* .. round up *)
apply Rlt_le_trans with (ulp x).
apply ulp_error...
apply error_lt_ulp...
now apply Rgt_not_eq.
apply ulp_le_pos.
now left.
......@@ -1784,7 +1788,8 @@ apply round_UP_pt...
Qed.
(** allows both x and rnd x to be 0 *)
Theorem ulp_half_error_f :(* TODO error_le_half_ulp_round *)
(* was ulp_half_error_f *)
Theorem error_le_half_ulp_round :
forall { Hm : Monotone_exp fexp },
forall choice x,
(Rabs (round beta fexp (Znearest choice) x - x) <= /2 * ulp (round beta fexp (Znearest choice) x))%R.
......@@ -1793,10 +1798,10 @@ intros Hm choice x.
case (Req_dec (round beta fexp (Znearest choice) x) 0); intros Hfx.
(* *)
case (Req_dec x 0); intros Hx.
apply Rle_trans with (1:=ulp_half_error _ _).
apply Rle_trans with (1:=error_le_half_ulp _ _).
rewrite Hx, round_0...
right; ring.
generalize (ulp_half_error choice x).
generalize (error_le_half_ulp choice x).
rewrite Hfx.
unfold Rminus; rewrite Rplus_0_l, Rabs_Ropp.
intros N.
......@@ -1804,7 +1809,7 @@ unfold ulp; rewrite Req_bool_true; trivial.
case negligible_exp_spec'.
intros (H1,H2).
contradict Hfx.
apply negligible_exp_None...
apply round_neq_0_negligible_exp...
intros (n,(H1,Hn)); rewrite H1.
apply Rle_trans with (1:=N).
right; apply f_equal.
......@@ -1823,7 +1828,7 @@ right; rewrite Hfx; unfold Rminus; rewrite Rplus_0_l.
apply sym_eq, Rabs_Ropp.
apply Rlt_le_trans with (ulp 0).
rewrite <- Hfx.
apply ulp_error_f...
apply error_lt_ulp_round...
unfold ulp; rewrite Req_bool_true, H1; trivial.
now right.
(* *)
......@@ -1833,10 +1838,10 @@ case (Rle_or_lt 0 (round beta fexp Zfloor x)).
intros H; destruct H.
rewrite Hx at 2.
rewrite ulp_DN; trivial.
apply ulp_half_error.
apply error_le_half_ulp.
rewrite Hx in Hfx; contradict Hfx; auto with real.
intros H.
apply Rle_trans with (1:=ulp_half_error _ _).
apply Rle_trans with (1:=error_le_half_ulp _ _).
apply Rmult_le_compat_l.
auto with real.
apply ulp_le.
......@@ -1852,7 +1857,7 @@ now left.
(* . *)
case (Rle_or_lt 0 (round beta fexp Zceil x)).
intros H; destruct H.
apply Rle_trans with (1:=ulp_half_error _ _).
apply Rle_trans with (1:=error_le_half_ulp _ _).
apply Rmult_le_compat_l.
auto with real.
apply ulp_le_pos; trivial.
......@@ -1872,7 +1877,7 @@ pattern x at 1 2; rewrite <- Ropp_involutive.
rewrite round_N_opp.
unfold Rminus.
rewrite <- Ropp_plus_distr, Rabs_Ropp.
apply ulp_half_error.
apply error_le_half_ulp.
rewrite round_DN_opp; apply Ropp_0_gt_lt_contravar; apply Rlt_gt; assumption.
Qed.
......@@ -1964,7 +1969,7 @@ unfold succ; rewrite Rle_bool_true;[idtac|now right].
rewrite Rplus_0_l; unfold ulp; rewrite Req_bool_true; trivial.
case negligible_exp_spec'.
intros (H1,H2).
contradict Zx; apply negligible_exp_None...
contradict Zx; apply round_neq_0_negligible_exp...
intros L; apply Fx; rewrite L; apply generic_format_0.
intros (n,(H1,Hn)); rewrite H1.
case (Rle_or_lt (- bpow (fexp n)) (round beta fexp Zfloor x)); trivial; intros K.
......@@ -2053,12 +2058,12 @@ Proof with auto with typeclass_instances.
intros choice u v Fu H.
(* . *)
assert (V: ((succ u = 0 /\ u = 0) \/ u < succ u)%R).
specialize (id_le_succ u); intros P; destruct P as [P|P].
specialize (succ_ge_id u); intros P; destruct P as [P|P].
now right.
case (Req_dec u 0); intros Zu.
left; split; trivial.
now rewrite <- P.
right; now apply id_lt_succ.
right; now apply succ_gt_id.
(* *)
destruct V as [(V1,V2)|V].
rewrite V2; apply round_le_generic...
......
src/Prop/Fprop_div_sqrt_error.v
View file @ bba4d359
......@@ -135,7 +135,7 @@ now apply Rabs_pos_lt.
rewrite Rabs_Ropp.
replace (bpow (Fexp fr)) with (ulp beta (FLX_exp prec) (F2R fr)).
rewrite <- Hr1.
apply ulp_error_f...
apply error_lt_ulp_round...
apply Rmult_integral_contrapositive_currified; try apply Rinv_neq_0_compat; assumption.
rewrite ulp_neq_0.
2: now rewrite <- Hr1.
......@@ -249,7 +249,7 @@ apply Rmult_le_compat_r.
apply Rabs_pos.
apply Rle_trans with (/2*ulp beta (FLX_exp prec) (F2R fr))%R.
rewrite <- Hr1.
apply ulp_half_error_f...
apply error_le_half_ulp_round...
right; rewrite ulp_neq_0.
2: now rewrite <- Hr1.
apply f_equal.
......
src/Prop/Fprop_mult_error.v
View file @ bba4d359
......@@ -126,7 +126,7 @@ apply Zplus_le_compat_r.
rewrite ln_beta_unique with (1 := Hexy).
apply ln_beta_le_bpow with (1 := Hz).
replace (bpow (exy - prec)) with (ulp beta (FLX_exp prec) (x * y)).
apply ulp_error...
apply error_lt_ulp...
rewrite ulp_neq_0; trivial.
unfold canonic_exp.
now rewrite ln_beta_unique with (1 := Hexy).
......
src/Prop/Fprop_relative.v
View file @ bba4d359
......@@ -119,7 +119,7 @@ assert (Hx': (x <> 0)%R).
intros T; contradict Hx; rewrite T, Rabs_R0.
apply Rlt_not_le, bpow_gt_0.
apply Rlt_le_trans with (ulp beta fexp x)%R.
now apply ulp_error...
now apply error_lt_ulp...
rewrite ulp_neq_0; trivial.
unfold canonic_exp.
destruct (ln_beta beta x) as (ex, He).
......@@ -200,7 +200,7 @@ assert (Hx': (x <> 0)%R).
intros T; contradict Hx; rewrite T, Rabs_R0.
apply Rlt_not_le, bpow_gt_0.
apply Rlt_le_trans with (ulp beta fexp x)%R.
now apply ulp_error.
now apply error_lt_ulp.
rewrite ulp_neq_0; trivial.
unfold canonic_exp.
destruct (ln_beta beta x) as (ex, He).
......@@ -255,7 +255,7 @@ Theorem relative_error_N :
Proof.
intros x Hx.
apply Rle_trans with (/2 * ulp beta fexp x)%R.
now apply ulp_half_error.
now apply error_le_half_ulp.
rewrite Rmult_assoc.
apply Rmult_le_compat_l.
apply Rlt_le.
......@@ -347,7 +347,7 @@ Theorem relative_error_N_round :
Proof with auto with typeclass_instances.
intros Hp x Hx.
apply Rle_trans with (/2 * ulp beta fexp x)%R.
now apply ulp_half_error.
now apply error_le_half_ulp.
rewrite Rmult_assoc.
apply Rmult_le_compat_l.
apply Rlt_le.
......@@ -682,7 +682,7 @@ auto with real.
apply bpow_ge_0.
split.
apply Rle_trans with (/2*ulp beta (FLT_exp emin prec) x)%R.
apply ulp_half_error.
apply error_le_half_ulp.
now apply FLT_exp_valid.
apply Rmult_le_compat_l; auto with real.
rewrite ulp_neq_0.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment