Opened 5 years ago

Last modified 9 months ago

#16310 needs_work enhancement

Snake graph perfect matching formula for cluster variables from surfaces

Reported by: egunawan Owned by:
Priority: major Milestone: sage-6.6
Component: combinatorics Keywords: days64, days64.5, days65, cluster algebras, triangulations, sagedays@icerm
Cc: chapoton, khlee, gh-kelleye, tscrim, gmoose05 Merged in:
Authors: Emily Gunawan, Elizabeth Kelley Reviewers: Gregg Musiker, Travis Scrimshaw
Report Upstream: N/A Work issues:
Branch: u/egunawan/16310snake82 (Commits) Commit: 5e0c55e1af1e938b8e6a145fad4ed0da2ac1178f
Dependencies: Stopgaps:

Description (last modified by egunawan)

branch for this ticket: u/egunawan/16310snake82 (currently at Sage 8.2 master)

Enhancement to the cluster_algebra_quiver package: User can define a cluster algebra seed by entering a cluster triangulation class T of a surface. User can then compute the T-expansion of an arc or loop gamma by entering the arcs of T that gamma crosses.

The algorithm used is the perfect matching formula from the following papers: "Positivity for cluster algebras from surfaces" http://arxiv.org/abs/0906.0748 (section 4). "Bases for cluster algebras from surfaces" http://arxiv.org/abs/1110.4364 (section 3).

Related snake graph class ticket: See http://trac.sagemath.org/ticket/19160

Change History (63)

comment:1 Changed 5 years ago by chapoton

Hello ! If this just a wish, or do you have code in preparation ?

comment:2 Changed 5 years ago by egunawan

  • Cc chapoton added
  • Description modified (diff)
  • Summary changed from Snake graph perfect matching formula for cluster variables to (Code in progress) Snake graph perfect matching formula for cluster variables

comment:3 Changed 5 years ago by egunawan

Hi, the code is in preparation. -Emily

comment:4 Changed 5 years ago by vbraun_spam

  • Milestone changed from sage-6.3 to sage-6.4

comment:5 Changed 4 years ago by egunawan

  • Branch set to u/egunawan/ticket/16310

Warning: this version introduces a bug for http://www.sagemath.org/doc/reference/combinat/sage/combinat/cluster_algebra_quiver/cluster_seed.html class when user gives a list of edges as input. To be fixed in later versions.

Last edited 4 years ago by egunawan (previous) (diff)

comment:6 Changed 4 years ago by chapoton

  • Commit set to 24599a8cb3fc94fa9749273c00bf10d522f3608f

Hello,

