Opened 8 years ago

Closed 8 years ago

#12944 closed defect (fixed)

Inconcistencies in the documentation of traveling_salesman_problem

Reported by: ncohen Owned by: jason, ncohen, rlm
Priority: major Milestone: sage-5.1
Component: graph theory Keywords:
Cc: kini Merged in: sage-5.1.beta1
Authors: Nathann Cohen Reviewers: Keshav Kini
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: #12942 Stopgaps:

Description

Just two minor things. See the discussion at the bottom of #10497.

These modifications were initially made in #12942, which has been updated

Nathann

Attachments (1)

trac_12944.patch (2.9 KB) - added by ncohen 8 years ago.

Download all attachments as: .zip

Change History (6)

comment:1 Changed 8 years ago by ncohen

  • Status changed from new to needs_review

comment:2 follow-up: Changed 8 years ago by kini

  • Status changed from needs_review to needs_work

This patch breaks the doctests of the function! So we need to edit those doctests. But...

You said on #10497:

Though if I remember correctly the french lines have been removed recently in an unrelated patch by David Coudert :-D

Well, this patch is at least not merged in 5.0.rc1, since the French lines in the docstring are still there - if I am to edit the doctests, I should know where that patch is, so I don't conflict with it. But because the patch is unrelated, I can't search for it - do you remember which patch it is? (Here is an example of why one should keep unrelated changes out of patches! :P)

comment:3 in reply to: ↑ 2 Changed 8 years ago by ncohen

  • Status changed from needs_work to needs_review

This patch breaks the doctests of the function! So we need to edit those doctests. But...

Oh, right !

Well, this patch is at least not merged in 5.0.rc1, since the French lines in the docstring are still there

These changes have been made in #12743 (thank you David for reminding me ! :-D), and will be merged into Sage-5.1-beta0.

Patch updated !

Nathann

Changed 8 years ago by ncohen

comment:4 Changed 8 years ago by kini

  • Authors set to Nathann Cohen
  • Reviewers set to Keshav Kini
  • Status changed from needs_review to positive_review

Oh, good, it doesn't conflict with these lines at all :) Passes full doctests as well. Positive review!

comment:5 Changed 8 years ago by jdemeyer

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