Opened 7 years ago

Closed 6 years ago

#13188 closed enhancement (fixed)

Boring paperwork in the graph/ files

Reported by: ncohen Owned by: tbd
Priority: major Milestone: sage-5.5
Component: graph theory Keywords:
Cc: dcoudert Merged in: sage-5.5.beta0
Authors: Nathann Cohen Reviewers: Travis Scrimshaw
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: #13073 Stopgaps:

Description

This patch does absolutely nothing.

It removes functions that appeared twice in the code by importing them, which should have been done since the beginning. It also updates deprecation warnings.

Nathann

Attachments (1)

trac_13188.patch (27.7 KB) - added by ncohen 6 years ago.

Download all attachments as: .zip

Change History (13)

comment:1 Changed 7 years ago by ncohen

  • Status changed from new to needs_review

comment:2 Changed 7 years ago by ncohen

  • Component changed from PLEASE CHANGE to graph theory

comment:3 Changed 7 years ago by jlopez

  • Status changed from needs_review to needs_work
  • Work issues set to Patch fails to apply

Hi Nathan,

the patch fails to apply against sage 5.1rc1 (which barring unexpected failures should be released as 5.1 shortly). You probably want to rebase it.

comment:4 Changed 7 years ago by ncohen

  • Status changed from needs_work to needs_review

Rebased ! (I leave tomorrow for 2 months :-p)

Nathann

comment:5 Changed 6 years ago by tscrim

  • Status changed from needs_review to needs_work

This fails to apply for me on Sage 5.4.beta1. Additionally the deprecations changed in 5.2 and so sage fails to start properly. Also for line 120 in cliquer.py:

sage: C = Graph('DJ{')

is that brace { suppose to be there?

comment:6 Changed 6 years ago by ncohen

  • Status changed from needs_work to needs_review

Here it is ! Patch rebased ! And yes, this { is supposed to be there... I mean, it's just how the graph is encoded :-)

sage: Graph('DJ{').size()
7
sage: Graph('DJ').size() 
---------------------------------------------------------------------------
RuntimeError                              Traceback (most recent call last)

/home/ncohen/.Sage/devel/sage-2/sage/graphs/<ipython console> in <module>()

/home/ncohen/.Sage/local/lib/python2.7/site-packages/sage/graphs/graph.pyc in __init__(self, data, pos, loops, format, boundary, weighted, implementation, sparse, vertex_labels, name, multiedges, convert_empty_dict_labels_to_None)
   1162                 raise RuntimeError("The string (%s) seems corrupt: for n = %d, the string is too long."%(ss,n))
   1163             elif len(m) < expected:
-> 1164                 raise RuntimeError("The string (%s) seems corrupt: for n = %d, the string is too short."%(ss,n))
   1165             num_verts = n
   1166         elif format == 'sparse6':

RuntimeError: The string (DJ) seems corrupt: for n = 5, the string is too short.

Nathann

comment:7 Changed 6 years ago by tscrim

  • Status changed from needs_review to needs_work
  • Work issues changed from Patch fails to apply to docstrings

I couldn't run the doctest and it seemed out of place. Now the patch applies and functions, however I get new docstring errors/warnings:

docstring of sage.graphs.cliquer.all_max_clique:18: WARNING: duplicate citation NisOst2003, other instance in /home/travis/sage-5.4.beta1/devel/sage/doc/en/reference/sage/graphs/graph.rst
/home/travis/sage-5.4.beta1/local/lib/python2.7/site-packages/sage/graphs/graph.py:docstring of sage.graphs.graph:2: ERROR: Unexpected indentation.
/home/travis/sage-5.4.beta1/local/lib/python2.7/site-packages/sage/graphs/graph.py:docstring of sage.graphs.graph:4: WARNING: Bullet list ends without a blank line; unexpected unindent.
/home/travis/sage-5.4.beta1/local/lib/python2.7/site-packages/sage/graphs/graph.py:docstring of sage.graphs.graph.Graph.cliques_maximum:18: WARNING: duplicate citation NisOst2003, other instance in /home/travis/sage-5.4.beta1/devel/sage/doc/en/reference/sage/graphs/cliquer.rst
/home/travis/sage-5.4.beta1/local/lib/python2.7/site-packages/sage/graphs/graph.py:docstring of sage.graphs.graph.Graph.matching_polynomial:162: WARNING: duplicate citation Godsil93, other instance in /home/travis/sage-5.4.beta1/devel/sage/doc/en/reference/sage/graphs/matchpoly.rst
docstring of sage.graphs.matchpoly.matching_polynomial:162: WARNING: duplicate citation Godsil93, other instance in /home/travis/sage-5.4.beta1/devel/sage/doc/en/reference/sage/graphs/graph.rst

The error seems to be in chromatic_polynomial(), but I don't know where the bullet list warning is.

comment:8 Changed 6 years ago by ncohen

  • Status changed from needs_work to needs_review

Hellooooooooooooo !!

Could you try to see if this patch works better ? There's still a duplicate reference on my computer but I wonder whether it could be some Sphinx cache problem... So it may work on "any machine different from mine" :-)

Nathann

Changed 6 years ago by ncohen

comment:9 Changed 6 years ago by tscrim

  • Status changed from needs_review to positive_review
  • Work issues docstrings deleted

It is good now. I ran build the first time, got the duplicate reference. Popped the patch off, recompiled sage, pushed the patch, recompiled, then rebuilt the docstrings and it was clean.

Travis

comment:10 Changed 6 years ago by tscrim

  • Reviewers set to Travis Scrimshaw

comment:11 Changed 6 years ago by jdemeyer

  • Milestone changed from sage-5.4 to sage-5.5

comment:12 Changed 6 years ago by jdemeyer

  • Merged in set to sage-5.5.beta0
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.