I just had a quick look. Some remarks:

  • every line with EXAMPLES:: (or ending with ::) must be followed by an empty line
  • try no to use comments (with #) in the doc. You can just make sentences.
  • do not put space after the name of a function:

def mything(myarg): and not def mything (myarg):


New commits:

7d989e6Starting from [Sage Version 6.4, Release Date: 2014-11-14], implement snake graph perfect matching formula to ~/combinat/cluster_algebra_quiver folder:
24599a8 Implement snake graph perfect matching formula to ~/combinat/cluster_algebra_quiver folder

comment:7 Changed 4 years ago by chapoton

And citations of references such as MSW1 should be written [MSW1]_

comment:8 Changed 4 years ago by chapoton

you should not use if something == True and if something != True

but rather just if something and if not something

comment:9 Changed 4 years ago by chapoton

Same thing for None. One should use if something is None or if not(something is None) rather than == None and != None

Also please avoid using ; : rather separate the commands on several lines

And last but not least, every single function must be doctested:

sage -coverage src/sage/combinat/cluster_algebra_quiver/surface.py
------------------------------------------------------------------------
SCORE src/sage/combinat/cluster_algebra_quiver/surface.py: 6.7% (3 of 45)

comment:10 follow-up: Changed 4 years ago by git

  • Commit changed from 24599a8cb3fc94fa9749273c00bf10d522f3608f to e835d5ee600e2f3d80078e646dc3c2608058d2e6

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

e835d5esurface.py: Remove space after functions. Add a blank line after EXAMPLES:: and create doctests for first half of functions.

comment:11 in reply to: ↑ 10 Changed 4 years ago by egunawan

(Note: This commit only contains A FEW of the changes requested above)

comment:12 Changed 4 years ago by git

  • Commit changed from e835d5ee600e2f3d80078e646dc3c2608058d2e6 to 0f5e39a98a4eb55df7bc0e0e6ed1335f9b7084a6

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

48e1e40remove the following functions which are no longer used: _edges_from_ideal_triangles
214324eAllow draw_lifted_polygon_arc() and draw_lifted_polygon_loop() methods to take user-given labels. Clean up documentation.
9a093c1Move the methods arc, loop, snake_graph, band_graph, draw_snake_graph, draw_band_graph, draw_lifted_polygon_arc, draw_lifted_polygon_loop from cluster_seed.py to cluster_triangulation.py, and do the fix that Chapoton asks in regards to None and True/False, and add a few more doc tests in surface.py
e88182cUp to function _get_weighted_edges() line 503 in surface.py, finish doctests/examples
a8f169bFinish doc and unit tests for functions in surface.py up to line 720 (LaurentExpansionFromSurface())
702d0d9Set user_labels=True default option for cluster_triangulation.py, and create a new function GetAllMatchings() to shorten the function LaurentExpansionFromSurface() in surface.py
63a1e7fContinue finishing doc and examples in surface.py
cf13a06Replace methods .arc with .arc_laurent_expansion, .draw_lifted_polygon_arc with .draw_lifted_arc, .snake_graph with .list_snake_graph (and also their equivalent methods for loops) in cluster_triangulation.py. Replace function _draw_lifted_polygon with _draw_lifted_curve in surface.py. Continue adding to doctest and examples
07866a5Fix bug regarding to running ClusterSeed.arc_laurent_expansion with parameter Verbose=False. Finish all examples in surface.py, but sage -docbuild reference/combinat html is currently producing errors
0f5e39aFix documentation

comment:13 Changed 4 years ago by egunawan

  • Description modified (diff)
  • Status changed from new to needs_review
  • Summary changed from (Code in progress) Snake graph perfect matching formula for cluster variables to Snake graph perfect matching formula for cluster variables

When I run "./sage -docbuild reference/combinat html" I get errors and I have not been able to figure out how to fix them.

When pushing to trac, I did "git push --set-upstream trac HEAD:u/egunawan/ticket/16310". Was this the correct command?

comment:14 Changed 4 years ago by chapoton

Ok, I am currently cleaning the doc so that it will build.

The main point is that you did something like that (many times)

EXAMPLES::

    Here is my favorite example::

        sage: 1 + 1 == 3

where it should be instead

EXAMPLES:

Here is my favorite example::

    sage: 1 + 1 == 3

One other important point is that reference should be only given *once* in all the sage library. You should not duplicate the same reference in distinct files. Sage is able to find them in any place, so you can use citations from references in any other file.

comment:15 Changed 4 years ago by chapoton

  • Branch changed from u/egunawan/ticket/16310 to public/ticket/16310
  • Commit changed from 0f5e39a98a4eb55df7bc0e0e6ed1335f9b7084a6 to 0d2b9386840aa2136712d6f8fd9b5350edf846c8

Hello,

I have made a branch public/ticket/16310 based on u/egunawan/ticket/16310 on top of sage 6.5.rc3

If you were working with sage 6.4.1, you should before go to 6.5.rc3 or later. You can then pull this branch using git pull public/ticket/16310

Doc now builds. I have tried not to touch the code, but could not completely stop myself to do that. I should not have broken anything, but please check that it still works.


New commits:

5b9778eMerge branch 'u/egunawan/ticket/16310' into 6.5.rc3
0d2b938trac #16310 lot of documentation clean-up + inclusion of doc

comment:16 Changed 4 years ago by chapoton

There are two failing doctests:

File "src/sage/combinat/cluster_algebra_quiver/surface.py", line 1041, in sage.combinat.cluster_algebra_quiver.surface.GetMonomialTerm
Failed example:
    GetMonomialTerm(G,pm_a,boundary_edges=T._boundary_edges_vars)
Expected:
    x3^2*x4^2*x8^3
Got:
    x1^2*x2^2*x6^3
**********************************************************************
File "src/sage/combinat/cluster_algebra_quiver/surface.py", line 1052, in sage.combinat.cluster_algebra_quiver.surface.GetMonomialTerm
Failed example:
    GetMonomialTerm(G,pm_b,boundary_edges=T._boundary_edges_vars)
Expected:
    x3^2*x4*x5*x6*x7*x8*x9
Got:
    x1^2*x2*x3*x4*x5*x6*x7

comment:17 follow-up: Changed 4 years ago by egunawan

Thank you for fixing my code!

Question 1: The two failing doctests above happen in Version 6.5.rc2 but all tests (in cluster_algebra_quiver folder) pass in Version 6.5.rc3.

list.sort() method behaves differently in Version 6.5.rc2 and Version 6.5.rc3. Should I change my doctests so that my doctests do not depend on the behavior of list.sort()?

Sage Version 6.5.rc3 and Version 6.4: sage: li = [1,2,3,'r','ell'] sage: li.sort() sage: li ['ell', 'r', 1, 2, 3]

=============

Sage Version 6.5.rc2: sage: li = [1,2,3,'r','ell'] sage: li.sort() sage: li [1, 2, 3, 'ell', 'r']

Question 2: In the future, when I need to push new commits to the public branch "public/ticket/16310", do I type "git push --set-upstream trac HEAD:public/ticket/16310" or do I need to do something different?

In several months, we would like to enhance this code so that user can work with a surface cluster algebra *with principal coefficients*. Do we create a new ticket and branch or continue with this ticket?

comment:18 in reply to: ↑ 17 Changed 4 years ago by chapoton

Replying to egunawan:

Thank you for fixing my code!

My pleasure.

Question 1: The two failing doctests above happen in Version 6.5.rc2 but all tests (in cluster_algebra_quiver folder) pass in Version 6.5.rc3.

list.sort() method behaves differently in Version 6.5.rc2 and Version 6.5.rc3. Should I change my doctests so that my doctests do not depend on the behavior of list.sort()?

Sage Version 6.5.rc3 and Version 6.4: sage: li = [1,2,3,'r','ell'] sage: li.sort() sage: li ['ell', 'r', 1, 2, 3]

=============

Sage Version 6.5.rc2: sage: li = [1,2,3,'r','ell'] sage: li.sort() sage: li [1, 2, 3, 'ell', 'r']

Well, all tests must pass in the most recent version.

It seems very strange to use lists that mix integers and letters. Is this really what you use in the code ? Could you try to avoid that ?

Question 2: In the future, when I need to push new commits to the public branch "public/ticket/16310", do I type "git push --set-upstream trac HEAD:public/ticket/16310" or do I need to do something different?

The set-upstream is a convenience, not a necessity. You can just use

"git push trac HEAD:public/ticket/16310"

But in fact, it is not necessary that you work with the public/ticket/16310 branch

Instead I think that you can do that:

1) git checkout "your local name for the branch u/egunawan/ticket/16310" So you are "sitting on your branch" 2) git pull trac public/ticket/16310 So you have included "public/ticket/16310" in your branch 3) then you can just use "git push trac HEAD:u/egunawan/ticket/16310" as before to push into trac under that name 4) you can put back "u/egunawan/ticket/16310" in the branch field of trac

