X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLOGIC%2FNTrack%2Fprops.ma;h=3fdd5de618fa0f1aadcdfaa115abf5671a29621b;hb=dcef667a444aa0f189225855c1433d26b65fb8b7;hp=fc57cf0062ae08cf0f9e1765d874a1c58d2e3340;hpb=4f1bd2790a4448a8ebfbe67eb8baa481c124745c;p=helm.git

diff --git a/helm/software/matita/contribs/LOGIC/NTrack/props.ma b/helm/software/matita/contribs/LOGIC/NTrack/props.ma
index fc57cf006..3fdd5de61 100644
--- a/helm/software/matita/contribs/LOGIC/NTrack/props.ma
+++ b/helm/software/matita/contribs/LOGIC/NTrack/props.ma
@@ -12,46 +12,52 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/LOGIC/Track/props".
 
-include "Insert/props.ma".
-include "Track/inv.ma".
 
-theorem track_weak: \forall R,p,P,Q,S,i. 
-                    Track P p S \to Insert R i P Q \to 
-                    \exists q. Track Q q S.
+include "Insert/props.ma".
+include "Track/defs.ma".
+include "NTrack/inv.ma".
+(*
+theorem ntrack_weak: \forall R,p,P,Q,S,i. 
+                     NTrack P p S \to Insert R i P Q \to 
+                     \exists q. NTrack Q q S.
  intros 2; elim p; clear p;
- [ lapply linear track_inv_lref to H as H0; decompose;
+ [ lapply linear ntrack_inv_lref to H as H0; decompose;
    lapply linear insert_trans to H, H1; decompose; autobatch
- | lapply linear track_inv_parx to H; subst; autobatch
- | lapply linear track_inv_impw to H1; decompose; subst;
+ | lapply linear ntrack_inv_parx to H; destruct; autobatch
+ | lapply linear ntrack_inv_impw to H1; decompose; destruct;
    lapply linear H to H4, H2; decompose; autobatch
- | lapply linear track_inv_impr to H1; decompose; subst;
+ | lapply linear ntrack_inv_impr to H1; decompose; destruct;
    lapply linear H to H4, H2; decompose; autobatch
- | lapply linear track_inv_impi to H3; decompose; subst;
+ | lapply linear ntrack_inv_impi to H3; decompose; destruct;
    lapply insert_conf to H4, H6; clear H6; decompose;
    lapply H to H9, H4; clear H H9; lapply linear H1 to H8, H4;
    lapply linear H2 to H7, H6; decompose; autobatch width = 4
- | lapply linear track_inv_scut to H2; decompose
+ | lapply linear ntrack_inv_scut to H2; decompose
  ]
 qed.
 
-theorem track_comp: \forall R,q,p,P,Q,S,i. 
-                    Track P p R \to Track Q q S \to Insert R i P Q \to
-                    \exists r. Track P r S.
+theorem ntrack_comp: \forall R,q,p,P,Q,S,i. 
+                     NTrack P p R \to NTrack Q q S \to Insert R i P Q \to
+                     \exists r. NTrack P r S.
  intros 2; elim q; clear q;
- [ lapply linear track_inv_lref to H1 as H0; decompose;
-   lapply linear insert_conf_rev_full to H1,H2; decompose; subst; autobatch
- | lapply linear track_inv_parx to H1; subst; autobatch
- | lapply linear track_inv_impw to H2; decompose; subst;
+ [ lapply linear ntrack_inv_lref to H1 as H0; decompose;
+   lapply linear insert_conf_rev_full to H1,H2; decompose; destruct; autobatch
+ | lapply linear ntrack_inv_parx to H1; destruct; autobatch
+ | lapply linear ntrack_inv_impw to H2; decompose; destruct;
    lapply linear H to H1, H5, H3; decompose; autobatch
- | lapply linear track_inv_impr to H2; decompose; subst;
+ | lapply linear ntrack_inv_impr to H2; decompose; destruct;
    lapply linear H to H1, H5, H3; decompose; autobatch
- | lapply linear track_inv_impi to H4; decompose; subst;
+ | lapply linear ntrack_inv_impi to H4; decompose; destruct;
    lapply insert_trans to H5, H7; clear H7; decompose;
-   lapply track_weak to H3, H6; decompose;
+   lapply ntrack_weak to H3, H6; decompose;
    lapply H to H3, H10, H5; clear H H10; lapply linear H1 to H3, H9, H5;
    lapply linear H2 to H4, H8, H7; decompose; autobatch width = 4
- | lapply linear track_inv_scut to H3; decompose
+ | lapply linear ntrack_inv_scut to H3; decompose
  ].
 qed.
+
+theorem ntrack_track: \forall R,p,P. NTrack P p R \to Track P p R.
+ intros; elim H names 0; clear H P p R; intros; autobatch width = 4.
+qed.
+*)