Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MOLS for n=18,57,154,276,298,342 #16356

Closed
nathanncohen mannequin opened this issue May 15, 2014 · 32 comments
Closed

MOLS for n=18,57,154,276,298,342 #16356

nathanncohen mannequin opened this issue May 15, 2014 · 32 comments
Labels
c: combinatorial designs p: major / 3 t: enhancement
Milestone
sage-6.3

Comments

@nathanncohen
Copy link
Mannequin

nathanncohen mannequin commented May 15, 2014

As usual, those were given by Julian R. Abel.
Whose mind is filled with combinatorial designs.

Nathann

Depends on #16295

CC: @videlec @KPanComputes @dimpase @brettpim

Component: combinatorial designs

Author: Nathann Cohen

Branch/Commit: 917dd5c

Reviewer: Vincent Delecroix

Issue created by migration from https://trac.sagemath.org/ticket/16356
@nathanncohen nathanncohen mannequin added this to the sage-6.3 milestone May 15, 2014
@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented May 15, 2014

Dependencies: #16295

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented May 15, 2014

Branch: u/ncohen/16356

@nathanncohen nathanncohen mannequin changed the title MOLS for MOLS for n=18,57,154,276,298,342 May 15, 2014
@nathanncohen nathanncohen mannequin added the s: needs review label May 15, 2014
@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 15, 2014

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

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 15, 2014

Commit: f969003

@videlec
Copy link
Contributor

videlec commented Jun 3, 2014

Reviewer: Vincent Delecroix

@videlec
Copy link
Contributor

videlec commented Jun 3, 2014

comment:4

Hi Nathann,

this is an easy one...

Vincent

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 3, 2014

comment:5

Yo !

this is an easy one...

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

Nathann

@vbraun
Copy link
Member

vbraun commented Jun 4, 2014

Changed branch from u/ncohen/16356 to f969003

@vbraun vbraun closed this as completed Jun 4, 2014
@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 4, 2014

Changed commit from f969003 to none

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 4, 2014

comment:7

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

Nathann

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 4, 2014

comment:8

(and I never meant to remove the commit)

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 4, 2014

comment:9

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

@vbraun vbraun reopened this Jun 4, 2014
@vbraun
Copy link
Member

vbraun commented Jun 4, 2014

Commit: f969003

@vbraun
Copy link
Member

vbraun commented Jun 4, 2014

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

@vbraun
Copy link
Member

vbraun commented Jun 4, 2014

Changed branch from f969003 to u/ncohen/16356

@vbraun
Copy link
Member

vbraun commented Jun 4, 2014

comment:12

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

@nathanncohen nathanncohen mannequin added the s: needs review label Jun 4, 2014
@videlec
Copy link
Contributor

videlec commented Jun 4, 2014

comment:14

Replying to @nathanncohen:

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)

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:15

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

Please Nathann have a quick look.

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:16

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

Nathann

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:17

My mistake... it is not anymore. The git rebase does not move the current branch to another position.

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:18

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

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:19

Replying to @nathanncohen:

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.

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:20

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

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:21

Actually it is just the rebase of one commit. You prefer to have a merge and keep this commit unchanged ?

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:22

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

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:23

All right!

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:24

Thanks !

Nathann

(please set your name as Reviewer)

@videlec
Copy link
Contributor

videlec commented Jun 12, 2014

comment:25

Replying to @nathanncohen:

Thanks !

Nathann

(please set your name as Reviewer)

Already done (see comment:4)

@nathanncohen
Copy link
Mannequin Author

nathanncohen mannequin commented Jun 12, 2014

comment:26

Oops, right :-D

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 12, 2014

Changed commit from f969003 to 917dd5c

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 12, 2014

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

@vbraun
Copy link
Member

vbraun commented Jun 14, 2014

Changed branch from u/ncohen/16356 to 917dd5c

@vbraun vbraun closed this as completed in 5579f4f Jun 14, 2014
@nathanncohen nathanncohen mannequin mentioned this issue Jun 14, 2014
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
c: combinatorial designs p: major / 3 t: enhancement
Projects
None yet
Milestone
sage-6.3
Development

No branches or pull requests
2 participants
@vbraun @videlec