But I am not a git wizard, so be careful..

I suggest you click on the "commits" links at right of the Branch field (above here) to see what happens to the various branches : they coexist. Currently yours is behind public, but it can very well go back to leading position, if you do what I suggest.

In several months, we would like to enhance this code so that user can work with a surface cluster algebra *with principal coefficients*. Do we create a new ticket and branch or continue with this ticket?

Well, it depends on your priorities. In my opinion, there is still some work to be done here before this can enter SageMath. Adding another layer of complexity can only make things take longer. So I would suggest to make another ticket, depending on this one.

comment:19 Changed 4 years ago by chapoton

  • Milestone changed from sage-6.4 to sage-6.6

comment:20 Changed 4 years ago by egunawan

  • Branch changed from public/ticket/16310 to u/egunawan/ticket/16310

comment:21 Changed 4 years ago by chapoton

There seem to be still a duplicate citation:

OSError: [combinat ] /home/patchbot/sage-patchbot/local/lib/python2.7/site-packages/sage/combinat/cluster_algebra_quiver/cluster_triangulation.py:
docstring of sage.combinat.cluster_algebra_quiver.cluster_triangulation:15:
WARNING: duplicate citation MSW_Positivity,
other instance in /home/patchbot/sage-patchbot/src/doc/en/reference/combinat/sage/combinat/cluster_algebra_quiver/cluster_seed.rst

