Opened 7 years ago
Closed 7 years ago
#16356 closed enhancement (fixed)
MOLS for n=18,57,154,276,298,342
Reported by: | ncohen | Owned by: | |
---|---|---|---|
Priority: | major | Milestone: | sage-6.3 |
Component: | combinatorial designs | Keywords: | |
Cc: | vdelecroix, knsam, dimpase, brett | Merged in: | |
Authors: | Nathann Cohen | Reviewers: | Vincent Delecroix |
Report Upstream: | N/A | Work issues: | |
Branch: | 917dd5c (Commits) | Commit: | 917dd5c6a970b8b7b5caa7eae821124770c3c4e5 |
Dependencies: | #16295 | Stopgaps: |
Description
As usual, those were given by Julian R. Abel. Whose mind is filled with combinatorial designs.
Nathann
Change History (29)
comment:1 Changed 7 years ago by
- Branch set to u/ncohen/16356
- Dependencies set to #16295
- Status changed from new to needs_review
- Summary changed from MOLS for to MOLS for n=18,57,154,276,298,342
comment:2 Changed 7 years ago by
- Commit set to f9690032a77345bd0d370a3099503574fbf6c96e
comment:3 Changed 7 years ago by
- Component changed from combinatorics to combinatorial designs
comment:4 follow-up: ↓ 5 Changed 7 years ago by
- Reviewers set to Vincent Delecroix
- Status changed from needs_review to positive_review
Hi Nathann,
this is an easy one...
Vincent
comment:5 in reply to: ↑ 4 Changed 7 years ago by
Yo !
this is an easy one...
Ahahah. I just added #16430 which does a couple of trivial things too...
Nathann
comment:6 Changed 7 years ago by
- Branch changed from u/ncohen/16356 to f9690032a77345bd0d370a3099503574fbf6c96e
- Resolution set to fixed
- Status changed from positive_review to closed
comment:7 follow-up: ↓ 14 Changed 7 years ago by
- Commit f9690032a77345bd0d370a3099503574fbf6c96e deleted
Volker I'm sorry but this ticket has an unreviewed dependency..... :-/
Nathann
comment:8 Changed 7 years ago by
(and I never meant to remove the commit)
comment:9 Changed 7 years ago by
(and apparently I cannot set it back, filling the form changes nothing)
comment:10 Changed 7 years ago by
- Resolution fixed deleted
- Status changed from closed to new
comment:11 Changed 7 years ago by
- Branch changed from f9690032a77345bd0d370a3099503574fbf6c96e to u/ncohen/16356
- Commit set to f9690032a77345bd0d370a3099503574fbf6c96e
comment:12 Changed 7 years ago by
Please don't set tickets to positive review that you don't want merged
comment:13 Changed 7 years ago by
- Status changed from new to needs_review
comment:14 in reply to: ↑ 7 Changed 7 years ago by
Replying to ncohen:
Volker I'm sorry but this ticket has an unreviewed dependency.....
:-/
This is my mistake. I am very sorry. (this is some rest of the old mercurial workflow)
comment:15 Changed 7 years ago by
Ok. I rebased on the new #16295 at public/16295.
Please Nathann have a quick look.
comment:16 Changed 7 years ago by
What did you rebase ? For me public/16295 is equal to u/ncohen16295.
Nathann
comment:17 follow-up: ↓ 18 Changed 7 years ago by
My mistake... it is not anymore. The git rebase does not move the current branch to another position.
comment:18 in reply to: ↑ 17 ; follow-up: ↓ 19 Changed 7 years ago by
My mistake... it is not anymore. The git rebase does not move the current branch to another position.
Still the same for me. BTW don't use "rebase" (it rewrites the history) but merge !
Nathann
comment:19 in reply to: ↑ 18 ; follow-up: ↓ 20 Changed 7 years ago by
Replying to ncohen:
My mistake... it is not anymore. The git rebase does not move the current branch to another position.
Still the same for me. BTW don't use "rebase" (it rewrites the history) but merge !
It is not. If you fetch public/16356 the last commit is 7475474b531df3ef96d218e93045d24d254cff3c being different from the one here. So the rebase just worked.
comment:20 in reply to: ↑ 19 Changed 7 years ago by
It is not. If you fetch public/16356 the last commit is 7475474b531df3ef96d218e93045d24d254cff3c being different from the one here. So the rebase just worked.
Why on earth would you rebase the whole branch ? It will make all commits incompatible !
Nathann
comment:21 follow-up: ↓ 22 Changed 7 years ago by
Actually it is just the rebase of one commit. You prefer to have a merge and keep this commit unchanged ?
comment:22 in reply to: ↑ 21 Changed 7 years ago by
Actually it is just the rebase of one commit. You prefer to have a merge and keep this commit unchanged ?
....
If you rebase this commit, then all patches above have to be updated.
And basically all design branches in needs_review
are above this one at the moment.
Anyway there is no need to merge this branch with the updated #16295, because there are no merge conflicts. And the tests pass.
Nathann
comment:24 follow-up: ↓ 25 Changed 7 years ago by
Thanks !
Nathann
(please set your name as Reviewer)
comment:25 in reply to: ↑ 24 Changed 7 years ago by
comment:26 Changed 7 years ago by
Oops, right :-D
comment:27 Changed 7 years ago by
- Commit changed from f9690032a77345bd0d370a3099503574fbf6c96e to 917dd5c6a970b8b7b5caa7eae821124770c3c4e5
- Status changed from positive_review to needs_review
Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. New commits:
2414b81 | trac #16295: Undoing useless """optimizations"""
|
f1c7fa1 | trac #16295: Typo
|
451d359 | trac #16295: Merged with 6.3.beta2
|
31e84b8 | trac #16295: todo note
|
6fb1f14 | trac #16295: Bugfix
|
1653790 | trac #16295: Merged with 6.3.beta3
|
b66a187 | fixed some small language typos and changed MOLS error messages into context that MOLS researchers will expect.
|
02f1247 | trac #16295: one more doctest
|
917dd5c | trac #16356: Merged with #16295
|
comment:28 Changed 7 years ago by
- Status changed from needs_review to positive_review
comment:29 Changed 7 years ago by
- Branch changed from u/ncohen/16356 to 917dd5c6a970b8b7b5caa7eae821124770c3c4e5
- Resolution set to fixed
- Status changed from positive_review to closed
Branch pushed to git repo; I updated commit sha1. New commits:
trac #16236: Merged with #16272
trac #16295 : Faster is_orthogonal_array
trac #16295: Doctests and review
trac #16295: Merged with 6.3.beta1
trac #16295: bugfix in wilson's construction
trac #16356: MOLS for n=18,57,154,276,298,342