Opened 11 years ago

Closed 10 years ago

#9791 closed defect (fixed)

Fix documentation for weave in the "numerical_sage" document

Reported by: mhansen Owned by: mvngu
Priority: major Milestone: sage-4.6.2
Component: documentation Keywords:
Cc: Merged in: sage-4.6.2.alpha3
Authors: Stefan Reiterer, Jeroen Demeyer Reviewers: André Apitzsch
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description (last modified by maldun)

import weave
from weave import converters

should be

from scipy.weave import converters
from scipy import weave

See http://ask.sagemath.org/question/56/error-while-trying-to-import-weave#comment-213

Attachments (4)

9791.patch (3.9 KB) - added by jdemeyer 10 years ago.
Replaces previous patch
trac_9791_updatet_blitz_docu.2.patch (3.2 KB) - added by maldun 10 years ago.
Corrected version
trac_9791_updatet_blitz_docu.patch (4.2 KB) - added by maldun 10 years ago.
Latest version that merges all changes together
trac_9791_updatet_blitz_docu.3.patch (4.1 KB) - added by jdemeyer 10 years ago.
Fixed commit message, apply only this

Download all attachments as: .zip

Change History (19)

comment:1 Changed 10 years ago by maldun

  • Authors set to Stefan Reiterer
  • Description modified (diff)
  • Status changed from new to needs_review

comment:2 Changed 10 years ago by jdemeyer

  • Milestone set to sage-4.6.2

Standard indentation in Sage is 4 spaces, so I think there is no reason to change that.

comment:3 Changed 10 years ago by jdemeyer

  • Authors changed from Stefan Reiterer to Stefan Reiterer, Jeroen Demeyer

I have a new patch, keeping indentation and adding a sage: prompt so at least the import statements are tested.

comment:4 Changed 10 years ago by aapitzsch

Could you also correct

	"""

       code="""

It should probably be something like

       code=""" """

The link to the weave tutorial (at the end) doesn't work. Maybe you can fix this, too.

comment:5 Changed 10 years ago by jdemeyer

  • Status changed from needs_review to needs_work

Apologies, there is an indentation problem, it's just that you fixed it the wrong way.

comment:6 follow-up: Changed 10 years ago by jdemeyer

This file is a mess, there is more clean-up to do.

Changed 10 years ago by jdemeyer

Replaces previous patch

comment:7 Changed 10 years ago by jdemeyer

I can't find an updated weave tutorial, so I just removed the link for now.

comment:8 in reply to: ↑ 6 Changed 10 years ago by maldun

  • Description modified (diff)
  • Status changed from needs_work to needs_info

Replying to jdemeyer:

This file is a mess, there is more clean-up to do.

Replying to jdemeyer:

Apologies, there is an indentation problem, it's just that you fixed it the wrong way.

I wanted just to post that

The thing with the

"""

code="""

is correct since it belongs to the support_code

I add a new patch with that thing corrected + a new updated link. I added some blank lines into the 3rd code snippet for a little optical clan up.

At least all examples should work now.

Changed 10 years ago by maldun

Corrected version

comment:9 Changed 10 years ago by maldun

  • Status changed from needs_info to needs_review

Corrected a small error

So I think we need review again

comment:10 Changed 10 years ago by aapitzsch

  • Reviewers set to André Apitzsch
  • Status changed from needs_review to positive_review

Sorry, I hadn't seen """ after support_code.

Thanks, everything looks good now.

comment:11 follow-ups: Changed 10 years ago by jdemeyer

  • Status changed from positive_review to needs_work

Stefan, I think I have made some useful changes which are not in your patch. Is there a specific reason for that, or should I try to "combine" both our patches?

comment:12 in reply to: ↑ 11 Changed 10 years ago by maldun

Replying to jdemeyer:

Stefan, I think I have made some useful changes which are not in your patch. Is there a specific reason for that, or should I try to "combine" both our patches?

Ok I double checked, and have to admit that I oversaw the optical clean up you did. I think a merge will be the best then =)

comment:13 in reply to: ↑ 11 Changed 10 years ago by maldun

  • Status changed from needs_work to needs_review

Replying to jdemeyer:

Stefan, I think I have made some useful changes which are not in your patch. Is there a specific reason for that, or should I try to "combine" both our patches?

Ok found some time to do the merge myself. I simply applied your patch and added my changes + a small change =)

Changed 10 years ago by maldun

Latest version that merges all changes together

comment:14 Changed 10 years ago by aapitzsch

  • Status changed from needs_review to positive_review

Changed 10 years ago by jdemeyer

Fixed commit message, apply only this

comment:15 Changed 10 years ago by jdemeyer

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