comment:22 Changed 4 years ago by egunawan

  • Branch changed from u/egunawan/ticket/16310 to public/ticket/16310
  • Commit changed from 0d2b9386840aa2136712d6f8fd9b5350edf846c8 to 97cde19a0abfaab17e7d3c04c889cbf168bf307b

comment:23 Changed 4 years ago by git

  • Commit changed from 97cde19a0abfaab17e7d3c04c889cbf168bf307b to 770c98e7fb3518db6906a40dde264b7ddf2ff14a

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

87a3669Merge branch 'public/ticket/16310' into 6.6.beta3
770c98etrac #16310 make sure that doc builds

comment:24 Changed 4 years ago by git

  • Commit changed from 770c98e7fb3518db6906a40dde264b7ddf2ff14a to 75b482eeca9676c71901227756e853e1c51e4f95

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

75b482etrac #16310 trying again to make sure that doc builds

comment:25 Changed 4 years ago by Snark

Uh... That ticket was set to needs_review four weeks ago, but there have been changes eight days ago to fix doc building... so is it ready or not ?

Also notice that Volker doesn't like needs_review tickets without "Authors:" :-P

comment:26 Changed 4 years ago by egunawan

  • Authors set to egunawan
  • Status changed from needs_review to needs_work

comment:27 Changed 4 years ago by egunawan

Thanks for the comment. I changed the status to needs_work because we will do a mathematical review first before it's ready for review.

Whenever there is a new beta in the develop branch (for example, currently 6.6 beta 5) should I merge this ticket branch into the latest beta, and how? If someone pulls this ticket branch on top of the latest sage (6.6 beta 5), will it work OK?

comment:28 Changed 4 years ago by Snark

You should probably rebase before you ask for a review ; it's explained in the sage developer's guide.

That will show you if your code conflicts with what is now in sage, and allow you to fix the discrepancies.

comment:29 Changed 4 years ago by egunawan

  • Keywords days64 triangulations added; from surfaces removed

comment:30 Changed 4 years ago by git

  • Commit changed from 75b482eeca9676c71901227756e853e1c51e4f95 to 1f1c3db28b47347c6540355bc6b2ae0d26d60045

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

1f1c3dbMerge branch 'develop' into t/16310/public/ticket/16310

comment:31 Changed 4 years ago by kdilks

  • Cc kdilks added

comment:32 Changed 4 years ago by egunawan

  • Branch public/ticket/16310 deleted
  • Commit 1f1c3db28b47347c6540355bc6b2ae0d26d60045 deleted
  • Description modified (diff)

