Skip to content

Conversation

@fingolfin
Copy link
Member

This is a rebased version of some changes in PR #2035. For an explanation, see there. My hope is that we can merge this ASAP into master, then immediately after cherry-pick it into master.

The changes in this branch should be cherry-picked into stable-4.9.

@fingolfin fingolfin added kind: bug Issues describing general bugs, and PRs fixing them topic: documentation Issues and PRs related to documentation labels Feb 5, 2018
@fingolfin fingolfin added this to the GAP 4.9.1 milestone Feb 5, 2018
@codecov
Copy link

codecov bot commented Feb 5, 2018

Codecov Report

Merging #2158 into master will increase coverage by 0.31%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2158      +/-   ##
==========================================
+ Coverage    69.7%   70.02%   +0.31%     
==========================================
  Files         482      482              
  Lines      254592   257653    +3061     
==========================================
+ Hits       177466   180411    +2945     
- Misses      77126    77242     +116
Impacted Files Coverage Δ
lib/grpffmat.gi 94.61% <100%> (+0.04%) ⬆️
lib/grplatt.gi 62.05% <100%> (+0.2%) ⬆️
src/listfunc.c 77.8% <0%> (-2.46%) ⬇️
src/objset.c 81.49% <0%> (-0.23%) ⬇️
src/stats.c 85.04% <0%> (-0.14%) ⬇️
lib/grppclat.gi 80.1% <0%> (+0.13%) ⬆️
src/hpc/threadapi.c 36.9% <0%> (+0.18%) ⬆️
src/scanner.c 87.37% <0%> (+0.2%) ⬆️
src/trans.c 98.96% <0%> (+0.23%) ⬆️
lib/meataxe.gi 82.63% <0%> (+0.23%) ⬆️
... and 5 more

Copy link
Contributor

@hulpke hulpke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy with doing this separately -- my PR is really just for me to indicate what should go in 4.9

lib/grp.gd Outdated
##
## <Description>
## These operations computes representatives of the conjugacy classes of
## The operation <C>LowIndexSubgroups</C> computes representatives of the
Copy link
Member

@olexandr-konovalov olexandr-konovalov Feb 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually GAPDoc recommends to use <Ref> inside <ManSection> even if it refers to the object documented in this ManSection: see example here:

https://github.com/frankluebeck/GAPDoc/blob/6108fcbca047c8b6484c512c3ba5c4bdd5bb8b7c/example/example.xml#L109-L118

GAPDoc will not expand the reference in this case. IIRC this is useful because if you copy and paste the text elsewhere, <Ref> will be there already, and also in case the manual layout will display <Ref> and <C> elements differently. Perhaps there are actually deeper reasons, which @frankluebeck may tell.

Same remark refers to LowLayerSubgroups below.

@frankluebeck
Copy link
Member

in case the manual layout will display and elements differently.

Yes, an output format could decide different layout for referenced functions/operations/... and for general code.

@fingolfin
Copy link
Member Author

So I can adjust the GAPDoc comments of course, no problem, just should warn that @hulpke will then have to deal with it when rebasing his PR on master -- though it shouldn't be a big issue, one of his commits will cause a conflict, but can then be skipped (via git rebase --skip).

@fingolfin fingolfin force-pushed the mh/hulpke-for-master branch from 120b0fa to 8dcfd26 Compare February 7, 2018 10:47
lib/grp.gd Outdated
## <Oper Name="LowIndexSubgroups"
## Arg='G, index'/>
## <Oper Name="LowIndexSubgroups" Arg='G, index'/>
## <Oper Name="LowLayerSubgroups" Arg='G, layer'/>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While looking into tweaking the GAPDoc, I realized that LowLayerSubgroups actually is a global function, not an operation. Moreover, it takes additional (optional) arguments, and already has an documentation comment in grplatt.gd (which also is in the manual).

Perhaps the plan was/is to turn LowLayerSubgroups into an operation? In any case, the change as it is in this PR right now does not seem correct... @hulpke ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this probably should just be replaced by a reference to LowLayerSubgroup (or the REF-syntax...). Do you want me to send you a replacement draft?

@fingolfin fingolfin force-pushed the mh/hulpke-for-master branch from 8dcfd26 to 9352b3b Compare February 8, 2018 20:44
as requested in gap-system#2131

Also added `LowLayerSubgroups` and minor rephrasing.

Also redid part of gap-system#683, as for some reason (probably my stupidity)
part of gap-system#683 had fallen out of master. Added it again.
@fingolfin
Copy link
Member Author

@hulpke I now updated the ref to LowLayerSubgroups in the documentation comment. Does it look OK to you?

@hulpke
Copy link
Contributor

hulpke commented Feb 9, 2018

@fingolfin Yes, its fine (and I think I know enough git to deal with the superfluous bits in the other PR as well once this is merged.)

@fingolfin fingolfin merged commit e755b88 into gap-system:master Feb 9, 2018
@fingolfin fingolfin deleted the mh/hulpke-for-master branch February 13, 2018 09:45
@fingolfin fingolfin added the release notes: added PRs introducing changes that have since been mentioned in the release notes label Mar 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind: bug Issues describing general bugs, and PRs fixing them release notes: added PRs introducing changes that have since been mentioned in the release notes topic: documentation Issues and PRs related to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants