Opened 5 years ago

Closed 5 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 5 years ago by ncohen

  • 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 5 years ago by git

  • Commit set to f9690032a77345bd0d370a3099503574fbf6c96e

Branch pushed to git repo; I updated commit sha1. New commits:

​973b926trac #16236: Merged with #16272
​37681e2trac #16295 : Faster is_orthogonal_array
​994324etrac #16295: Doctests and review
​fc6de73trac #16295: Merged with 6.3.beta1
​b9f8b03trac #16295: bugfix in wilson's construction
​f969003trac #16356: MOLS for n=18,57,154,276,298,342

comment:3 Changed 5 years ago by ncohen

  • Component changed from combinatorics to combinatorial designs

comment:4 follow-up: Changed 5 years ago by vdelecroix

  • 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 5 years ago by ncohen

Yo !

this is an easy one...

Ahahah. I just added #16430 which does a couple of trivial things too...

Nathann

comment:6 Changed 5 years ago by vbraun

  • Branch changed from u/ncohen/16356 to f9690032a77345bd0d370a3099503574fbf6c96e
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:7 follow-up: Changed 5 years ago by ncohen

  • Commit f9690032a77345bd0d370a3099503574fbf6c96e deleted

Volker I'm sorry but this ticket has an unreviewed dependency..... :-/

Nathann

comment:8 Changed 5 years ago by ncohen

(and I never meant to remove the commit)

comment:9 Changed 5 years ago by ncohen

(and apparently I cannot set it back, filling the form changes nothing)

comment:10 Changed 5 years ago by vbraun

  • Resolution fixed deleted
  • Status changed from closed to new

comment:11 Changed 5 years ago by vbraun

  • Branch changed from f9690032a77345bd0d370a3099503574fbf6c96e to u/ncohen/16356
  • Commit set to f9690032a77345bd0d370a3099503574fbf6c96e

New commits:

​973b926trac #16236: Merged with #16272
​37681e2trac #16295 : Faster is_orthogonal_array
​994324etrac #16295: Doctests and review
​fc6de73trac #16295: Merged with 6.3.beta1
​b9f8b03trac #16295: bugfix in wilson's construction
​f969003trac #16356: MOLS for n=18,57,154,276,298,342

comment:12 Changed 5 years ago by vbraun

Please don't set tickets to positive review that you don't want merged

comment:13 Changed 5 years ago by ncohen

  • Status changed from new to needs_review

comment:14 in reply to: ↑ 7 Changed 5 years ago by vdelecroix

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 5 years ago by vdelecroix

Ok. I rebased on the new #16295 at public/16295.

Please Nathann have a quick look.

comment:16 Changed 5 years ago by ncohen

What did you rebase ? For me public/16295 is equal to u/ncohen16295.

Nathann

comment:17 follow-up: Changed 5 years ago by vdelecroix

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: Changed 5 years ago by 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 !

Nathann

comment:19 in reply to: ↑ 18 ; follow-up: Changed 5 years ago by vdelecroix

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 5 years ago by ncohen

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: Changed 5 years ago by vdelecroix

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 5 years ago by ncohen

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:23 Changed 5 years ago by vdelecroix

  • Status changed from needs_review to positive_review

All right!

comment:24 follow-up: Changed 5 years ago by ncohen

Thanks !

Nathann

(please set your name as Reviewer)

comment:25 in reply to: ↑ 24 Changed 5 years ago by vdelecroix

Replying to ncohen:

Thanks !

Nathann

(please set your name as Reviewer)

Already done (see comment:4)

comment:26 Changed 5 years ago by ncohen

Oops, right :-D

comment:27 Changed 5 years ago by git

  • 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:

​2414b81trac #16295: Undoing useless """optimizations"""
​f1c7fa1trac #16295: Typo
​451d359trac #16295: Merged with 6.3.beta2
​31e84b8trac #16295: todo note
​6fb1f14trac #16295: Bugfix
​1653790trac #16295: Merged with 6.3.beta3
​b66a187fixed some small language typos and changed MOLS error messages into context that MOLS researchers will expect.
​02f1247trac #16295: one more doctest
​917dd5ctrac #16356: Merged with #16295

comment:28 Changed 5 years ago by ncohen

  • Status changed from needs_review to positive_review

comment:29 Changed 5 years ago by vbraun

  • Branch changed from u/ncohen/16356 to 917dd5c6a970b8b7b5caa7eae821124770c3c4e5
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.