comment:33 Changed 4 years ago by egunawan

  • Branch set to u/egunawan/snakegraph
  • Commit set to 048b942429156eedd61a1dccddd58597efac29a0

Last 10 new commits:

5b1ee64Musiker comment 1: Explain the difference between __edge_list_to_matrix and _surface_edge_list_to_matrix.
8b60a04Musiker comment 3: triangulation_dictionary is now a dictionary instead of a list.
c1c1957Gregg Musiker comment #5 and #8: ClusterTriangulation = class(ClusterSeed) instead of class(SageObject). Also allow ClusterTriangulation.mutate method to mutate a self-folded triangle's radius r. This mutation method is not quite an involution because it you mutate r twice you will end up with the same (unlabeled) triangulation but the label of r and the loop are switched.
ba018c1Fix bug in ClusterTriangulation.mutate method and bug in ClusterTriangulation.get_edge_position method by introducing self._edges and self._arcs and self._boundary_edges (previously two lists to handle all the edges)
d33626fIntroduce new function _is_arc_mutable to check for more illegal triangulatons. For example, a noose (ell-loop) has to be mutable, i.e. inside an ideal quadrilateral.
c380e75ticket 16310: Fix bug in ClusterTriangulation.mutate. Add more examples for that method.
fd2c1dfTiket 16310:
329c484Ticket 16310:
0871a57Ticket 16310: description 'A cluster algebra' -> 'A seed for a cluster algebra'
048b942Ticket 16310: Change the names of the four methods in ClusterTriangulation to map_label_to_variable, _get_map_label_to_variable, map_variable_to_label, and _get_map_variable_to_label. Fix incorrect error messages. Add more tests for cases when ClusterTriangulation has been mutated

comment:34 Changed 4 years ago by git

  • Commit changed from 048b942429156eedd61a1dccddd58597efac29a0 to f9dbe0ed7c8f7abdda2fcb2254e1fbe30f5b1140

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

f9dbe0eTicket 16310:

comment:35 Changed 4 years ago by git

  • Commit changed from f9dbe0ed7c8f7abdda2fcb2254e1fbe30f5b1140 to e6d196d057c03e6f90e2e99a12bf3820a8047fcc

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

e6d196dMerge branch 'u/egunawan/snakegraph' of trac.sagemath.org:sage into Master version 6.7

comment:36 Changed 4 years ago by egunawan

  • Description modified (diff)
  • Keywords days64.5 added
  • Summary changed from Snake graph perfect matching formula for cluster variables to Snake graph perfect matching formula for cluster variables from surfaces

comment:37 Changed 4 years ago by git

  • Commit changed from e6d196d057c03e6f90e2e99a12bf3820a8047fcc to 3bf3d33a9665e4bbe307f4154a2d701761f00cf9

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

3bf3d33Ticket 16310: Add figures for principal coefficients (symmetric difference in snake graph matchings). Computation not included yet.

comment:38 Changed 4 years ago by git

  • Commit changed from 3bf3d33a9665e4bbe307f4154a2d701761f00cf9 to 47a0c418fc3aac5fbe1cdc2c64fb887c69c67abe

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

3852d42Add coefficients. Does not work yet
db80469Ticket 16310: complete computation for the coefficients, but we seem to have chosen the opposite convention for coefficients.
47a0c41Ticket 16310: Finish computation for principal coefficients. Need more tests for loops and self-folded triangulation involving coefficients. ALSO: switch to the opposite convention to go from triangulations to matrix in order to match the choice of minimal matching in [MSW: Positivity paper]

comment:39 Changed 4 years ago by git

  • Commit changed from 47a0c418fc3aac5fbe1cdc2c64fb887c69c67abe to 408118989a38924b8ac43f835b096a2100d23483

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

4081189Ticket 16310: Add coefficients for cases where arc crosses self-folded triangles.

comment:40 Changed 4 years ago by git

  • Commit changed from 408118989a38924b8ac43f835b096a2100d23483 to c18f6535f5e4a2edadbeb978146f3ad874e82b25

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

