new attempt

4 files changed, 45 insertions, 145 deletions

diff --git a/mathcomp/test_suite/output.v b/mathcomp/test_suite/output.v
index 706f15d..7e9def3 100644
--- a/mathcomp/test_suite/output.v
+++ b/mathcomp/test_suite/output.v
@@ -1,4 +1,4 @@
 From mathcomp Require Import all.
 
 Open Scope group_scope.
-About cyclic_pgroup_Aut_structure.
\ No newline at end of file
+Check @cyclic_pgroup_Aut_structure.
\ No newline at end of file
diff --git a/mathcomp/test_suite/output.v.out b/mathcomp/test_suite/output.v.out
index 122ddf0..4db5888 100644
--- a/mathcomp/test_suite/output.v.out
+++ b/mathcomp/test_suite/output.v.out
@@ -1,48 +1,45 @@
-cyclic_pgroup_Aut_structure :
-forall (gT : finGroupType) (p : nat) (G : {group gT}),
-p.-group G ->
-cyclic G ->
-G != 1 :> {set gT} ->
-let q := #|G| in
-let n := (logn p q).-1 in
-let A := Aut G in
-let P := 'O_p(A) in
-let F := 'O_p^'(A) in
-exists m : {perm gT} -> 'Z_q,
-  [/\ [/\ {in A & G, forall (a : {perm gT}) (x : gT), x ^+ m a = a x},
-          m 1 = 1%R /\ {in A &, {morph m : a b / a * b >-> (a * b)%R}},
-          {in A &, injective m} /\ [seq m x | x in A] =i GRing.unit,
-          forall k : nat, {in A, {morph m : a / a ^+ k >-> (a ^+ k)%R}}
-        & {in A, {morph m : a / a^-1 >-> (a^-1)%R}}],
-      [/\ abelian A, cyclic F, #|F| = p.-1
-        & [faithful F, on 'Ohm_1(G) | [Aut G]]]
-    & if n == 0
-      then A = F
-      else
-       exists t : perm_for_finType gT,
-         [/\ t \in A, #[t] = 2, m t = (-1)%R
-           & if odd p
-             then
-              [/\ cyclic A /\ cyclic P,
-                  exists s : perm_for_finType gT,
-                    [/\ s \in A, #[s] = (p ^ n)%N, m s = (p.+1%:R)%R
-                      & P = <[s]>]
-                & exists s0 : perm_for_finType gT,
-                    [/\ s0 \in A, #[s0] = p, m s0 = ((p ^ n).+1%:R)%R
-                      & 'Ohm_1(P) = <[s0]>]]
+cyclic_pgroup_Aut_structure
+     : forall (gT : finGroupType) (p : nat) (G : {group gT}),
+       p.-group G ->
+       cyclic G ->
+       G != 1 ->
+       let q := #|G| in
+       let n := (logn p q).-1 in
+       let A := Aut G in
+       let P := 'O_p(A) in
+       let F := 'O_p^'(A) in
+       exists m : {perm gT} -> 'Z_q,
+         [/\ [/\ {in A & G, forall (a : {perm gT}) (x : gT), x ^+ m a = a x},
+                 m 1 = 1%R /\ {in A &, {morph m : a b / a * b >-> (a * b)%R}},
+                 {in A &, injective m} /\ [seq m x | x in A] =i GRing.unit,
+                 forall k : nat,
+                 {in A, {morph m : a / a ^+ k >-> (a ^+ k)%R}}
+               & {in A, {morph m : a / a^-1 >-> (a^-1)%R}}],
+             [/\ abelian A, cyclic F, #|F| = p.-1
+               & [faithful F, on 'Ohm_1(G) | [Aut G]]]
+           & if n == 0
+             then A = F
              else
-              if n == 1
-              then A = <[t]>
-              else
-               exists s : perm_for_finType gT,
-                 [/\ s \in A, #[s] = (2 ^ n.-1)%N, 
-                    m s = (5%:R)%R, <[s]> \x <[t]> = A
-                   & exists s0 : perm_for_finType gT,
-                       [/\ s0 \in A, #[s0] = 2, m s0 = ((2 ^ n).+1%:R)%R,
-                           m (s0 * t) = ((2 ^ n).-1%:R)%R
-                         & 'Ohm_1(<[s]>) = <[s0]>]]]]
-
-Arguments gT, p, G are implicit
-Argument scopes are [_ nat_scope Group_scope _ _ _]
-cyclic_pgroup_Aut_structure is opaque
-Expands to: Constant mathcomp.solvable.extremal.cyclic_pgroup_Aut_structure
+              exists t : perm_for_finType gT,
+                [/\ t \in A, #[t] = 2, m t = (-1)%R
+                  & if odd p
+                    then
+                     [/\ cyclic A /\ cyclic P,
+                         exists s : perm_for_finType gT,
+                           [/\ s \in A, #[s] = (p ^ n)%N, m s = (p.+1%:R)%R
+                             & P = <[s]>]
+                       & exists s0 : perm_for_finType gT,
+                           [/\ s0 \in A, #[s0] = p, m s0 = ((p ^ n).+1%:R)%R
+                             & 'Ohm_1(P) = <[s0]>]]
+                    else
+                     if n == 1
+                     then A = <[t]>
+                     else
+                      exists s : perm_for_finType gT,
+                        [/\ s \in A, #[s] = (2 ^ n.-1)%N, 
+                           m s = (5%:R)%R, <[s]> \x <[t]> = A
+                          & exists s0 : perm_for_finType gT,
+                              [/\ s0 \in A, #[s0] = 2,
+                                  m s0 = ((2 ^ n).+1%:R)%R,
+                                  m (s0 * t) = ((2 ^ n).-1%:R)%R
+                                & 'Ohm_1(<[s]>) = <[s0]>]]]]
diff --git a/mathcomp/test_suite/output.v.out.8.12 b/mathcomp/test_suite/output.v.out.8.12
deleted file mode 100644
index bc5d3c8..0000000
--- a/mathcomp/test_suite/output.v.out.8.12
+++ /dev/null
@@ -1,48 +0,0 @@
-cyclic_pgroup_Aut_structure :
-forall [gT : finGroupType] [p : nat] [G : {group gT}],
-p.-group G ->
-cyclic G ->
-G != 1 :> {set gT} ->
-let q := #|G| in
-let n := (logn p q).-1 in
-let A := Aut G in
-let P := 'O_p(A) in
-let F := 'O_p^'(A) in
-exists m : {perm gT} -> 'Z_q,
-  [/\ [/\ {in A & G, forall (a : {perm gT}) (x : gT), x ^+ m a = a x},
-          m 1 = 1%R /\ {in A &, {morph m : a b / a * b >-> (a * b)%R}},
-          {in A &, injective m} /\ [seq m x | x in A] =i GRing.unit,
-          forall k : nat, {in A, {morph m : a / a ^+ k >-> (a ^+ k)%R}}
-        & {in A, {morph m : a / a^-1 >-> (a^-1)%R}}],
-      [/\ abelian A, cyclic F, #|F| = p.-1
-        & [faithful F, on 'Ohm_1(G) | [Aut G]]]
-    & if n == 0
-      then A = F
-      else
-       exists t : perm_for_finType gT,
-         [/\ t \in A, #[t] = 2, m t = (-1)%R
-           & if odd p
-             then
-              [/\ cyclic A /\ cyclic P,
-                  exists s : perm_for_finType gT,
-                    [/\ s \in A, #[s] = (p ^ n)%N, m s = (p.+1%:R)%R
-                      & P = <[s]>]
-                & exists s0 : perm_for_finType gT,
-                    [/\ s0 \in A, #[s0] = p, m s0 = ((p ^ n).+1%:R)%R
-                      & 'Ohm_1(P) = <[s0]>]]
-             else
-              if n == 1
-              then A = <[t]>
-              else
-               exists s : perm_for_finType gT,
-                 [/\ s \in A, #[s] = (2 ^ n.-1)%N, 
-                    m s = (5%:R)%R, <[s]> \x <[t]> = A
-                   & exists s0 : perm_for_finType gT,
-                       [/\ s0 \in A, #[s0] = 2, m s0 = ((2 ^ n).+1%:R)%R,
-                           m (s0 * t) = ((2 ^ n).-1%:R)%R
-                         & 'Ohm_1(<[s]>) = <[s0]>]]]]
-
-cyclic_pgroup_Aut_structure is not universe polymorphic
-Arguments cyclic_pgroup_Aut_structure [gT] [p]%nat_scope [G]%Group_scope
-cyclic_pgroup_Aut_structure is opaque
-Expands to: Constant mathcomp.solvable.extremal.cyclic_pgroup_Aut_structure
diff --git a/mathcomp/test_suite/output.v.out.8.13 b/mathcomp/test_suite/output.v.out.8.13
deleted file mode 100644
index 0546b70..0000000
--- a/mathcomp/test_suite/output.v.out.8.13
+++ /dev/null
@@ -1,49 +0,0 @@
-cyclic_pgroup_Aut_structure :
-forall [gT : finGroupType] [p : nat] [G : {group gT}],
-p.-group G ->
-cyclic G ->
-G != 1 :> {set gT} ->
-let q := #|G| in
-let n := (logn p q).-1 in
-let A := Aut G in
-let P := 'O_p(A) in
-let F := 'O_p^'(A) in
-exists m : {perm gT} -> 'Z_q,
-  [/\ [/\ {in A & G, forall (a : {perm gT}) (x : gT), x ^+ m a = a x},
-          m 1 = 1%R /\ {in A &, {morph m : a b / a * b >-> (a * b)%R}},
-          {in A &, injective m} /\ [seq m x | x in A] =i GRing.unit,
-          forall k : nat, {in A, {morph m : a / a ^+ k >-> (a ^+ k)%R}}
-        & {in A, {morph m : a / a^-1 >-> (a^-1)%R}}],
-      [/\ abelian A, cyclic F, #|F| = p.-1
-        & [faithful F, on 'Ohm_1(G) | [Aut G]]]
-    & if n == 0
-      then A = F
-      else
-       exists t : perm_for_finType gT,
-         [/\ t \in A, #[t] = 2, m t = (-1)%R
-           & if odd p
-             then
-              [/\ cyclic A /\ cyclic P,
-                  exists s : perm_for_finType gT,
-                    [/\ s \in A, #[s] = (p ^ n)%N, m s = (p.+1%:R)%R
-                      & P = <[s]>]
-                & exists s0 : perm_for_finType gT,
-                    [/\ s0 \in A, #[s0] = p, m s0 = ((p ^ n).+1%:R)%R
-                      & 'Ohm_1(P) = <[s0]>]]
-             else
-              if n == 1
-              then A = <[t]>
-              else
-               exists s : perm_for_finType gT,
-                 [/\ s \in A, #[s] = (2 ^ n.-1)%N, 
-                    m s = (5%:R)%R, <[s]> \x <[t]> = A
-                   & exists s0 : perm_for_finType gT,
-                       [/\ s0 \in A, #[s0] = 2, m s0 = ((2 ^ n).+1%:R)%R,
-                           m (s0 * t) = ((2 ^ n).-1%:R)%R
-                         & 'Ohm_1(<[s]>) = <[s0]>]]]]
-
-cyclic_pgroup_Aut_structure is not universe polymorphic
-Arguments cyclic_pgroup_Aut_structure [gT] [p]%nat_scope [G]%Group_scope _ _
-  _
-cyclic_pgroup_Aut_structure is opaque
-Expands to: Constant mathcomp.solvable.extremal.cyclic_pgroup_Aut_structure