0acd113Ticket 16310: Fix bug for the case of generalized arc which has crosses the same arc as the first and last crossing. Add test for this case.
c18f653Ticket 16310: Complete doc and add more examples/tests.

comment:41 Changed 4 years ago by kdilks

Documentation won't build for me. Can't easily see what the problem is from the error, though.

comment:42 Changed 4 years ago by chapoton

looks like some unicode problem (hidden space characters, long dashes, whatever..)

comment:43 Changed 4 years ago by egunawan

  • Keywords days65 added

What happened was that I added this word in the documentation:

Salomón

After I replaced the "ó" with a plain "o", make doc was successful.

comment:44 Changed 4 years ago by chapoton

please commit the change and push the branch here

comment:45 Changed 4 years ago by git

  • Commit changed from c18f6535f5e4a2edadbeb978146f3ad874e82b25 to 15ef751ecb480aa43383807bd30c27be7b3efbea

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

15ef751Ticket 16310: clean up doc. Remove o' which causes error in doc

comment:46 Changed 4 years ago by egunawan

Fyi, one of the reasons why I haven't set this to "need review" is that major changes to the cluster algebra package are coming (during Sage Days 64.5 last week) and I will need to adjust the ClusterTriangulation? class to these changes.

comment:47 Changed 4 years ago by git

  • Commit changed from 15ef751ecb480aa43383807bd30c27be7b3efbea to 833fd385f3d6e1cec911d0c98d83502841379c11

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

833fd3816310: add test for a bug involving Markov quiver generalized ordinary arc

comment:48 Changed 4 years ago by chapoton

  • Four (easy?) failing doctests (shifted numbering of variables), see patchbot report by clicking on the round icon at top right of this page.
  • Do not use .show() but .plot()

For example, instead of a method ending with

drawing.show ( axes=False, figsize=fig_size )

use instead as the last line

return drawing.plot(axes=False, figsize=fig_size)

comment:49 Changed 4 years ago by git

  • Commit changed from 833fd385f3d6e1cec911d0c98d83502841379c11 to 5d3aae81656de1b4fe1edb93f155395fd519f46e

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

fbf94d716310: so that Kevin can draw pictures on html docs, we replace drawing.show() with return drawing.plot() except for the cluster_algebra_quiver.surface.LaurentExpansionFromSurface. Need to work on the draw_lifted_arc() method.
5d3aae816310: Fix bug, when orientation of first tile of snake graph is negative, def GetMinimalMatching should return (0,1,0,1) or (0,0,0,1).

comment:50 Changed 4 years ago by git

  • Commit changed from 5d3aae81656de1b4fe1edb93f155395fd519f46e to 87125c0fdd2dbefba27ce751a6424f79339f69ed

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

87125c016310: change doc test so that tests will still pass in 6.8beta3. Do not merge to version after 6.7 yet. We will change the labels are mapped to variables so that they do not depend on the sort function (we will do this after the cluster algebra package revamp is finished).

comment:51 Changed 4 years ago by git

  • Commit changed from 87125c0fdd2dbefba27ce751a6424f79339f69ed to a7e03b76c513e6af32551ae6962d06b4cc73c8eb

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

a7e03b716310:change to tile_flip_max = len(G) in the function GetAllMatchings(). Starting from the minimal matching G of the snake graph, all matchings are found by flipping G once,twice,...,len(G) many times.

comment:52 Changed 4 years ago by chapoton

Authors and Reviewers fields must me filled with full names.

comment:53 Changed 4 years ago by egunawan

  • Authors changed from egunawan to Emily Gunawan
  • Description modified (diff)
  • Reviewers changed from gmoose05 to Gregg Musiker, Travis Scrimshaw

comment:54 Changed 4 years ago by egunawan

  • Cc khlee added

comment:55 Changed 4 years ago by git

  • Commit changed from a7e03b76c513e6af32551ae6962d06b4cc73c8eb to 1b5ada821b94058e9cf8c3b2cc8523b328a092ed

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

1b5ada8Merge to 6.8 master. Merge branch 'u/egunawan/snakegraph' of git://trac.sagemath.org/sage into perfmatchingformula

comment:56 Changed 4 years ago by egunawan

I am aware that this version (after merging with Sage 6.8) does not pass doctests, but I push it here so that Kyu-Hwan can use it right away.

comment:57 Changed 3 years ago by mattmills

  • Branch changed from u/egunawan/snakegraph to u/mattmills/snakegraph

Made minor edits to make most of the ClusterTriangulation? package work in Sage 7.3. The mutation method doesn't work.

Last edited 3 years ago by mattmills (previous) (diff)

comment:58 Changed 2 years ago by chapoton

  • Commit changed from 1b5ada821b94058e9cf8c3b2cc8523b328a092ed to 84b36dd10d36c84d92ea1ab14c66630ea7bde4a0

for python3 compatibility, do not use xrange (you can do "from six.moves import range" if you need an iterator)

and use the python3 syntax for print:

https://wiki.sagemath.org/Python3-compatible%20code


New commits:

60875c8Add ClusterTriangulation
cc40431A
f790709A
84b36ddMade minor edits to make ClusterTriangulation compatible with Sage 7.3. Mutation method doesn't work, but most other methods do.
Last edited 2 years ago by chapoton (previous) (diff)

comment:59 Changed 9 months ago by gh-kelleye

  • Authors changed from Emily Gunawan to Emily Gunawan, Elizabeth Kelley
  • Branch changed from u/mattmills/snakegraph to u/gh-kelleye/16310
  • Cc gh-kelleye added; kdilks removed
  • Commit changed from 84b36dd10d36c84d92ea1ab14c66630ea7bde4a0 to 01cb18f9432a41ff32ca5922bff8fbed3156d284
  • Keywords sagedays@icerm added

Merge to 8.2


Last 10 new commits:

ee3720bImprove error message on OSX
9cff292Better diagnostic if ssh key is invalid
a20328bSkip empty ssh key lines
491b640Handle the case where we checkout local branch that is not on ticket
271380bFix error message
3e73af8Rename http://trac.sagemath.org -> https
03fbd12Make xmlrpc requests over https
a0942dbAlso switch the python3 codepath to https
bd94c31Update fileserver paths for release management
01cb18fAllow x.y.z version numbers

comment:60 Changed 9 months ago by egunawan

  • Branch changed from u/gh-kelleye/16310 to u/egunawan/16310snake82
  • Commit changed from 01cb18f9432a41ff32ca5922bff8fbed3156d284 to af89a5412417a59c92dffbd9721bc32edb02cd7c
  • Description modified (diff)

Correction for merging to 8.2


New commits:

af89a54merged to 8.2

comment:61 Changed 9 months ago by git

  • Commit changed from af89a5412417a59c92dffbd9721bc32edb02cd7c to 1b3c18cba46cd964600dd3c8e3d10472c8022da3

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

1b3c18ccontinue merging to 8.2. reduce doctest failures

comment:62 Changed 9 months ago by git

  • Commit changed from 1b3c18cba46cd964600dd3c8e3d10472c8022da3 to 5e0c55e1af1e938b8e6a145fad4ed0da2ac1178f

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

8663643fix example to explain ClusterSeed will refresh cluster to the initial x0, ..., xn
1548d09set use f poly flag to true
e74be29set use f poly flag to true
04baa31Fixed some doctest errors
5e0c55eMerge branch 'u/gh-kelleye/16310_07-27-18' of git://trac.sagemath.org/sage into u/egunawan/16310snake82

comment:63 Changed 9 months ago by tscrim

  • Cc tscrim gmoose05 added
Note: See TracTickets for help on using tickets.