diff --git a/.ci/create-changes-html.sh b/.ci/create-changes-html.sh new file mode 100755 index 00000000000..1a6fbeef27b --- /dev/null +++ b/.ci/create-changes-html.sh @@ -0,0 +1,91 @@ +#!/bin/sh +if [ $# != 2 ]; then + echo >&2 "usage: $0 BASE_DOC_COMMIT DOC_REPO" + echo >&2 "creates CHANGES.html in the current directory" + echo >&2 "for the diffs of DOC_REPO against BASE_DOC_COMMIT" + exit 1 +fi +BASE_DOC_COMMIT="$1" +DOC_REPOSITORY="$2" + +# Wipe out chronic diffs between old doc and new doc +(cd $DOC_REPOSITORY && find . -name "*.html" | xargs sed -i -e '\;; d') +# Create CHANGES.html +echo '' > CHANGES.html +echo '' >> CHANGES.html +echo '' >> CHANGES.html +echo '' >> CHANGES.html +echo '' >> CHANGES.html +cat >> CHANGES.html << EOF + +EOF +echo '' >> CHANGES.html +echo '' >> CHANGES.html +(cd $DOC_REPOSITORY && git diff $BASE_DOC_COMMIT -- *.html) > diff.txt +python3 - << EOF +import os, re, html +with open('diff.txt', 'r') as f: + diff_text = f.read() +diff_blocks = re.split(r'^(?=diff --git)', diff_text, flags=re.MULTILINE) +out_blocks = [] +for block in diff_blocks: + match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE) + if match: + doc = match.group(1) + path = 'html/' + doc + file_path = os.path.join('$DOC_REPOSITORY', doc) + with open(file_path, 'r') as file: + content = file.readlines() + count = 0 + for line in block.splitlines(): + if line.startswith('@@ -'): + line_number = int(re.search(r'@@ -(\d+)', line).group(1)) + for i in range(line_number, -1, -1): + if content[i].startswith('<'): + count += 1 + content[i] = f'' + content[i] + break + with open(file_path, 'w') as file: + file.writelines(content) + hunks = ' '.join(f'#{i + 1}' for i in range(count)) + out_blocks.append(f'

{doc} ' + hunks + ' 

' + + '\n
'
+                            + html.escape(block).strip() + '
') +output_text = '\n'.join(out_blocks) +with open('diff.html', 'w') as f: + f.write(output_text) +EOF +cat diff.html >> CHANGES.html +echo '' >> CHANGES.html +echo '' >> CHANGES.html +rm diff.txt diff.html diff --git a/.ci/describe-system.sh b/.ci/describe-system.sh deleted file mode 100755 index 6bd3b0efd4a..00000000000 --- a/.ci/describe-system.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# **************************************************************************** -# Copyright (C) 2018 Julian Rüth -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# http://www.gnu.org/licenses/ -# **************************************************************************** - -set +e -x - -docker info -docker run docker sh -c " - set -x - uname -a - df -h - cat /proc/cpuinfo - cat /proc/meminfo - cat /proc/sys/vm/overcommit_memory - cat /proc/sys/vm/overcommit_ratio" diff --git a/.ci/merge-fixes.sh b/.ci/merge-fixes.sh index 8ee138660ec..73b4c665caf 100755 --- a/.ci/merge-fixes.sh +++ b/.ci/merge-fixes.sh @@ -1,36 +1,82 @@ #!/bin/sh -# Merge open PRs from sagemath/sage labeled "blocker". -REPO="sagemath/sage" -GH="gh -R $REPO" -PRs="$($GH pr list --label "p: blocker / 1" --json number --jq '.[].number')" -if [ -z "$PRs" ]; then - echo 'Nothing to do: Found no open PRs with "blocker" status.' -else - echo "Found PRs: " $PRs - export GIT_AUTHOR_NAME="ci-sage workflow" - export GIT_AUTHOR_EMAIL="ci-sage@example.com" - export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" - export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" - git tag -f test_base - git commit -q -m "Uncommitted changes" --no-allow-empty -a - for a in $PRs; do - git fetch --unshallow --all > /dev/null 2>&1 && echo "Unshallowed." - echo "::group::Merging PR https://github.com/$REPO/pull/$a" - git tag -f test_head - $GH pr checkout -b pr-$a $a - git checkout -q test_head - if git merge --no-edit --squash -q pr-$a; then - echo "::endgroup::" - if git commit -q -m "Merge https://github.com/$REPO/pull/$a" -a --no-allow-empty; then - echo "Merged #$a" +# Apply open PRs labeled "blocker" from sagemath/sage as patches. +# This script is invoked by various workflows in .github/workflows +# +# The repository variable SAGE_CI_FIXES_FROM_REPOS can be set +# to customize this for CI runs in forks: +# +# - If set to a whitespace-separated list of repositories, use them instead of sagemath/sage. +# - If set to "none", do not apply any PRs. +# +# https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-a-repository +export GIT_AUTHOR_NAME="ci-sage workflow" +export GIT_AUTHOR_EMAIL="ci-sage@example.com" +export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" +export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL" +mkdir -p upstream +for REPO in ${SAGE_CI_FIXES_FROM_REPOSITORIES:-sagemath/sage}; do + case $REPO in + none) + echo "Nothing to do for 'none' in SAGE_CI_FIXES_FROM_REPOSITORIES" + ;; + */*) + echo "Getting open PRs with 'blocker' status from https://github.com/$REPO/pulls?q=is%3Aopen+label%3A%22p%3A+blocker+%2F+1%22" + GH="gh -R $REPO" + REPO_FILE="upstream/ci-fixes-${REPO%%/*}-${REPO##*/}" + PRs="$($GH pr list --label "p: blocker / 1" --json number --jq '.[].number' | tee $REPO_FILE)" + date -u +"%Y-%m-%dT%H:%M:%SZ" > $REPO_FILE.date # Record the date, for future reference + if [ -z "$PRs" ]; then + echo "Nothing to do: Found no open PRs with 'blocker' status in $REPO." else - echo "Empty, skipped" + echo "Found open PRs with 'blocker' status in $REPO: $(echo $PRs)" + git tag -f test_base + git commit -q -m "Uncommitted changes" --no-allow-empty -a + for a in $PRs; do + # We used to pull the branch and merge it (after unshallowing), but when run on PRs that are + # based on older releases, it has the side effect of updating to this release, + # which may be confusing. + # + # Here, we obtain the "git am"-able patch of the PR branch. + # This also makes it unnecessary to unshallow the repository. + # + # Considered alternative: Use https://github.com/$REPO/pull/$a.diff, + # which squashes everything into one diff without commit metadata. + PULL_URL="https://github.com/$REPO/pull/$a" + PULL_FILE="$REPO_FILE-$a" + PATH=build/bin:$PATH build/bin/sage-download-file --quiet "$PULL_URL.patch" $PULL_FILE.patch + date -u +"%Y-%m-%dT%H:%M:%SZ" > $PULL_FILE.date # Record the date, for future reference + LAST_SHA=$(sed -n -E '/^From [0-9a-f]{40}/s/^From ([0-9a-f]{40}).*/\1/p' $PULL_FILE.patch | tail -n 1) + COMMITS_URL="https://github.com/$REPO/commits/$LAST_SHA" + echo "::group::Applying PR $PULL_URL @ $COMMITS_URL as a patch" + export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME applying $PULL_URL @ $COMMITS_URL" + if git am --signoff --empty=keep < $PULL_FILE.patch; then + echo "---- Applied patch --------------------------------------------------------------------------------" + cat $PULL_FILE.patch + echo "--------------------------------------------------------------------8<-----------------------------" + echo "::endgroup::" + elif git am --abort \ + && if git fetch --unshallow --all > /dev/null 2>&1; then echo "Unshallowed"; fi \ + && echo "Retrying with 3-way merge" \ + && git am --empty=keep --3way < $PULL_FILE.patch; then + echo "---- Applied patch --------------------------------------------------------------------------------" + cat $PULL_FILE.patch + echo "--------------------------------------------------------------------8<-----------------------------" + echo "::endgroup::" + else + echo "---- Failure applying patch -----------------------------------------------------------------------" + git am --signoff --show-current-patch=diff + echo "--------------------------------------------------------------------8<-----------------------------" + echo "::endgroup::" + echo "Failure applying $PULL_URL as a patch, resetting" + git am --signoff --abort + fi + done fi - else - echo "::endgroup::" - echo "Failure merging #$a, resetting" - git reset --hard - fi - done - git log test_base..HEAD -fi + ;; + *) + echo "Repository variable SAGE_CI_FIXES_FROM_REPOSITORIES, if set, should be a whitespace-separated list of repositories or 'none'" + echo "Got: $SAGE_CI_FIXES_FROM_REPOSITORIES" + exit 1 + ;; + esac +done diff --git a/.ci/protect-secrets.sh b/.ci/protect-secrets.sh deleted file mode 100755 index 527604106ca..00000000000 --- a/.ci/protect-secrets.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# This script protects all environment variables that start with "SECRET_". -# It puts them in a temporary file. The name of the variable contains the path -# of that file. This filename can then safely be used in `cat` even if `set -# -x` has been turned on. Also you can run "export" to understand the -# environment without danger. -# Be careful, however, not to use this like the following: -# docker login $DOCKER_USER $(cat $SECRET_DOCKER_PASS) -# as this would expose the password if `set -x` has been turned on. - -# **************************************************************************** -# Copyright (C) 2018 Julian Rüth -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# http://www.gnu.org/licenses/ -# **************************************************************************** - -set -eo pipefail -set +x - -function encrypt { - RET=`mktemp` - eval " echo \$$1" > "$RET" - echo $RET -} - -for name in `awk 'END { for (name in ENVIRON) { print name; } }' < /dev/null`; do -case "$name" in - SECRET_*) - export $name="$(encrypt $name)" - echo "Protected $name" - ;; -esac -done - -unset encrypt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53a281ca5b4..c9282086422 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - name: Store CI fixes in upstream artifact run: | mkdir -p upstream diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 2240c224a52..7e6282b92cc 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -38,6 +38,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - name: Create conda environment files run: ./bootstrap-conda diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml index ff3260980d3..d3b7801c548 100644 --- a/.github/workflows/ci-linux-incremental.yml +++ b/.github/workflows/ci-linux-incremental.yml @@ -98,6 +98,7 @@ jobs: ["standard", "minimal"] docker_push_repository: ghcr.io/${{ github.repository }}/ + max_parallel: 8 site: needs: [changed_files] @@ -120,16 +121,10 @@ jobs: docker_targets: "with-targets" targets: "${{needs.changed_files.outputs.uninstall_targets}} ${{needs.changed_files.outputs.build_targets}} build doc-html ptest" # Only test systems with a usable system python (>= 3.9) + # with only a small number of test failures as of 10.2.rc0 tox_system_factors: >- - ["ubuntu-jammy", - "ubuntu-mantic", - "debian-bullseye", - "debian-bookworm", - "fedora-33", - "fedora-38", - "gentoo-python3.11", - "archlinux", - "debian-bullseye-i386"] + ["gentoo-python3.11", + "archlinux"] tox_packages_factors: >- ["standard-sitepackages"] docker_push_repository: ghcr.io/${{ github.repository }}/ diff --git a/.github/workflows/doc-build-pdf.yml b/.github/workflows/doc-build-pdf.yml index 37b0cff6376..bfa32760934 100644 --- a/.github/workflows/doc-build-pdf.yml +++ b/.github/workflows/doc-build-pdf.yml @@ -32,6 +32,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - name: Store CI fixes in upstream artifact run: | mkdir -p upstream @@ -58,7 +59,6 @@ jobs: eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip) eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive) - - name: Add prebuilt tree as a worktree id: worktree run: | diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index b0f3e4566bc..0c5200dbe81 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -27,6 +27,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - name: Store CI fixes in upstream artifact run: | mkdir -p upstream @@ -68,8 +69,8 @@ jobs: -e 's;'"$mathjax_path_from"';'"$mathjax_path_to"';' \ -e '\;; d') # Create git repo from old doc - (cd /sage/local/share/doc/sage/html && \ - git init && \ + DOC_DIR=/sage/local/share/doc/sage/html + (cd $DOC_DIR && git init && \ (echo "*.svg binary"; echo "*.pdf binary") >> .gitattributes && \ (echo ".buildinfo"; echo '*.inv'; echo '.git*'; echo '*.svg'; echo '*.pdf'; echo '*.png'; echo 'searchindex.js') > .gitignore; \ git add -A && git commit --quiet -m "old") @@ -115,10 +116,11 @@ jobs: # incremental docbuild may introduce broken links (inter-file references) though build succeeds run: | set -ex - export SAGE_USE_CDNS=yes - mv /sage/local/share/doc/sage/html/.git /sage/.git-doc + DOC_DIR=/sage/local/share/doc/sage/html + mv $DOC_DIR/.git /sage/.git-doc make doc-clean doc-uninstall - mkdir -p /sage/local/share/doc/sage/html/ && mv /sage/.git-doc /sage/local/share/doc/sage/html/.git + mkdir -p $DOC_DIR/ && mv /sage/.git-doc $DOC_DIR/.git + export SAGE_USE_CDNS=yes ./config.status && make sagemath_doc_html-no-deps working-directory: ./worktree-image env: @@ -130,63 +132,17 @@ jobs: if: (success() || failure()) && steps.docbuild.outcome == 'success' run: | set -ex - mkdir -p ./docs - (cd /sage/local/share/doc/sage/html && git commit -a -m 'new') - # Wipe out chronic diffs between old doc and new doc - (cd /sage/local/share/doc/sage/html && \ - find . -name "*.html" | xargs sed -i -e '\;; d') - # Create CHANGES.html - echo '' > ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - cat >> ./docs/CHANGES.html << EOF - - EOF - echo '' >> ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - (cd /sage/local/share/doc/sage/html && git diff HEAD^ -- *.html; rm -rf .git) > ./docs/diff.txt - /sage/sage -python - << EOF - import re, html - with open('./docs/diff.txt', 'r') as f: - diff_text = f.read() - diff_blocks = re.split(r'^(?=diff --git)', diff_text, flags=re.MULTILINE) - out_blocks = [] - for block in diff_blocks: - match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE) - if match: - path = 'html/' + match.group(1) - out_blocks.append(f'

{path} 

\n
' + html.escape(block).strip() + '
') - output_text = '\n'.join(out_blocks) - with open('./docs/diff.html', 'w') as f: - f.write(output_text) - EOF - cat ./docs/diff.html >> ./docs/CHANGES.html - echo '' >> ./docs/CHANGES.html - echo '' >>./docs/CHANGES.html - rm ./docs/diff.txt ./docs/diff.html - # For some reason the deploy step below cannot find /sage/... - # So copy everything from there to local folder + DOC_DIR=/sage/local/share/doc/sage/html + (cd $DOC_DIR && git commit -a -m 'new') + ls -l /sage/venv/bin + PATH=/sage/venv/bin:$PATH .ci/create-changes-html.sh $(cd $DOC_DIR; git rev-parse HEAD^) $DOC_DIR + (cd $DOC_DIR && rm -rf .git) + # We copy everything to a local folder # We also need to replace the symlinks because netlify is not following them - cp -r -L /sage/local/share/doc/sage/html ./docs - cp /sage/local/share/doc/sage/index.html ./docs + mkdir -p ./docs + mv CHANGES.html ./docs + cp -r -L $DOC_DIR ./docs + cp $DOC_DIR/../index.html ./docs # Zip everything for increased performance zip -r docs.zip docs @@ -202,11 +158,15 @@ jobs: if: (success() || failure()) && steps.copy.outcome == 'success' && github.repository == 'sagemath/sage' && github.ref == 'refs/heads/develop' run: | set -ex + export PATH="build/bin:$PATH" + eval $(sage-print-system-package-command auto update) + eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip) + eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive) export SAGE_USE_CDNS=yes export SAGE_LIVE_DOC=yes export SAGE_JUPYTER_SERVER=binder:sagemath/sage-binder-env/dev make doc-clean doc-uninstall - ./config.status && make sagemath_doc_html-no-deps + ./config.status && make sagemath_doc_html-no-deps sagemath_doc_pdf-no-deps working-directory: ./worktree-image env: MAKE: make -j2 --output-sync=recurse @@ -219,6 +179,7 @@ jobs: set -ex mkdir -p ./livedoc cp -r -L /sage/local/share/doc/sage/html ./livedoc + cp -r -L /sage/local/share/doc/sage/pdf ./livedoc cp /sage/local/share/doc/sage/index.html ./livedoc zip -r livedoc.zip livedoc diff --git a/.github/workflows/doc-publish.yml b/.github/workflows/doc-publish.yml index 961809e343e..361dafb22e0 100644 --- a/.github/workflows/doc-publish.yml +++ b/.github/workflows/doc-publish.yml @@ -28,7 +28,7 @@ jobs: # Once https://github.com/actions/download-artifact/issues/172 and/or https://github.com/actions/download-artifact/issues/60 is implemented, we can use the official download-artifact action # For now use the solution from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow - name: Download docs - uses: actions/github-script@v6.4.0 + uses: actions/github-script@v7.0.1 with: script: | var artifacts = await github.rest.actions.listWorkflowRunArtifacts({ @@ -97,7 +97,7 @@ jobs: if: github.event.workflow_run.conclusion == 'success' && github.repository == 'sagemath/sage' && github.event.workflow_run.head_branch == 'develop' steps: - name: Download live doc - uses: actions/github-script@v6.4.1 + uses: actions/github-script@v7.0.1 with: script: | var artifacts = await github.rest.actions.listWorkflowRunArtifacts({ diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cf1a04f6447..be3e784d87c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -222,6 +222,8 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} + - name: Show disk space run: | df -h diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml new file mode 100644 index 00000000000..694cd51762f --- /dev/null +++ b/.github/workflows/docker_hub.yml @@ -0,0 +1,91 @@ +name: Reusable workflow for Docker Hub images + +on: + workflow_call: + inputs: + dockerhub_repository: + default: sagemath-dev + type: string + dockerfile_target: + default: make-build + type: string + +jobs: + build-and-push: + name: Build Docker image and push to DockerHub + runs-on: ubuntu-latest + steps: + - name: Maximize build disk space + uses: easimon/maximize-build-space@v8 + with: + # need space in /var for Docker images + root-reserve-mb: 40000 + remove-dotnet: true + remove-android: true + remove-haskell: true + remove-codeql: true + remove-docker-images: true + + - name: Checkout + uses: actions/checkout@v4 + + - name: Set tag + # docker/metadata-action@v4 is not used since we need to distinguish + # between latest and develop tags + id: set_tag + run: | + git fetch --depth=1 origin +refs/tags/*:refs/tags/* + TAG_NAME=$(git tag --sort=creatordate | tail -1) + REPO=${{ inputs.dockerhub_repository }} + # see if the tag has already been pushed + # if yes then skip following steps + URL="https://registry.hub.docker.com/v2/repositories/sagemath/$REPO/tags?page_size=32" + LATEST_TAGS=$(curl -L -s $URL | jq '."results"[]["name"]') + JOB_DONE=false + for i in $LATEST_TAGS; do if [[ $i == \"$TAG_NAME\" ]]; then JOB_DONE=true; break; fi done + echo "JOB_DONE=$JOB_DONE" >> $GITHUB_ENV + + if [[ $JOB_DONE == 'false' ]] + then + TAG="sagemath/$REPO:$TAG_NAME" + TAG_LIST="$TAG, sagemath/$REPO:develop" + BASE="sagemath/sagemath-dev:$TAG_NAME" + echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV + echo "TAG=$TAG" >> $GITHUB_ENV + echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV + echo "BASE=$BASE" >> $GITHUB_ENV + fi + df -h + + - name: Update Tag List + id: upd_tag_list + run: | + REPO=${{ inputs.dockerhub_repository }} + TAG_LIST="${{ env.TAG_LIST }}, sagemath/$REPO:latest" + echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV + if: "env.JOB_DONE == 'false' && !contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + if: env.JOB_DONE == 'false' + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + if: env.JOB_DONE == 'false' + + - name: Build and push make-build + uses: docker/build-push-action@v5 + with: + context: . + file: docker/Dockerfile + target: ${{ inputs.dockerfile_target }} + build-args: | + MAKE_BUILD=${{ env.BASE }} + push: true + tags: ${{ env.TAG_LIST }} + cache-from: type=gha + cache-to: type=gha,mode=max + if: env.JOB_DONE == 'false' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7821ea20212..5d444594877 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,6 +26,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - name: Set up Python uses: actions/setup-python@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6d71bcefa16..bfa4bc58f96 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -94,6 +94,7 @@ jobs: .ci/merge-fixes.sh env: GH_TOKEN: ${{ github.token }} + SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }} - uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/push_to_docker_hub.yml b/.github/workflows/push_to_docker_hub.yml index 77a9f819d70..cd289f6a88b 100644 --- a/.github/workflows/push_to_docker_hub.yml +++ b/.github/workflows/push_to_docker_hub.yml @@ -7,106 +7,32 @@ on: - 'develop' push: tags: - # Just create image on pushing a tag - - '*' + # Match all release tags including beta, rc + - '[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.beta[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+.beta[0-9]+' + - '[0-9]+.[0-9]+.rc[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+' + + schedule: + # Recover failed runs each Tuesday and Thursday at one o'clock + - cron: '0 1 * * 2,4' jobs: sagemath-dev: - name: Build Docker image on target make-build and push to DockerHub sagemath-dev - # target make-build replaces former sagemath-dev, see https://github.com/sagemath/sage/pull/36047 - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set tag - # docker/metadata-action@v4 is not used since we need to distinguish - # between latest and develop tags - id: set_tag - run: | - git fetch --depth=1 origin +refs/tags/*:refs/tags/* - TAG_NAME=$(git tag --sort=creatordate | tail -1) - TAG="sagemath/sagemath-dev:$TAG_NAME" - TAG_LIST="$TAG, sagemath/sagemath-dev:develop" - echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV - echo "TAG=$TAG" >> $GITHUB_ENV - echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV - - - name: Update Tag List - id: upd_tag_list - run: | - TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath-dev:latest" - echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV - if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push make-build - uses: docker/build-push-action@v5 - with: - context: . - file: docker/Dockerfile - target: make-build # see the corresponding header-note - push: true - tags: ${{ env.TAG_LIST }} - cache-from: type=gha - cache-to: type=gha,mode=max + uses: ./.github/workflows/docker_hub.yml + with: + # Build from scratch + dockerhub_repository: sagemath-dev + dockerfile_target: make-build + secrets: inherit sagemath: needs: sagemath-dev - name: Build Docker image on target sagemath and push to DockerHub sagemath - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set tag - # docker/metadata-action@v4 is not used since we need to distinguish - # between latest and develop tags - id: set_tag - run: | - git fetch --depth=1 origin +refs/tags/*:refs/tags/* - TAG_NAME=$(git tag --sort=creatordate | tail -1) - TAG="sagemath/sagemath:$TAG_NAME" - TAG_LIST="$TAG, sagemath/sagemath:develop" - BASE="sagemath/sagemath-dev:$TAG_NAME" - echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV - echo "TAG=$TAG" >> $GITHUB_ENV - echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV - echo "BASE=$BASE" >> $GITHUB_ENV - - - name: Update Tag List - id: upd_tag_list - run: | - TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath:latest" - echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV - if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push sagemath - uses: docker/build-push-action@v5 - with: - context: . - file: docker/Dockerfile - build-args: | - MAKE_BUILD=${{ env.BASE }} - target: sagemath - push: true - tags: ${{ env.TAG_LIST }} - cache-from: type=gha - cache-to: type=gha,mode=max + uses: ./.github/workflows/docker_hub.yml + with: + # Build from sagemath-dev + dockerhub_repository: sagemath + dockerfile_target: sagemath + secrets: inherit diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index e80a04b422b..00000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,195 +0,0 @@ -# This file configures automatic builds of Sage on [GitLab](https://gitlab.com). -# To make the build time not too excessive, we seed the build cache with -# sagemath/sagemath-dev:develop. When basic SPKGs changed, this does not help -# much and the full build might exceed the set time limit in GitLab. You can -# increase that limit in Settings → CI/CD. -# You can also provision your own private more powerful runner in the same -# place -# https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-executor; -# or set up your favourite cloud service to provide an on-demand autoscale -# runner. More details below. - -# As of early 2018 a run on GitLab CI takes about 45 minutes. We could probably -# save 10 minutes by not building/pushing/testing dev images for branches other -# than master/develop. - -# Note that most of the time during CI is spent with pulling and pushing of -# docker images and copying files locally as part of the docker build. At the -# moment there is no reliable way of passing the docker images to the following -# stages without explicit pushing/pulling or similar: -# https://gitlab.com/gitlab-org/gitlab-runner/issues/1107 - -# The timings mentioned above are typical values. The shared runners provided -# on gitlab.com are sometimes much slower depending on the runner you are -# scheduled on. Sometimes it's slower for no apparent reason, probably just an -# overcommittment of virtual machines on hardware. - -# GitLab provides several flavours of shared runners (as of early 2018): -# * runners tagged as "do" (digitalocean.com) provide about 60GB of HDD, two -# cores, but only 2GB of RAM. The RAM is sometimes not sufficient to build -# the documentation. -# * runners tagged as "gce" (Google Compute Engine) provide about 22GB of HDD, -# a single core, 4GB of RAM. Since we are relying on OverlayFS, the disk -# space is not sufficient to build sage from scratch. -# The shared runners are terminated after three hours. Currently, this is often -# insufficient to build sage from scratch. - -# If you want to provide your own runners, make sure to tag them as follows: -# * "big" (60GB of disk space are available) to make build-from-clean pass. - -image: docker:stable - -stages: - - build - - test - - release - -variables: - DOCKER_TAG: $CI_COMMIT_REF_NAME - # Builds are very I/O intensive; make sure we have a fast file system. - DOCKER_DRIVER: overlay2 - DEFAULT_ARTIFACT_BASE: sagemath/sagemath-dev:develop - -before_script: - # GitLab has no mechanism yet to hide secret variables: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 - # So we roll our own which protects all variables that start with SECRET_ - - . .ci/protect-secrets.sh - # Collect debug infos about the system we are running on - - .ci/describe-system.sh - # Set DOCKER_TAG according to the current branch/tag - - . .ci/update-env.sh - # Set MAKEFLAGS and SAGE_NUM_THREADS according to the machine we are running on - - . .ci/setup-make-parallelity.sh - -# We use docker-in-docker to build our docker images, i.e., we run a -# docker:dind "service" container and link to it from the container running the -# actual scripts below. -# Our scripts automatically connect to this service (unless you override it by -# setting DOCKER_HOST.) For example, each RUN statement in the Dockerfile -# spawns a docker container inside the docker:dind container to perform the RUN -# command there. -# It can be faster to expose your outer docker daemon by mounting -# /var/run/docker.sock to /var/run/docker.sock and setting DOCKER_HOST in -# Settings -> CI/CD -> Secret variable to unix:///var/run/docker.sock. (The -# speedup is mostly due to sharing layers of intermediate images.) However, -# this is only possible if you provision your own runners. Shared gitlab -# runners, do not bind mount /var/run/docker.sock. Also, docker:dind provides -# better isolation. If you expect many builds to run simultaneously on a host, -# conflicting tags can cause issues with a mounted DOCKER_HOST. -services: -- docker:stable-dind - -# Build Sage and its documentation. -# The build starts from the build artifacts of DEFAULT_ARTIFACT_BASE which is -# usually much faster than building from a clean checkout of Sage. -build-from-latest: - stage: build - artifacts: - when: always - paths: - - gitlab-build-docker.log - - html - expire_in: 1 month - script: - - apk --update add coreutils rsync - # The output of the build can get larger than gitlab.com's limit; only - # print the first 1MB (and the last 80 lines.) GitLab's limit is 4MB, - # however, the list of all branches and tags that shows up in the initial - # checkout takes already 1.5 MB: - # https://gitlab.com/gitlab-org/gitlab-runner/issues/4142 - - .ci/build-docker.sh | tee gitlab-build-docker.log | .ci/head-tail.sh 1048576 - - .ci/push-gitlab.sh sagemath-dev - - .ci/push-gitlab.sh sagemath - - DOCKER_TAG=$CI_COMMIT_SHA .ci/push-gitlab.sh sagemath - except: - - master - - develop - - tags - - web - -# Build Sage and its documentation from a clean checkout of Sage. -# Note that this takes several hours. You probably want to run this on your own -# gitlab-runner and increase the standard GitLab time limit for CI runs. -# Some of the shared runners provided by GitLab for free do not have enough -# disk space for this to work. If a build fails with "no space left on device", -# you could just retry it and hope to be scheduled on a machine with more disk -# space, or provision your own runner. -build-from-clean: - extends: - - build-from-latest - artifacts: - when: always - paths: - - gitlab-build-docker.log - - html - expire_in: 99 years - variables: - ARTIFACT_BASE: "source-clean" - only: - - master - - develop - - tags - # Run build-from-clean for a pipeline that has been explicitly created - # through GitLab's web interface. - - web - except: [] - tags: - # 60 GB of HDD are available - - big - # This build takes several CPU hours. It is very unlikely that there are any - # actual build errors for a tagged release but the (discounted) cloud - # machines this is running on might be preempted during the long build time. - # So let's try three times before we give up. - retry: 2 - -test-dev: - stage: test - dependencies: [] - script: - - . .ci/pull-gitlab.sh sagemath-dev - - sh .ci/test-dev.sh "$DOCKER_IMAGE" - -test-cli: - stage: test - dependencies: [] - script: - - . .ci/pull-gitlab.sh sagemath - - sh .ci/test-cli.sh "$DOCKER_IMAGE" - -test-jupyter: - stage: test - dependencies: [] - script: - - . .ci/pull-gitlab.sh sagemath - - sh .ci/test-jupyter.sh "$DOCKER_IMAGE" docker - -# Pushes the built images to Docker Hub if the Settings -> CI/CD -> Secret -# variables DOCKER_USER and SECRET_DOCKER_PASS have been set up. -push-dockerhub: - stage: release - dependencies: [] - only: - refs: - - branches - - tags - variables: - - $SECRET_DOCKER_PASS - script: - - . .ci/pull-gitlab.sh sagemath - - sh .ci/push-dockerhub.sh sagemath - -# Pushes the built dev images to Docker Hub if the Settings -> CI/CD -> Secret -# variables DOCKER_USER and SECRET_DOCKER_PASS have been set up. -push-dockerhub-dev: - stage: release - dependencies: [] - only: - refs: - - master - - develop - - tags - variables: - - $SECRET_DOCKER_PASS - script: - - . .ci/pull-gitlab.sh sagemath-dev - - sh .ci/push-dockerhub.sh sagemath-dev diff --git a/CITATION.cff b/CITATION.cff index 33dda263384..b4e265090f4 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -4,8 +4,8 @@ title: SageMath abstract: SageMath is a free open-source mathematics software system. authors: - name: "The SageMath Developers" -version: 10.3.beta0 +version: 10.3.beta1 doi: 10.5281/zenodo.593563 -date-released: 2023-12-05 +date-released: 2023-12-10 repository-code: "https://github.com/sagemath/sage" url: "https://www.sagemath.org/" diff --git a/VERSION.txt b/VERSION.txt index 75f3e554fbb..dc0e750e611 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 10.3.beta0, Release Date: 2023-12-05 +SageMath version 10.3.beta1, Release Date: 2023-12-10 diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers index b6259ca9ef1..b159d696745 100644 --- a/build/bin/sage-dist-helpers +++ b/build/bin/sage-dist-helpers @@ -355,38 +355,58 @@ sdh_store_and_pip_install_wheel() { shift done sdh_store_wheel "$@" - if [ -n "$SAGE_SUDO" ]; then - # Trac #29585: Do the SAGE_DESTDIR staging of the wheel installation - # ONLY if SAGE_SUDO is set (in that case, we still do the staging so - # that we do not invoke pip as root). + + wheel_basename="${wheel##*/}" + distname="${wheel_basename%%-*}" + + if [ -d "$SAGE_BUILD_DIR/$PKG_NAME" ]; then + # Normal package install through sage-spkg; + # scripts live in the package's build directory + # until copied to the final destination by sage-spkg. + script_dir="$SAGE_BUILD_DIR/$PKG_NAME" + else + script_dir="$SAGE_SPKG_SCRIPTS/$PKG_BASE" + fi + + if [ -n "$SAGE_DESTDIR" -a -z "$SAGE_SUDO" ]; then + # We stage the wheel file and do the actual installation in post. + echo "sdh_actually_pip_install_wheel $distname $pip_options -r \"\$SAGE_SPKG_SCRIPTS/\$PKG_BASE/spkg-requirements.txt\"" >> "$script_dir"/spkg-pipinst + else if [ -n "$SAGE_DESTDIR" ]; then + # Trac #29585: Do the SAGE_DESTDIR staging of the wheel installation + # ONLY if SAGE_SUDO is set (in that case, we still do the staging so + # that we do not invoke pip as root). # --no-warn-script-location: Suppress a warning caused by --root local sudo="" local root="--root=$SAGE_DESTDIR --no-warn-script-location" - else - # Trac #32361: Of course, this can only be done for normal packages, - # whose installation goes through sage-spkg. - # For script packages, we do have to invoke pip as root. + elif [ -n "$SAGE_SUDO" ]; then + # Trac #32361: For script packages, we do have to invoke pip as root. local sudo="$SAGE_SUDO" local root="" + else + # + local sudo="" + local root="" fi - else - local sudo="" - local root="" + sdh_actually_pip_install_wheel $distname $root $pip_options "$wheel" fi + echo "sdh_pip_uninstall -r \"\$SAGE_SPKG_SCRIPTS/\$PKG_BASE/spkg-requirements.txt\"" >> "$script_dir"/spkg-piprm +} + +sdh_actually_pip_install_wheel() { + distname=$1 + shift # Trac #32659: pip no longer reinstalls local wheels if the version is the same. # Because neither (1) applying patches nor (2) local changes (in the case # of sage-conf, sage-setup, etc.) bump the version number, we need to # override this behavior. The pip install option --force-reinstall does too # much -- it also reinstalls all dependencies, which we do not want. - wheel_basename="${wheel##*/}" - distname="${wheel_basename%%-*}" $sudo sage-pip-uninstall "$distname" if [ $? -ne 0 ]; then echo "(ignoring error)" >&2 fi - $sudo sage-pip-install $root $pip_options "$wheel" || \ - sdh_die "Error installing ${wheel##*/}" + $sudo sage-pip-install "$@" || \ + sdh_die "Error installing $distname" } sdh_pip_uninstall() { diff --git a/build/bin/sage-logger b/build/bin/sage-logger index 1d8d92c0c75..9ae80d404f8 100755 --- a/build/bin/sage-logger +++ b/build/bin/sage-logger @@ -79,7 +79,7 @@ if [ -n "$SAGE_SILENT_BUILD" -a ${use_prefix} = true ]; then status=$? if [[ $status != 0 ]]; then echo " [$logname] error installing, exit status $status. End of log file:" - tail -n 72 "$logfile" | sed "/Please email sage-devel/,$ d;s;^; [$logname] ;" >&2 + tail -n 120 "$logfile" | sed "/Please email sage-devel/,$ d;s;^; [$logname] ;" >&2 echo " [$logname] Full log file: $logfile" else echo " [$logname] successfully installed." diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg index b540c8e866f..383a98ffbbc 100755 --- a/build/bin/sage-spkg +++ b/build/bin/sage-spkg @@ -9,21 +9,7 @@ # # sage-spkg [] # -# Options can be: -# -s: do not delete temporary build directory -# -k: do not uninstall existing installation of this package before -# installing; instead simply overwrite existing files. -# -c: after installing, run the test suite for the spkg. This should -# override the settings of SAGE_CHECK. -# Exit with an error if the test suite fails. -# -w: after installing, run the test suite for the spkg. This should -# override the settings of SAGE_CHECK. -# Print a warning if the test suite fails. -# -d: only download the package -# -y: automatically reply "y" for all prompts regarding -# experimental and old-style packages -# -n: automatically reply "n" for all prompts regarding -# experimental and old-style packages +# Options: see usage() below. # # A package may assume that the following environment # variables are defined: @@ -89,13 +75,22 @@ Usage: sage {-i|-p} Search Sage's list of packages (see 'sage --package list') for a matching package, and if a match is found, install it. -Options: - -s: do not delete the temporary build directory - -c: after installing, run the test suite for the package; - exit with an error on test suite failures - -w: after installing, run the test suite for the package; - print a warning on test suite failures - -d: only download the package +Modes of operation (provide at most one): + -d, --download-only: only download the package + -b, --build-and-stage-only: build and install (stage) only, + do not run post-install or check + -p, --post-install-only: unload the staged installation + directory and run other post-installation steps only + -x, --check-only: exclusively run the test suite; + this may assume that: + * the package has been installed already and/or that + * the temporary build directory has not been deleted + -e, --erase-build-directory-only: erase (delete) the temporary + build directory only + --info: print information on the package only + --help: print this help only + +Other options: -y: automatically reply "y" for all prompts regarding experimental and old-style packages; warning: there is no guarantee that these packages will build correctly; @@ -104,6 +99,12 @@ Options: experimental and old-style packages -o: allow fetching the package from its upstream URL when it is not available from the Sage mirrors (yet) + -c: after installing, run the test suite for the package; + exit with an error on test suite failures + -w: after installing, run the test suite for the package; + print a warning on test suite failures + -s: save (do not delete) the temporary build directory, + even when the installation was successful EOF } @@ -230,15 +231,24 @@ fi INFO=0 YES=0 KEEP_EXISTING=0 +INSTALL=1 +POST_INSTALL=1 +ERASE_ONLY=0 +MODE_SWITCHES= while true; do case "$1" in --info) + MODE_SWITCHES+=", $1" INFO=1;; + --help) + usage + exit 0;; -y) YES=1;; -n) YES=-1;; - -d) + -d|--download-only) + MODE_SWITCHES+=", $1" SAGE_INSTALL_FETCH_ONLY=1;; -s) export SAGE_KEEP_BUILT_SPKGS=yes;; @@ -246,8 +256,20 @@ while true; do export SAGE_CHECK=yes;; -w|--check-warning-only) export SAGE_CHECK=warn;; + -b|--build-and-stage-only) + MODE_SWITCHES+=", $1" + POST_INSTALL=0; export SAGE_CHECK=no;; + -p|--post-install-only) + MODE_SWITCHES+=", $1" + INSTALL=0; export SAGE_CHECK=no;; + -x|--check-only) + MODE_SWITCHES+=", $1" + INSTALL=0; POST_INSTALL=0; export SAGE_CHECK=yes;; -k|--keep-existing) KEEP_EXISTING=yes;; + -e|--erase-build-directory-only) + MODE_SWITCHES+=", $1" + ERASE_ONLY=1;; -o|--allow-upstream) SAGE_DOWNLOAD_FILE_OPTIONS+=" --allow-upstream";; -*) @@ -257,11 +279,15 @@ while true; do esac shift done - - -################################################################## -# Figure out the package filename, download it if needed. -################################################################## +MODE_SWITCHES=${MODE_SWITCHES#, } +case "$MODE_SWITCHES" in + *,*) + echo >&2 "Error: at most one of the mode switches may be given, got $MODE_SWITCHES" + echo >&2 + usage + exit 1 + ;; +esac # One should be able to install a package using # sage -i @@ -313,8 +339,23 @@ fi PKG_BASE_VER=`echo $PKG_VER | sed 's/\.p[0-9][0-9]*$//'` PKG_NAME_UPSTREAM=`lookup_param tarball "$PKG_SCRIPTS/checksums.ini" | sed "s/VERSION/$PKG_BASE_VER/"` -# Warning for experimental packages -if [ x`cat "$PKG_SCRIPTS/type"` = x"experimental" -a $INFO = 0 ]; then +# Set the $SAGE_DESTDIR variable to be passed to the spkg-install +# script (the script itself could set this, but better to standardize +# this in one place) +export SAGE_DESTDIR="${SAGE_BUILD_DIR}/${PKG_NAME}/inst" + +# The actual prefix where the installation will be staged. This is the +# directory that you need to work in if you want to change the staged +# installation tree (before final installation to $SAGE_INST_LOCAL) at the +# end of spkg-install. +export SAGE_DESTDIR_LOCAL="${SAGE_DESTDIR}${SAGE_INST_LOCAL}" + +INSTALLED_SCRIPTS="prerm piprm postrm" +WRAPPED_SCRIPTS="build install check preinst postinst $INSTALLED_SCRIPTS" + + +warning_for_experimental_packages() { ############################ +if [ x`cat "$PKG_SCRIPTS/type"` = x"experimental" ]; then if [ $YES != 1 ]; then # We use /dev/tty here because our output may be redirected # to a logfile, or line-buffered. @@ -344,11 +385,9 @@ EOF echo > /dev/tty "OK, installing $PKG_NAME now..." fi fi +} ############################## warning_for_experimental_packages -if [ $INFO -ne 0 ]; then - exec sage-spkg-info $PKG_BASE -fi - +ensure_pkg_src() { ############################################### # If we haven't found the package yet, we must download it if [ ! -f "$PKG_SRC" ]; then if [ -n "$PKG_NAME_UPSTREAM" ]; then @@ -385,13 +424,9 @@ if [ -n "$SAGE_SPKG_COPY_UPSTREAM" ]; then exit 1 fi fi -if [ -n "$SAGE_INSTALL_FETCH_ONLY" ]; then - exit 0 -fi +} ################################################# ensure_pkg_src -################################################################## -# Setup directories -################################################################## +setup_directories() { ############################################ for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do mkdir -p "$dir" @@ -442,15 +477,19 @@ if [ -e "$PKG_NAME" ]; then error_msg "Error (re)moving $PKG_NAME" exit 1 fi +} ############################################## setup_directories -################################################################## -# Extract the package -################################################################## +extract_the_package() { ########################################## +cd "$SAGE_BUILD_DIR" || exit $? echo "Setting up build directory for $PKG_NAME" cp -RLp "$PKG_SCRIPTS" "$PKG_NAME" cd "$PKG_NAME" || exit $? +if [ "$SAGE_KEEP_BUILT_SPKGS" = "yes" ]; then + touch .keep +fi + case "$PKG_SRC" in *.whl) # (Platform-independent) wheel @@ -476,10 +515,10 @@ case "$PKG_SRC" in cd .. ;; esac +} ############################################ extract_the_package -################################################################## -# The package has been extracted, prepare for installation -################################################################## +# The package has been extracted, +prepare_for_installation() { ##################################### # Rewrites the given bash pseudo-script with a boilerplate header that includes # the shebang line and sourcing sage-env. Make sure the name of the script is @@ -542,15 +581,15 @@ __EOF__ trap - ERR } - -INSTALLED_SCRIPTS="prerm piprm postrm" -WRAPPED_SCRIPTS="build install check preinst postinst $INSTALLED_SCRIPTS" - # Prepare script for uninstallation of packages that use sdh_pip_install # or sdh_store_and_pip_install_wheel. -echo 'sdh_pip_uninstall -r $SAGE_SPKG_SCRIPTS/$PKG_BASE/spkg-requirements.txt' > spkg-piprm.in +touch spkg-piprm.in + +# Prepare script for deferred installation of packages that use sdh_pip_install +# or sdh_store_and_pip_install_wheel. +touch spkg-pipinst.in -for script in $WRAPPED_SCRIPTS; do +for script in $WRAPPED_SCRIPTS pipinst; do # pipinst can be added to WRAPPED_SCRIPTS later # 'Installed' scripts are not run immediately out of the package build # directory, and may be run later, so set their root directory to # $SAGE_ROOT @@ -566,6 +605,9 @@ for script in $WRAPPED_SCRIPTS; do write_script_wrapper "$(pwd)/$script" "$script_dir" fi done +} ####################################### prepare_for_installation + +actually_build_and_install() { ################################### echo "****************************************************" echo "Host system:" @@ -576,15 +618,12 @@ echo "C compiler version:" $CC -v echo "****************************************************" -################################################################## # Poison the proxy variable to forbid downloads in spkg-install -################################################################## export http_proxy=http://192.0.2.0:5187/ export https_proxy=$http_proxy export ftp_proxy=$http_proxy export rsync_proxy=$http_proxy -################################################################## # We need to run sage-rebase.sh for each package installed, but it # can be dangerous to do this while other packages are installing # so we need to use a lock to manage when rebase is allowed to @@ -594,8 +633,6 @@ export rsync_proxy=$http_proxy # that. This also unfortunately slows down parallel builds since # all packages will eventually need to wait for this lock, but # again there's no simple way around that. -################################################################## - if [ "$UNAME" = "CYGWIN" ]; then # This is a global lock - so we use SAGE_LOCAL, not SAGE_INST_LOCAL. if [ ! -d "$SAGE_LOCAL/var/lock" ]; then @@ -605,21 +642,6 @@ if [ "$UNAME" = "CYGWIN" ]; then sage-flock -s $lock_type 200 fi -################################################################## -# Actually install -################################################################## - -# Set the $SAGE_DESTDIR variable to be passed to the spkg-install -# script (the script itself could set this, but better to standardize -# this in one place) -export SAGE_DESTDIR="${SAGE_BUILD_DIR}/${PKG_NAME}/inst" - -# The actual prefix where the installation will be staged. This is the -# directory that you need to work in if you want to change the staged -# installation tree (before final installation to $SAGE_INST_LOCAL) at the -# end of spkg-install. -export SAGE_DESTDIR_LOCAL="${SAGE_DESTDIR}${SAGE_INST_LOCAL}" - # First uninstall the previous version of this package, if any if [ "$KEEP_EXISTING" != "yes" ]; then sage-spkg-uninstall "$PKG_BASE" "$SAGE_INST_LOCAL" @@ -658,14 +680,17 @@ else exit 1 fi fi +} ##################################### actually_build_and_install -# To work around #26996: Remove the symlink set, or we get "cp: cannot overwrite directory" +unload_destdir() { ############################################### +# To work around #26996: Remove the symlink set, +# or we get "cp: cannot overwrite directory" rm -f "$SAGE_DESTDIR_LOCAL/lib64" # All spkgs should eventually support this, but fall back on old behavior in # case DESTDIR=$SAGE_DESTDIR installation was not used -echo "Copying package files from temporary location $SAGE_DESTDIR to $SAGE_INST_LOCAL" if [ -d "$SAGE_DESTDIR" ]; then + echo "Moving package files from temporary location $SAGE_DESTDIR to $SAGE_INST_LOCAL" # Some `find` implementations will put superfluous slashes in the # output if we give them a directory name with a slash; so make sure # any trailing slash is removed; https://github.com/sagemath/sage/issues/26013 @@ -683,22 +708,25 @@ if [ -d "$SAGE_DESTDIR" ]; then # Copy files into $SAGE_INST_LOCAL $SAGE_SUDO cp -Rp "$PREFIX/." "$SAGE_INST_LOCAL" if [ $? -ne 0 ]; then - error_msg "Error copying files for $PKG_NAME." + error_msg "Error moving files for $PKG_NAME." exit 1 fi # Remove the $SAGE_DESTDIR entirely once all files have been moved to their # final location. rm -rf "$SAGE_DESTDIR" +else + echo "The temporary location $SAGE_DESTDIR does not exist; has it been unloaded already?" + exit 1 fi - # At this stage the path in $SAGE_DESTDIR no longer exists, so the variable # should be unset unset SAGE_DESTDIR unset SAGE_DESTDIR_LOCAL +} ################################################# unload_destdir - +install_scripts() { ############################################## # Some spkg scripts, if they exist, should also be installed to # $SAGE_SPKG_SCRIPTS; they are not included in the package's manifest, but are # removed by sage-spkg-uninstall @@ -706,10 +734,11 @@ INSTALLED_SCRIPTS_DEST="$SAGE_SPKG_SCRIPTS/$PKG_BASE" if [ ! -f $INSTALLED_SCRIPTS_DEST/spkg-requirements.txt ]; then # No packages to uninstall with pip, so remove the prepared uninstall script - rm -f spkg-piprm spkg-piprm.in + # and the prepared deferred installation script + rm -f spkg-piprm spkg-piprm.in spkg-pipinst spkg-pipinst.in fi -for script in $INSTALLED_SCRIPTS; do +for script in $INSTALLED_SCRIPTS pipinst; do # pipinst can be added to WRAPPED_SCRIPTS later script="spkg-$script" if [ -f "$script" ]; then @@ -726,9 +755,19 @@ for script in $INSTALLED_SCRIPTS; do fi fi done +} ################################################ install_scripts - +post_install() { ################################################# # Run the post-install script, if any +# But first complete the delayed installation of wheels. +if [ -f spkg-pipinst ]; then + echo "Running pip-install script for $PKG_NAME." + $SAGE_SUDO ./spkg-pipinst + if [ $? -ne 0 ]; then + error_msg "Error running the pipinst script for $PKG_NAME." + exit 1 + fi +fi if [ -f spkg-postinst ]; then echo "Running post-install script for $PKG_NAME." time $SAGE_SUDO ./spkg-postinst @@ -750,8 +789,9 @@ if [ "$UNAME" = "CYGWIN" ]; then sage-flock -x "$SAGE_LOCAL/var/lock/rebase.lock" \ sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null fi +} ################################################### post_install - +run_test_suite() { ############################################### # Note: spkg-check tests are run after the package has been copied into # SAGE_INST_LOCAL. It might make more sense to run the tests before, but the # spkg-check scripts were written before use of DESTDIR installs, and so @@ -764,7 +804,8 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then if [ $? -ne 0 ]; then TEST_SUITE_RESULT="failed" if [ "$SAGE_CHECK" = "warn" ]; then - # The following warning message must be consistent with SAGE_ROOT/build/make/install (see trac:32781) + # The following warning message must be consistent + # with SAGE_ROOT/build/make/install (see #32781) error_msg "Warning: Failures testing package $PKG_NAME (ignored)" "make check" else error_msg "Error testing package $PKG_NAME" "make check" @@ -779,7 +820,9 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then TEST_SUITE_RESULT="not available" fi fi +} ################################################# run_test_suite +write_installation_record() { #################################### # For each line in $FILE_LIST, enclose in double quotes: NEW_LIST="" for f in $FILE_LIST; do @@ -806,25 +849,69 @@ cat > "$PKG_NAME_INSTALLED" << __EOF__ ] } __EOF__ +} ###################################### write_installation_record - -echo "Successfully installed $PKG_NAME" - - -################################################################## -# Delete the temporary build directory if required -################################################################## -if [ "x$SAGE_KEEP_BUILT_SPKGS" != "xyes" ]; then +delete_the_temporary_build_directory() { ######################### echo "Deleting temporary build directory" echo "$SAGE_BUILD_DIR/$PKG_NAME" # On Solaris, the current working directory cannot be deleted, # so we "cd" out of $SAGE_BUILD_DIR/$PKG_NAME. See #12637. cd "$SAGE_BUILD_DIR" rm -rf "$SAGE_BUILD_DIR/$PKG_NAME" +} ########################### delete_the_temporary_build_directory + +delete_the_temporary_build_directory_if_required() { ############# +if [ ! -e "$SAGE_BUILD_DIR/$PKG_NAME/.keep" ]; then + delete_the_temporary_build_directory else echo "You can safely delete the temporary build directory" echo "$SAGE_BUILD_DIR/$PKG_NAME" fi +} ############### delete_the_temporary_build_directory_if_required + + +################################################################## +# MAIN +################################################################## + +if [ $INFO -ne 0 ]; then + exec sage-spkg-info $PKG_BASE +fi + +if [ $ERASE_ONLY = 1 ]; then + delete_the_temporary_build_directory + exit 0 +fi + +if [ $INSTALL = 1 ]; then + warning_for_experimental_packages + ensure_pkg_src +fi + +if [ -n "$SAGE_INSTALL_FETCH_ONLY" ]; then + exit 0 +fi +if [ $INSTALL = 1 ]; then + setup_directories + extract_the_package + prepare_for_installation + actually_build_and_install +else + cd "$SAGE_BUILD_DIR/$PKG_NAME" || exit $? +fi -echo "Finished installing $PKG_NAME" +if [ $POST_INSTALL = 1 ]; then + unload_destdir + install_scripts + post_install +fi + +run_test_suite + +if [ $POST_INSTALL = 1 ]; then + write_installation_record + echo "Successfully installed $PKG_NAME" + delete_the_temporary_build_directory_if_required + echo "Finished installing $PKG_NAME" +fi diff --git a/build/pkgs/cmake/checksums.ini b/build/pkgs/cmake/checksums.ini index a145b30dfb4..312edba61ff 100644 --- a/build/pkgs/cmake/checksums.ini +++ b/build/pkgs/cmake/checksums.ini @@ -1,5 +1,5 @@ tarball=cmake-VERSION.tar.gz -sha1=3e9b980bfb16974f57ca02b5e2b403a2ef2d4eca -md5=7228f5fcc8a858fdeac27e29bda0c144 -cksum=2027526722 +sha1=05de9ac807fefeb2a36ed5e8fcea376a00dd3d57 +md5=df0e65607c9280a8df68b2c93eac4437 +cksum=3851971657 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz diff --git a/build/pkgs/cmake/package-version.txt b/build/pkgs/cmake/package-version.txt index a155471fc06..f641ba7ef04 100644 --- a/build/pkgs/cmake/package-version.txt +++ b/build/pkgs/cmake/package-version.txt @@ -1 +1 @@ -3.27.3 +3.27.8 diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 6fab326e890..d89eb3cf828 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=cba1a107f45084e1884ca8a873504c70eec9c16c -md5=b61e77023581c8994c73313e867a6c26 -cksum=615928275 +sha1=60efc2b1ac7c0dcd9175cbfad5beefaf8969f24f +md5=0dc99ff8479a481293e59816a5d21488 +cksum=2783976116 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index d124c289596..b10c55b0156 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -9b1e18ffc022a8ed0e7451ccf190a009ceb2d81c +f66d283d487c6f8bcee6e135c93c5613796ce9e2 diff --git a/build/pkgs/meson_python/checksums.ini b/build/pkgs/meson_python/checksums.ini index 7eb55561d9a..1561ae04424 100644 --- a/build/pkgs/meson_python/checksums.ini +++ b/build/pkgs/meson_python/checksums.ini @@ -1,5 +1,5 @@ tarball=meson_python-VERSION.tar.gz -sha1=ce9192048927ee724673f57d9881b6bee320ff82 -md5=27bc0a24d1f5e2e83236a73f0826eadb -cksum=530505556 +sha1=71bf382c2f2e76aada2f511a84bd59a99a6b1238 +md5=e91eb9946d7bb8be06e434c5a2dadd05 +cksum=535820777 upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz diff --git a/build/pkgs/meson_python/package-version.txt b/build/pkgs/meson_python/package-version.txt index a803cc227fe..a5510516948 100644 --- a/build/pkgs/meson_python/package-version.txt +++ b/build/pkgs/meson_python/package-version.txt @@ -1 +1 @@ -0.14.0 +0.15.0 diff --git a/build/pkgs/pari/spkg-configure.m4 b/build/pkgs/pari/spkg-configure.m4 index 1404defc518..5ece8b4891e 100644 --- a/build/pkgs/pari/spkg-configure.m4 +++ b/build/pkgs/pari/spkg-configure.m4 @@ -1,6 +1,6 @@ SAGE_SPKG_CONFIGURE([pari], [ dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV - m4_pushdef([SAGE_PARI_MINVER],["134912"])dnl this version and higher allowed + m4_pushdef([SAGE_PARI_MINVER],["134916"])dnl this version and higher allowed m4_pushdef([SAGE_PARI_MAXVER],["999999"])dnl this version and higher not allowed SAGE_SPKG_DEPCHECK([gmp readline], [ AC_PATH_PROG([GP], [gp]) @@ -68,24 +68,6 @@ SAGE_SPKG_CONFIGURE([pari], [ sage_spkg_install_pari=yes fi - AC_MSG_CHECKING([whether factor() bug 2469 of pari 2.15.3 is fixed]) - result=`echo "f=factor(2^2203-1); print(\"ok\")" | timeout 1 $GP -qf` - if test x"$result" = xok; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no; cannot use system pari/GP with known bug]) - sage_spkg_install_pari=yes - fi - - AC_MSG_CHECKING([whether qfbclassno() bug 2466 of pari 2.15.3 is fixed]) - result=`echo "qfbclassno(33844)" | $GP -qf` - if test x"$result" = x3; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no; cannot use system pari/GP with known bug]) - sage_spkg_install_pari=yes - fi - fi dnl end GP test if test x$sage_spkg_install_pari = xno; then dnl main PARI test diff --git a/build/pkgs/pip/spkg-pipinst.in b/build/pkgs/pip/spkg-pipinst.in new file mode 100644 index 00000000000..3e3f6bbc94e --- /dev/null +++ b/build/pkgs/pip/spkg-pipinst.in @@ -0,0 +1,5 @@ +cd src + +# pip can install its own wheel! But first we need to ensure that the pip +# source directory in on the PYTHONPATH +export PYTHONPATH="$(pwd)/src" diff --git a/build/pkgs/sage_conf/install-requires.txt b/build/pkgs/sage_conf/install-requires.txt index 38ec7e2cd5d..e21358d2d6c 100644 --- a/build/pkgs/sage_conf/install-requires.txt +++ b/build/pkgs/sage_conf/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-conf ~= 10.3b0 +sage-conf ~= 10.3b1 diff --git a/build/pkgs/sage_docbuild/install-requires.txt b/build/pkgs/sage_docbuild/install-requires.txt index 3769c7054e8..f1e8ac83886 100644 --- a/build/pkgs/sage_docbuild/install-requires.txt +++ b/build/pkgs/sage_docbuild/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-docbuild ~= 10.3b0 +sage-docbuild ~= 10.3b1 diff --git a/build/pkgs/sage_setup/install-requires.txt b/build/pkgs/sage_setup/install-requires.txt index 0913b873634..2cee4def9db 100644 --- a/build/pkgs/sage_setup/install-requires.txt +++ b/build/pkgs/sage_setup/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-setup ~= 10.3b0 +sage-setup ~= 10.3b1 diff --git a/build/pkgs/sage_sws2rst/install-requires.txt b/build/pkgs/sage_sws2rst/install-requires.txt index 8e3570a99d3..fe18058a251 100644 --- a/build/pkgs/sage_sws2rst/install-requires.txt +++ b/build/pkgs/sage_sws2rst/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sage-sws2rst ~= 10.3b0 +sage-sws2rst ~= 10.3b1 diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt index 307a02db545..5ef8b7febd4 100644 --- a/build/pkgs/sagelib/install-requires.txt +++ b/build/pkgs/sagelib/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-standard ~= 10.3b0 +sagemath-standard ~= 10.3b1 diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/install-requires.txt index b340ea27044..434216dc8ef 100644 --- a/build/pkgs/sagemath_bliss/install-requires.txt +++ b/build/pkgs/sagemath_bliss/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss ~= 10.3b0 +sagemath-bliss ~= 10.3b1 diff --git a/build/pkgs/sagemath_categories/install-requires.txt b/build/pkgs/sagemath_categories/install-requires.txt index 9019a793f10..57a3530c389 100644 --- a/build/pkgs/sagemath_categories/install-requires.txt +++ b/build/pkgs/sagemath_categories/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-categories ~= 10.3b0 +sagemath-categories ~= 10.3b1 diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/install-requires.txt index e57fd056654..395192023e6 100644 --- a/build/pkgs/sagemath_coxeter3/install-requires.txt +++ b/build/pkgs/sagemath_coxeter3/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 ~= 10.3b0 +sagemath-coxeter3 ~= 10.3b1 diff --git a/build/pkgs/sagemath_environment/install-requires.txt b/build/pkgs/sagemath_environment/install-requires.txt index 9202789d78a..f44a3871358 100644 --- a/build/pkgs/sagemath_environment/install-requires.txt +++ b/build/pkgs/sagemath_environment/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-environment ~= 10.3b0 +sagemath-environment ~= 10.3b1 diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/install-requires.txt index 93f176e6fc5..04eb1f48c9f 100644 --- a/build/pkgs/sagemath_mcqd/install-requires.txt +++ b/build/pkgs/sagemath_mcqd/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd ~= 10.3b0 +sagemath-mcqd ~= 10.3b1 diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/install-requires.txt index ee1e280aad1..83a3c23ac0c 100644 --- a/build/pkgs/sagemath_meataxe/install-requires.txt +++ b/build/pkgs/sagemath_meataxe/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe ~= 10.3b0 +sagemath-meataxe ~= 10.3b1 diff --git a/build/pkgs/sagemath_objects/install-requires.txt b/build/pkgs/sagemath_objects/install-requires.txt index 07baf32ec81..46ec6f8eb68 100644 --- a/build/pkgs/sagemath_objects/install-requires.txt +++ b/build/pkgs/sagemath_objects/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-objects ~= 10.3b0 +sagemath-objects ~= 10.3b1 diff --git a/build/pkgs/sagemath_repl/install-requires.txt b/build/pkgs/sagemath_repl/install-requires.txt index 79c7e5a7ed0..4d3da43b2cf 100644 --- a/build/pkgs/sagemath_repl/install-requires.txt +++ b/build/pkgs/sagemath_repl/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-repl ~= 10.3b0 +sagemath-repl ~= 10.3b1 diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/install-requires.txt index 44ebb97d788..fa923dda429 100644 --- a/build/pkgs/sagemath_sirocco/install-requires.txt +++ b/build/pkgs/sagemath_sirocco/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco ~= 10.3b0 +sagemath-sirocco ~= 10.3b1 diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/install-requires.txt index ea24439a16a..913c85d2233 100644 --- a/build/pkgs/sagemath_tdlib/install-requires.txt +++ b/build/pkgs/sagemath_tdlib/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib ~= 10.3b0 +sagemath-tdlib ~= 10.3b1 diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini index 1c1813e7eea..8eb65f05ef9 100644 --- a/build/pkgs/symengine/checksums.ini +++ b/build/pkgs/symengine/checksums.ini @@ -1,5 +1,5 @@ tarball=symengine-VERSION.tar.gz -sha1=11885879ddcd0a9ab69e36a79b93aef836d6c95d -md5=4673c85b423241ce85a9df35a7ed61bb -cksum=1344562381 +sha1=a2c8957f2099c9199751b165f107bf93d6823818 +md5=fe3c3fee1bd8dfdb9576fc2d28cb1076 +cksum=3544211225 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz diff --git a/build/pkgs/symengine/distros/arch.txt b/build/pkgs/symengine/distros/arch.txt new file mode 100644 index 00000000000..7bcf459b746 --- /dev/null +++ b/build/pkgs/symengine/distros/arch.txt @@ -0,0 +1 @@ +symengine diff --git a/build/pkgs/symengine/distros/homebrew.txt b/build/pkgs/symengine/distros/homebrew.txt new file mode 100644 index 00000000000..7bcf459b746 --- /dev/null +++ b/build/pkgs/symengine/distros/homebrew.txt @@ -0,0 +1 @@ +symengine diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt index 571215736a6..af88ba82486 100644 --- a/build/pkgs/symengine/package-version.txt +++ b/build/pkgs/symengine/package-version.txt @@ -1 +1 @@ -0.10.1 +0.11.1 diff --git a/build/pkgs/symengine/spkg-configure.m4 b/build/pkgs/symengine/spkg-configure.m4 new file mode 100644 index 00000000000..c037d2e5f72 --- /dev/null +++ b/build/pkgs/symengine/spkg-configure.m4 @@ -0,0 +1,45 @@ +SAGE_SPKG_CONFIGURE([symengine], [ + m4_pushdef(SAGE_SYMENGINE_VERSION_MAJOR, [0]) + m4_pushdef(SAGE_SYMENGINE_VERSION_MINOR, [11]) + SAGE_SPKG_DEPCHECK([gmp arb ecm flint mpc mpfr], [ + AC_CHECK_HEADER([symengine/symengine_config.h], [], [sage_spkg_install_symengine=yes]) + AC_MSG_CHECKING([whether we can link a program using symengine]) + SYMENGINE_SAVED_LIBS=$LIBS + LIBS="$LIBS -lsymengine" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[#include ]], + [[using SymEngine::Expression; + Expression x("x"); + auto ex = pow(x+sqrt(Expression(2)), 6);]] + )], [AC_MSG_RESULT([yes])], [ + AC_MSG_RESULT([no]); sage_spkg_install_symengine=yes + LIBS=$SYMENGINE_SAVED_LIBS + ]) + AC_MSG_CHECKING([symengine version >= ]SAGE_SYMENGINE_VERSION_MAJOR[.]SAGE_SYMENGINE_VERSION_MINOR) + AC_RUN_IFELSE([ + AC_LANG_PROGRAM( + [[#include + #include + ]], [[ + fprintf(stderr, "%s\n", SYMENGINE_VERSION); + if (SYMENGINE_MAJOR_VERSION >]] SAGE_SYMENGINE_VERSION_MAJOR[[) return 0; + else if (SYMENGINE_MAJOR_VERSION ==]] SAGE_SYMENGINE_VERSION_MAJOR[[ && + SYMENGINE_MINOR_VERSION >=]] SAGE_SYMENGINE_VERSION_MINOR[[) return 0; + else return 1; + ]])], [ + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + sage_spkg_install_symengine=yes + ], [ + dnl assume that the person running cross-compiling + dnl knows what they are doing + AC_MSG_RESULT([yes]) + ]) + ]) + + m4_popdef([SAGE_SYMENGINE_VERSION_MAJOR]) + m4_popdef([SAGE_SYMENGINE_VERSION_MINOR]) +], [], [], [] +) + diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini index 0235c5e9cd9..f8790fdfb4e 100644 --- a/build/pkgs/symengine_py/checksums.ini +++ b/build/pkgs/symengine_py/checksums.ini @@ -1,5 +1,5 @@ tarball=symengine.py-VERSION.tar.gz -sha1=fbbf052e66077ec51df319444b71f94114f33d9e -md5=fc5d2d7f571a880aa2e040214aed2ff0 -cksum=2535731241 -upstream_url=https://github.com/symengine/symengine.py/archive/vVERSION.tar.gz +sha1=4a8da0d0a057c8709c5b28543dbb3d26a060f013 +md5=d10f4ba5c27b09ef234fcafddf824ce5 +cksum=1332096394 +upstream_url=https://pypi.io/packages/source/p/symengine/symengine-VERSION.tar.gz diff --git a/build/pkgs/symengine_py/distros/arch.txt b/build/pkgs/symengine_py/distros/arch.txt new file mode 100644 index 00000000000..16ff7effe29 --- /dev/null +++ b/build/pkgs/symengine_py/distros/arch.txt @@ -0,0 +1 @@ +python-symengine diff --git a/build/pkgs/symengine_py/distros/freebsd.txt b/build/pkgs/symengine_py/distros/freebsd.txt new file mode 100644 index 00000000000..9fa30f46fb7 --- /dev/null +++ b/build/pkgs/symengine_py/distros/freebsd.txt @@ -0,0 +1 @@ +math/py-symengine diff --git a/build/pkgs/symengine_py/distros/gentoo.txt b/build/pkgs/symengine_py/distros/gentoo.txt new file mode 100644 index 00000000000..e8851805aea --- /dev/null +++ b/build/pkgs/symengine_py/distros/gentoo.txt @@ -0,0 +1 @@ +dev-python/symengine diff --git a/build/pkgs/symengine_py/package-version.txt b/build/pkgs/symengine_py/package-version.txt index 78bc1abd14f..d9df1bbc0c7 100644 --- a/build/pkgs/symengine_py/package-version.txt +++ b/build/pkgs/symengine_py/package-version.txt @@ -1 +1 @@ -0.10.0 +0.11.0 diff --git a/build/pkgs/symengine_py/spkg-configure.m4 b/build/pkgs/symengine_py/spkg-configure.m4 new file mode 100644 index 00000000000..9559bdb6da0 --- /dev/null +++ b/build/pkgs/symengine_py/spkg-configure.m4 @@ -0,0 +1 @@ +SAGE_SPKG_CONFIGURE([symengine_py], [SAGE_PYTHON_PACKAGE_CHECK([symengine_py])]) diff --git a/build/pkgs/symengine_py/type b/build/pkgs/symengine_py/type index af4d63af86d..134d9bc32d5 100644 --- a/build/pkgs/symengine_py/type +++ b/build/pkgs/symengine_py/type @@ -1 +1 @@ -experimental \ No newline at end of file +optional diff --git a/build/pkgs/texttable/checksums.ini b/build/pkgs/texttable/checksums.ini index 380a205bdd3..d8725b785b2 100644 --- a/build/pkgs/texttable/checksums.ini +++ b/build/pkgs/texttable/checksums.ini @@ -1,5 +1,5 @@ tarball=texttable-VERSION.tar.gz -sha1=25e1b92e02c8e919dc0da053efbe8c4874418a8d -md5=83eb15fb541dd857ff051a8d0c979b9c -cksum=3183998721 +sha1=0fa175fa6e0fefea31434746641bedc8cbb60248 +md5=e5d380c04fab132ccf0bbfd4f761bd51 +cksum=274394355 upstream_url=https://pypi.io/packages/source/t/texttable/texttable-VERSION.tar.gz diff --git a/build/pkgs/texttable/package-version.txt b/build/pkgs/texttable/package-version.txt index 400084b1bf2..bd8bf882d06 100644 --- a/build/pkgs/texttable/package-version.txt +++ b/build/pkgs/texttable/package-version.txt @@ -1 +1 @@ -1.6.7 +1.7.0 diff --git a/build/pkgs/trove_classifiers/checksums.ini b/build/pkgs/trove_classifiers/checksums.ini index 1f04c749038..d59736dbac2 100644 --- a/build/pkgs/trove_classifiers/checksums.ini +++ b/build/pkgs/trove_classifiers/checksums.ini @@ -1,5 +1,5 @@ tarball=trove-classifiers-VERSION.tar.gz -sha1=4763a32114b3bb96dfd447404022586355c5f83f -md5=6ae148c8374d131dd18e28c22275d56a -cksum=1938191178 +sha1=c6821e6c6d57dc2eec2d4156d63cdca939373759 +md5=154ae4cdb69ac37bb35a35c6fbc477cd +cksum=84032195 upstream_url=https://pypi.io/packages/source/t/trove_classifiers/trove-classifiers-VERSION.tar.gz diff --git a/build/pkgs/trove_classifiers/package-version.txt b/build/pkgs/trove_classifiers/package-version.txt index 0497ae632a3..b82d6dba095 100644 --- a/build/pkgs/trove_classifiers/package-version.txt +++ b/build/pkgs/trove_classifiers/package-version.txt @@ -1 +1 @@ -2023.8.7 +2023.11.14 diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-conf/VERSION.txt +++ b/pkgs/sage-conf/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-conf_conda/VERSION.txt +++ b/pkgs/sage-conf_conda/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-conf_pypi/VERSION.txt +++ b/pkgs/sage-conf_pypi/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-docbuild/VERSION.txt +++ b/pkgs/sage-docbuild/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-setup/VERSION.txt +++ b/pkgs/sage-setup/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sage-sws2rst/VERSION.txt +++ b/pkgs/sage-sws2rst/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 7783c12c118..df61e7fac6a 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -11,3 +11,25 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-bliss" +description = "Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss" +dependencies = [ + SPKG_INSTALL_REQUIRES_cysignals +] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[project.optional-dependencies] +test = [SPKG_INSTALL_REQUIRES_sagemath_repl] + +[tool.setuptools] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 deleted file mode 100644 index d1faa96a563..00000000000 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ /dev/null @@ -1,17 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-bliss -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 -install_requires = - SPKG_INSTALL_REQUIRES_cysignals - -[options.extras_require] -test = - SPKG_INSTALL_REQUIRES_sagemath_repl diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-categories/VERSION.txt +++ b/pkgs/sagemath-categories/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 index 69613011371..a8d0e52a4b0 100644 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -10,3 +10,27 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-coxeter3" +description = "Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3" +dependencies = [] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +packages = ["sage.libs.coxeter3"] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} + +[tool.setuptools.package-data] +"sage.libs.coxeter3" = [ + "coxeter.pxd", + "decl.pxd", +] diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 deleted file mode 100644 index ab3288d89ab..00000000000 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ /dev/null @@ -1,20 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-coxeter3 -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3 -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 -install_requires = - -packages = - sage.libs.coxeter3 - -[options.package_data] -sage.libs.coxeter3 = - coxeter.pxd - decl.pxd diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-environment/VERSION.txt +++ b/pkgs/sagemath-environment/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 index bb34e4c5eb9..c94aface3fd 100644 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -11,3 +11,27 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-mcqd" +description = "Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd" +dependencies = [ + SPKG_INSTALL_REQUIRES_memory_allocator + SPKG_INSTALL_REQUIRES_cysignals +] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +packages = ["sage.graphs"] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} + +[tool.setuptools.package-data] +"sage.graphs" = ["mcqd.pxd"] diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 deleted file mode 100644 index fff8f2805ef..00000000000 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ /dev/null @@ -1,21 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-mcqd -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 -install_requires = - SPKG_INSTALL_REQUIRES_memory_allocator - SPKG_INSTALL_REQUIRES_cysignals - -packages = - sage.graphs - -[options.package_data] -sage.graphs = - mcqd.pxd diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 index 69613011371..0c8fd46d8be 100644 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -10,3 +10,28 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-meataxe" +description = "Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe" +dependencies = [] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +packages = [ + "sage.libs", + "sage.matrix", +] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} + +[tool.setuptools.package-data] +"sage.libs" = ["meataxe.pxd"] +"sage.matrix" = ["matrix_gfpn_dense.pxd"] diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 deleted file mode 100644 index a558825e120..00000000000 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ /dev/null @@ -1,22 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-meataxe -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 - -packages = - sage.libs - sage.matrix - -[options.package_data] -sage.libs = - meataxe.pxd - -sage.matrix = - matrix_gfpn_dense.pxd diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-objects/VERSION.txt +++ b/pkgs/sagemath-objects/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-repl/VERSION.txt +++ b/pkgs/sagemath-repl/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 index 684ed189d9f..55e400738d7 100644 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -11,3 +11,23 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-sirocco" +description = "Sage: Open Source Mathematics Software: Certified root continuation with sirocco" +dependencies = [ + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_cysignals +] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 deleted file mode 100644 index 4f1e0f03d95..00000000000 --- a/pkgs/sagemath-sirocco/setup.cfg.m4 +++ /dev/null @@ -1,14 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-sirocco -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Certified root continuation with sirocco -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 -install_requires = - SPKG_INSTALL_REQUIRES_cypari - SPKG_INSTALL_REQUIRES_cysignals diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 index 69613011371..8e3bcdd988f 100644 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -10,3 +10,22 @@ requires = [ SPKG_INSTALL_REQUIRES_pkgconfig ] build-backend = "setuptools.build_meta" + +[project] +name = "sagemath-tdlib" +description = "Sage: Open Source Mathematics Software: Tree decompositions with tdlib" +dependencies = [ + SPKG_INSTALL_REQUIRES_cysignals +] +dynamic = ["version"] +include(`pyproject_toml_metadata.m4')dnl' + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[tool.setuptools] +include-package-data = false + +[tool.setuptools.dynamic] +version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 deleted file mode 100644 index 62833bbe6f6..00000000000 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ /dev/null @@ -1,12 +0,0 @@ -include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- -[metadata] -name = sagemath-tdlib -version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Tree decompositions with tdlib -long_description = file: README.rst -long_description_content_type = text/x-rst -include(`setup_cfg_metadata.m4')dnl' - -[options] -python_requires = >=3.8, <3.12 -install_requires = SPKG_INSTALL_REQUIRES_cysignals diff --git a/src/VERSION.txt b/src/VERSION.txt index d1741c9f234..84e7588ad82 100644 --- a/src/VERSION.txt +++ b/src/VERSION.txt @@ -1 +1 @@ -10.3.beta0 +10.3.beta1 diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 9f4098364dc..d97ae9d5c1a 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -4,6 +4,6 @@ # which stops "setup.py develop" from rewriting it as a Python file. : # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='10.3.beta0' -SAGE_RELEASE_DATE='2023-12-05' -SAGE_VERSION_BANNER='SageMath version 10.3.beta0, Release Date: 2023-12-05' +SAGE_VERSION='10.3.beta1' +SAGE_RELEASE_DATE='2023-12-10' +SAGE_VERSION_BANNER='SageMath version 10.3.beta1, Release Date: 2023-12-10' diff --git a/src/doc/common/static/custom-furo.css b/src/doc/common/static/custom-furo.css index 343fbb908cf..fc76a3f7c0f 100644 --- a/src/doc/common/static/custom-furo.css +++ b/src/doc/common/static/custom-furo.css @@ -11,3 +11,13 @@ body[data-theme="dark"] div.highlight { background: #383838; } +/* Copied the style for a.pdf from website/templates/index_furo.html */ + +a.pdf { + margin-right: 0.5em; +} + +a.pdf:hover { + text-decoration: none; +} + diff --git a/src/doc/de/tutorial/tour_plotting.rst b/src/doc/de/tutorial/tour_plotting.rst index e7dc377193f..495c5a6943b 100644 --- a/src/doc/de/tutorial/tour_plotting.rst +++ b/src/doc/de/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: Plotten diff --git a/src/doc/en/developer/packaging_sage_library.rst b/src/doc/en/developer/packaging_sage_library.rst index 576356a9dff..d5f5a3dac4b 100644 --- a/src/doc/en/developer/packaging_sage_library.rst +++ b/src/doc/en/developer/packaging_sage_library.rst @@ -451,7 +451,7 @@ Apparently it does not in a very substantial way: merely a heuristic. Looking at the source of "entropy", through ``log`` from :mod:`sage.misc.functional`, a runtime dependency on symbolics comes in. In fact, for this reason, two doctests there are - already marked as ``# optional - sage.symbolic``. + already marked as ``# needs sage.symbolic``. So if packaged as **sagemath-coding**, now a domain expert would have to decide whether these dependencies on symbolics are strong enough to diff --git a/src/doc/en/prep/Calculus.rst b/src/doc/en/prep/Calculus.rst index af6902b9e04..c2f636be558 100644 --- a/src/doc/en/prep/Calculus.rst +++ b/src/doc/en/prep/Calculus.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/prep/Quickstarts/Differential-Equations.rst b/src/doc/en/prep/Quickstarts/Differential-Equations.rst index 3c023424db8..94964ccc0a7 100644 --- a/src/doc/en/prep/Quickstarts/Differential-Equations.rst +++ b/src/doc/en/prep/Quickstarts/Differential-Equations.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/prep/Quickstarts/Statistics-and-Distributions.rst b/src/doc/en/prep/Quickstarts/Statistics-and-Distributions.rst index ed7eed79dfc..e83516d6833 100644 --- a/src/doc/en/prep/Quickstarts/Statistics-and-Distributions.rst +++ b/src/doc/en/prep/Quickstarts/Statistics-and-Distributions.rst @@ -142,13 +142,14 @@ the examples in ``r.kruskal_test?`` in the notebook. :: - sage: x=r([2.9, 3.0, 2.5, 2.6, 3.2]) # normal subjects # optional - rpy2 - sage: y=r([3.8, 2.7, 4.0, 2.4]) # with obstructive airway disease # optional - rpy2 - sage: z=r([2.8, 3.4, 3.7, 2.2, 2.0]) # with asbestosis # optional - rpy2 - sage: a = r([x,y,z]) # make a long R vector of all the data # optional - rpy2 - sage: b = r.factor(5*[1]+4*[2]+5*[3]) # create something for R to tell # optional - rpy2 - ....: # which subjects are which - sage: a; b # show them # optional - rpy2 + sage: # optional - rpy2 + sage: x = r([2.9, 3.0, 2.5, 2.6, 3.2]) # normal subjects + sage: y = r([3.8, 2.7, 4.0, 2.4]) # with obstructive airway disease + sage: z = r([2.8, 3.4, 3.7, 2.2, 2.0]) # with asbestosis + sage: a = r([x,y,z]) # make a long R vector of all the data + sage: b = r.factor(5*[1] + 4*[2] + 5*[3]) # create something for R to tell + ....: # which subjects are which + sage: a; b # show them [1] 2.9 3.0 2.5 2.6 3.2 3.8 2.7 4.0 2.4 2.8 3.4 3.7 2.2 2.0 [1] 1 1 1 1 1 2 2 2 2 3 3 3 3 3 Levels: 1 2 3 diff --git a/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst b/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst index 6e0ab69765a..3bc9308669b 100644 --- a/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst +++ b/src/doc/en/prep/Symbolics-and-Basic-Plotting.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/reference/references/index.rst b/src/doc/en/reference/references/index.rst index d39195c34d3..fd3963ab275 100644 --- a/src/doc/en/reference/references/index.rst +++ b/src/doc/en/reference/references/index.rst @@ -1238,6 +1238,9 @@ REFERENCES: :doi:`10.1109/SFCS.1989.63516`, _ +.. [Bro2009] \R. Bröker: *Constructing supersingular elliptic curves*. + Journal of Combinatorics and Number Theory 1.3 (2009), pp. 269--273. + .. [Broder2000] Broder, A.Z., Kumar, R., Maghoul, F., Raghavan, P., Rajagopalan, S., Stata, R., Tomkins, A., Wiener, J.L.: Graph structure in the web. Computer Networks 33(1-6), 309–320 (2000) diff --git a/src/doc/en/thematic_tutorials/coercion_and_categories.rst b/src/doc/en/thematic_tutorials/coercion_and_categories.rst index 7f5712caea7..1c1d7c85b5f 100644 --- a/src/doc/en/thematic_tutorials/coercion_and_categories.rst +++ b/src/doc/en/thematic_tutorials/coercion_and_categories.rst @@ -114,7 +114,6 @@ This base class provides a lot more methods than a general parent:: '_coerce_', '_coerce_c', '_coerce_impl', - '_coerce_try', '_default_category', '_gens', '_ideal_class_', diff --git a/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst b/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst index b7d689e5ca3..ca7fdac7197 100644 --- a/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst +++ b/src/doc/en/thematic_tutorials/geometry/polyhedra_tutorial.rst @@ -91,7 +91,7 @@ and some rays. :: - sage: P1 = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]]) + sage: P1 = Polyhedron(vertices=[[1, 0], [0, 1]], rays=[[1, 1]]) sage: P1 A 2-dimensional polyhedron in QQ^2 defined as the convex hull of 2 vertices and 1 ray @@ -118,9 +118,9 @@ We can also add a lineality space. :: - sage: P2 = Polyhedron(vertices = [[1/2, 0, 0], [0, 1/2, 0]], - ....: rays = [[1, 1, 0]], - ....: lines = [[0, 0, 1]]) + sage: P2 = Polyhedron(vertices=[[1/2, 0, 0], [0, 1/2, 0]], + ....: rays=[[1, 1, 0]], + ....: lines=[[0, 0, 1]]) sage: P2 A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 2 vertices, 1 ray, 1 line sage: P2.plot() @@ -144,7 +144,7 @@ The chosen ring depends on the input format. :: - sage: P3 = Polyhedron(vertices = [[0.5, 0], [0, 0.5]]) + sage: P3 = Polyhedron(vertices=[[0.5, 0], [0, 0.5]]) sage: P3 A 1-dimensional polyhedron in RDF^2 defined as the convex hull of 2 vertices sage: P3.parent() @@ -163,22 +163,22 @@ The following example demonstrates the limitations of :code:`RDF`. :: - sage: D = polytopes.dodecahedron() # optional - sage.rings.number_field - sage: D # optional - sage.rings.number_field + sage: D = polytopes.dodecahedron() # needs sage.rings.number_field + sage: D # needs sage.rings.number_field A 3-dimensional polyhedron in (Number Field in sqrt5 with defining polynomial x^2 - 5 with sqrt5 = 2.236067977499790?)^3 defined as the convex hull of 20 vertices - sage: vertices_RDF = [n(v.vector(),digits=6) for v in D.vertices()] # optional - sage.rings.number_field - sage: D_RDF = Polyhedron(vertices=vertices_RDF, base_ring=RDF) # optional - sage.rings.number_field + sage: vertices_RDF = [n(v.vector(),digits=6) for v in D.vertices()] # needs sage.rings.number_field + sage: D_RDF = Polyhedron(vertices=vertices_RDF, base_ring=RDF) # needs sage.rings.number_field doctest:warning ... UserWarning: This polyhedron data is numerically complicated; cdd could not convert between the inexact V and H representation without loss of data. The resulting object might show inconsistencies. - sage: D_RDF = Polyhedron(vertices=sorted(vertices_RDF), base_ring=RDF) # optional - sage.rings.number_field + sage: D_RDF = Polyhedron(vertices=sorted(vertices_RDF), base_ring=RDF) # needs sage.rings.number_field Traceback (most recent call last): ... ValueError: *Error: Numerical inconsistency is found. Use the GMP exact arithmetic. @@ -199,11 +199,12 @@ It is also possible to define a polyhedron over algebraic numbers. :: - sage: sqrt_2 = AA(2)^(1/2) # optional - sage.rings.number_field - sage: cbrt_2 = AA(2)^(1/3) # optional - sage.rings.number_field - sage: timeit('Polyhedron(vertices = [[sqrt_2, 0], [0, cbrt_2]])') # optional - sage.rings.number_field # random + sage: # needs sage.rings.number_field + sage: sqrt_2 = AA(2)^(1/2) + sage: cbrt_2 = AA(2)^(1/3) + sage: timeit('Polyhedron(vertices=[[sqrt_2, 0], [0, cbrt_2]])') # random 5 loops, best of 3: 43.2 ms per loop - sage: P4 = Polyhedron(vertices = [[sqrt_2, 0], [0, cbrt_2]]); P4 # optional - sage.rings.number_field + sage: P4 = Polyhedron(vertices=[[sqrt_2, 0], [0, cbrt_2]]); P4 A 1-dimensional polyhedron in AA^2 defined as the convex hull of 2 vertices .. end of output @@ -212,11 +213,12 @@ There is another way to create a polyhedron over algebraic numbers: :: - sage: K. = NumberField(x^2 - 2, embedding=AA(2)**(1/2)) # optional - sage.rings.number_field - sage: L. = NumberField(x^3 - 2, embedding=AA(2)**(1/3)) # optional - sage.rings.number_field - sage: timeit('Polyhedron(vertices = [[a, 0], [0, b]])') # optional - sage.rings.number_field # random + sage: # needs sage.rings.number_field + sage: K. = NumberField(x^2 - 2, embedding=AA(2)**(1/2)) + sage: L. = NumberField(x^3 - 2, embedding=AA(2)**(1/3)) + sage: timeit('Polyhedron(vertices=[[a, 0], [0, b]])') # random 5 loops, best of 3: 39.9 ms per loop - sage: P5 = Polyhedron(vertices = [[a, 0], [0, b]]); P5 # optional - sage.rings.number_field + sage: P5 = Polyhedron(vertices=[[a, 0], [0, b]]); P5 A 1-dimensional polyhedron in AA^2 defined as the convex hull of 2 vertices .. end of output @@ -225,10 +227,11 @@ If the base ring is known it may be a good option to use the proper :meth:`sage. :: - sage: J = K.composite_fields(L)[0] # optional - sage.rings.number_field - sage: timeit('Polyhedron(vertices = [[J(a), 0], [0, J(b)]])') # optional - sage.rings.number_field # random + sage: # needs sage.rings.number_field + sage: J = K.composite_fields(L)[0] + sage: timeit('Polyhedron(vertices=[[J(a), 0], [0, J(b)]])') # random 25 loops, best of 3: 9.8 ms per loop - sage: P5_comp = Polyhedron(vertices = [[J(a), 0], [0, J(b)]]); P5_comp # optional - sage.rings.number_field + sage: P5_comp = Polyhedron(vertices=[[J(a), 0], [0, J(b)]]); P5_comp A 1-dimensional polyhedron in (Number Field in ab with defining polynomial x^6 - 6*x^4 - 4*x^3 + 12*x^2 - 24*x - 4 @@ -242,9 +245,9 @@ It is not possible to define a polyhedron over it: :: - sage: sqrt_2s = sqrt(2) # optional - sage.symbolic - sage: cbrt_2s = 2^(1/3) # optional - sage.symbolic - sage: Polyhedron(vertices = [[sqrt_2s, 0], [0, cbrt_2s]]) # optional - sage.symbolic + sage: sqrt_2s = sqrt(2) # needs sage.symbolic + sage: cbrt_2s = 2^(1/3) # needs sage.symbolic + sage: Polyhedron(vertices=[[sqrt_2s, 0], [0, cbrt_2s]]) # needs sage.symbolic Traceback (most recent call last): ... ValueError: no default backend for computations with Symbolic Ring @@ -389,7 +392,7 @@ inequalities and equalities as objects. :: - sage: P3_QQ = Polyhedron(vertices = [[0.5, 0], [0, 0.5]], base_ring=QQ) + sage: P3_QQ = Polyhedron(vertices=[[0.5, 0], [0, 0.5]], base_ring=QQ) sage: HRep = P3_QQ.Hrepresentation() sage: H1 = HRep[0]; H1 An equation (2, 2) x - 1 == 0 @@ -527,7 +530,7 @@ In order to use a specific backend, we specify the :code:`backend` parameter. :: - sage: P1_cdd = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]], backend='cdd') + sage: P1_cdd = Polyhedron(vertices=[[1, 0], [0, 1]], rays=[[1, 1]], backend='cdd') sage: P1_cdd A 2-dimensional polyhedron in QQ^2 defined as the convex hull of 2 vertices and 1 ray @@ -567,7 +570,7 @@ The :code:`cdd` backend accepts also entries in :code:`RDF`: :: - sage: P3_cdd = Polyhedron(vertices = [[0.5, 0], [0, 0.5]], backend='cdd') + sage: P3_cdd = Polyhedron(vertices=[[0.5, 0], [0, 0.5]], backend='cdd') sage: P3_cdd A 1-dimensional polyhedron in RDF^2 defined as the convex hull of 2 vertices @@ -577,12 +580,12 @@ but not algebraic or symbolic values: :: - sage: P4_cdd = Polyhedron(vertices = [[sqrt_2, 0], [0, cbrt_2]], backend='cdd') # optional - sage.rings.number_field + sage: P4_cdd = Polyhedron(vertices=[[sqrt_2, 0], [0, cbrt_2]], backend='cdd') # needs sage.rings.number_field Traceback (most recent call last): ... ValueError: No such backend (=cdd) implemented for given basering (=Algebraic Real Field). - sage: P5_cdd = Polyhedron(vertices = [[sqrt_2s, 0], [0, cbrt_2s]], backend='cdd') # optional - sage.symbolic + sage: P5_cdd = Polyhedron(vertices=[[sqrt_2s, 0], [0, cbrt_2s]], backend='cdd') # needs sage.symbolic Traceback (most recent call last): ... ValueError: No such backend (=cdd) implemented for given basering (=Symbolic Ring). @@ -656,8 +659,8 @@ An example with quadratic field: :: - sage: V = polytopes.dodecahedron().vertices_list() # optional - sage.rings.number_field - sage: Polyhedron(vertices=V, backend='polymake') # optional - jupymake # optional - sage.rings.number_field + sage: V = polytopes.dodecahedron().vertices_list() # needs sage.rings.number_field + sage: Polyhedron(vertices=V, backend='polymake') # optional - jupymake # needs sage.rings.number_field A 3-dimensional polyhedron in (Number Field in sqrt5 with defining polynomial x^2 - 5 with sqrt5 = 2.236067977499790?)^3 @@ -681,7 +684,7 @@ examples. :: - sage: type(D) # optional - sage.rings.number_field + sage: type(D) # needs sage.rings.number_field .. end of output @@ -691,13 +694,14 @@ backend :code:`field` is called. :: - sage: P4.parent() # optional - sage.rings.number_field + sage: # needs sage.rings.number_field + sage: P4.parent() Polyhedra in AA^2 - sage: P5.parent() # optional - sage.rings.number_field + sage: P5.parent() Polyhedra in AA^2 - sage: type(P4) # optional - sage.rings.number_field + sage: type(P4) - sage: type(P5) # optional - sage.rings.number_field + sage: type(P5) .. end of output @@ -709,13 +713,15 @@ The fourth backend is :code:`normaliz` and is an optional Sage package. :: - sage: P1_normaliz = Polyhedron(vertices = [[1, 0], [0, 1]], rays = [[1, 1]], backend='normaliz') # optional - pynormaliz - sage: type(P1_normaliz) # optional - pynormaliz + sage: # optional - pynormaliz + sage: P1_normaliz = Polyhedron(vertices=[[1, 0], [0, 1]], rays=[[1, 1]], + ....: backend='normaliz') + sage: type(P1_normaliz) - sage: P2_normaliz = Polyhedron(vertices = [[1/2, 0, 0], [0, 1/2, 0]], # optional - pynormaliz - ....: rays = [[1, 1, 0]], - ....: lines = [[0, 0, 1]], backend='normaliz') - sage: type(P2_normaliz) # optional - pynormaliz + sage: P2_normaliz = Polyhedron(vertices=[[1/2, 0, 0], [0, 1/2, 0]], + ....: rays=[[1, 1, 0]], + ....: lines=[[0, 0, 1]], backend='normaliz') + sage: type(P2_normaliz) .. end of output @@ -724,7 +730,7 @@ This backend does not work with :code:`RDF` or other inexact fields. :: - sage: P3_normaliz = Polyhedron(vertices = [[0.5, 0], [0, 0.5]], backend='normaliz') # optional - pynormaliz + sage: P3_normaliz = Polyhedron(vertices=[[0.5, 0], [0, 0.5]], backend='normaliz') # optional - pynormaliz Traceback (most recent call last): ... ValueError: No such backend (=normaliz) implemented for given basering (=Real Double Field). @@ -738,12 +744,14 @@ the computation is done using an embedded number field. :: - sage: P4_normaliz = Polyhedron(vertices = [[sqrt_2, 0], [0, cbrt_2]], backend='normaliz') # optional - pynormaliz - sage: P4_normaliz # optional - pynormaliz + sage: # optional - pynormaliz + sage: P4_normaliz = Polyhedron(vertices=[[sqrt_2, 0], [0, cbrt_2]], + ....: backend='normaliz') + sage: P4_normaliz A 1-dimensional polyhedron in AA^2 defined as the convex hull of 2 vertices - - sage: P5_normaliz = Polyhedron(vertices = [[sqrt_2s, 0], [0, cbrt_2s]], backend='normaliz') # optional - pynormaliz - sage: P5_normaliz # optional - pynormaliz + sage: P5_normaliz = Polyhedron(vertices=[[sqrt_2s, 0], [0, cbrt_2s]], + ....: backend='normaliz') + sage: P5_normaliz A 1-dimensional polyhedron in (Symbolic Ring)^2 defined as the convex hull of 2 vertices .. end of output @@ -753,12 +761,14 @@ The backend :code:`normaliz` provides other methods such as :: - sage: P6 = Polyhedron(vertices = [[0, 0], [3/2, 0], [3/2, 3/2], [0, 3]], backend='normaliz') # optional - pynormaliz - sage: IH = P6.integral_hull(); IH # optional - pynormaliz + sage: # optional - pynormaliz + sage: P6 = Polyhedron(vertices=[[0, 0], [3/2, 0], [3/2, 3/2], [0, 3]], + ....: backend='normaliz') + sage: IH = P6.integral_hull(); IH A 2-dimensional polyhedron in QQ^2 defined as the convex hull of 4 vertices - sage: P6.plot(color='blue')+IH.plot(color='red') # optional - pynormaliz + sage: P6.plot(color='blue') + IH.plot(color='red') Graphics object consisting of 12 graphics primitives - sage: P1_normaliz.integral_hull() # optional - pynormaliz + sage: P1_normaliz.integral_hull() A 2-dimensional polyhedron in QQ^2 defined as the convex hull of 2 vertices and 1 ray .. end of output @@ -788,7 +798,7 @@ polytope is already defined! :: - sage: A = polytopes.buckyball(); A # can take long # optional - sage.rings.number_field + sage: A = polytopes.buckyball(); A # can take long # needs sage.rings.number_field A 3-dimensional polyhedron in (Number Field in sqrt5 with defining polynomial x^2 - 5 with sqrt5 = 2.236067977499790?)^3 diff --git a/src/doc/en/thematic_tutorials/media/stand-a.png b/src/doc/en/thematic_tutorials/media/stand-a.png index e2c973a3371..5b51eae50ff 100644 Binary files a/src/doc/en/thematic_tutorials/media/stand-a.png and b/src/doc/en/thematic_tutorials/media/stand-a.png differ diff --git a/src/doc/en/thematic_tutorials/media/stand-b.png b/src/doc/en/thematic_tutorials/media/stand-b.png index 21db8f321a6..bc270abde8c 100644 Binary files a/src/doc/en/thematic_tutorials/media/stand-b.png and b/src/doc/en/thematic_tutorials/media/stand-b.png differ diff --git a/src/doc/en/thematic_tutorials/media/stand-c.png b/src/doc/en/thematic_tutorials/media/stand-c.png index fe480d5f7f4..3874783ae7b 100644 Binary files a/src/doc/en/thematic_tutorials/media/stand-c.png and b/src/doc/en/thematic_tutorials/media/stand-c.png differ diff --git a/src/doc/en/thematic_tutorials/media/stand-d.png b/src/doc/en/thematic_tutorials/media/stand-d.png index 3f7809b4f1d..3a72676da90 100644 Binary files a/src/doc/en/thematic_tutorials/media/stand-d.png and b/src/doc/en/thematic_tutorials/media/stand-d.png differ diff --git a/src/doc/en/thematic_tutorials/media/stand-g.png b/src/doc/en/thematic_tutorials/media/stand-g.png index b817da8f1ad..aeb401483fd 100644 Binary files a/src/doc/en/thematic_tutorials/media/stand-g.png and b/src/doc/en/thematic_tutorials/media/stand-g.png differ diff --git a/src/doc/en/thematic_tutorials/media/standard1.png b/src/doc/en/thematic_tutorials/media/standard1.png index 1ddccd21c0d..28a9314dc82 100644 Binary files a/src/doc/en/thematic_tutorials/media/standard1.png and b/src/doc/en/thematic_tutorials/media/standard1.png differ diff --git a/src/doc/en/thematic_tutorials/media/tableau1.png b/src/doc/en/thematic_tutorials/media/tableau1.png index 98d034a0840..52e7c1703c9 100644 Binary files a/src/doc/en/thematic_tutorials/media/tableau1.png and b/src/doc/en/thematic_tutorials/media/tableau1.png differ diff --git a/src/doc/en/thematic_tutorials/media/tableau2.png b/src/doc/en/thematic_tutorials/media/tableau2.png index ba142fa1408..9dae9ebe93d 100644 Binary files a/src/doc/en/thematic_tutorials/media/tableau2.png and b/src/doc/en/thematic_tutorials/media/tableau2.png differ diff --git a/src/doc/en/thematic_tutorials/media/tableau3.png b/src/doc/en/thematic_tutorials/media/tableau3.png index 63f8894bdb7..bce84867d4a 100644 Binary files a/src/doc/en/thematic_tutorials/media/tableau3.png and b/src/doc/en/thematic_tutorials/media/tableau3.png differ diff --git a/src/doc/en/thematic_tutorials/media/tableau4.png b/src/doc/en/thematic_tutorials/media/tableau4.png index df317758406..1857acc6cb8 100644 Binary files a/src/doc/en/thematic_tutorials/media/tableau4.png and b/src/doc/en/thematic_tutorials/media/tableau4.png differ diff --git a/src/doc/en/thematic_tutorials/media/tableaux.png b/src/doc/en/thematic_tutorials/media/tableaux.png index 6dc74d77ccd..5d6ad183e60 100644 Binary files a/src/doc/en/thematic_tutorials/media/tableaux.png and b/src/doc/en/thematic_tutorials/media/tableaux.png differ diff --git a/src/doc/en/thematic_tutorials/media/tensor.png b/src/doc/en/thematic_tutorials/media/tensor.png index a15989a1075..c7287e2d0da 100644 Binary files a/src/doc/en/thematic_tutorials/media/tensor.png and b/src/doc/en/thematic_tutorials/media/tensor.png differ diff --git a/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst b/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst index ba6cfb5fb86..56ffac780ad 100644 --- a/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst +++ b/src/doc/en/thematic_tutorials/numerical_sage/cvxopt.rst @@ -28,15 +28,16 @@ by :: - sage: import numpy # optional - cvxopt - sage: from cvxopt.base import spmatrix # optional - cvxopt - sage: from cvxopt.base import matrix as m # optional - cvxopt - sage: from cvxopt import umfpack # optional - cvxopt - sage: Integer = int # optional - cvxopt - sage: V = [2,3, 3,-1,4, 4,-3,1,2, 2, 6,1] # optional - cvxopt - sage: I = [0,1, 0, 2,4, 1, 2,3,4, 2, 1,4] # optional - cvxopt - sage: J = [0,0, 1, 1,1, 2, 2,2,2, 3, 4,4] # optional - cvxopt - sage: A = spmatrix(V,I,J) # optional - cvxopt + sage: # needs cvxopt + sage: import numpy + sage: from cvxopt.base import spmatrix + sage: from cvxopt.base import matrix as m + sage: from cvxopt import umfpack + sage: Integer = int + sage: V = [2,3, 3,-1,4, 4,-3,1,2, 2, 6,1] + sage: I = [0,1, 0, 2,4, 1, 2,3,4, 2, 1,4] + sage: J = [0,0, 1, 1,1, 2, 2,2,2, 3, 4,4] + sage: A = spmatrix(V,I,J) To solve an equation :math:`AX=B`, with :math:`B=[1,1,1,1,1]`, we could do the following. @@ -45,9 +46,9 @@ we could do the following. :: - sage: B = numpy.array([1.0]*5) # optional - cvxopt - sage: B.shape=(5,1) # optional - cvxopt - sage: print(B) # optional - cvxopt + sage: B = numpy.array([1.0]*5) # needs cvxopt + sage: B.shape=(5,1) # needs cvxopt + sage: print(B) # needs cvxopt [[1.] [1.] [1.] @@ -55,15 +56,16 @@ we could do the following. [1.]] - sage: print(A) # optional - cvxopt + sage: # needs cvxopt + sage: print(A) [ 2.00e+00 3.00e+00 0 0 0 ] [ 3.00e+00 0 4.00e+00 0 6.00e+00] [ 0 -1.00e+00 -3.00e+00 2.00e+00 0 ] [ 0 0 1.00e+00 0 0 ] [ 0 4.00e+00 2.00e+00 0 1.00e+00] - sage: C = m(B) # optional - cvxopt - sage: umfpack.linsolve(A,C) # optional - cvxopt - sage: print(C) # optional - cvxopt + sage: C = m(B) + sage: umfpack.linsolve(A,C) + sage: print(C) [ 5.79e-01] [-5.26e-02] [ 1.00e+00] @@ -81,13 +83,14 @@ We could compute the approximate minimum degree ordering by doing :: - sage: RealNumber = float # optional - cvxopt - sage: Integer = int # optional - cvxopt - sage: from cvxopt.base import spmatrix # optional - cvxopt - sage: from cvxopt import amd # optional - cvxopt - sage: A = spmatrix([10,3,5,-2,5,2],[0,2,1,2,2,3],[0,0,1,1,2,3]) # optional - cvxopt - sage: P = amd.order(A) # optional - cvxopt - sage: print(P) # optional - cvxopt + sage: # needs cvxopt + sage: RealNumber = float + sage: Integer = int + sage: from cvxopt.base import spmatrix + sage: from cvxopt import amd + sage: A = spmatrix([10,3,5,-2,5,2],[0,2,1,2,2,3],[0,0,1,1,2,3]) + sage: P = amd.order(A) + sage: print(P) [ 1] [ 0] [ 2] @@ -108,14 +111,15 @@ For a simple linear programming example, if we want to solve :: - sage: RealNumber = float # optional - cvxopt - sage: Integer = int # optional - cvxopt - sage: from cvxopt.base import matrix as m # optional - cvxopt - sage: from cvxopt import solvers # optional - cvxopt - sage: c = m([-4., -5.]) # optional - cvxopt - sage: G = m([[2., 1., -1., 0.], [1., 2., 0., -1.]]) # optional - cvxopt - sage: h = m([3., 3., 0., 0.]) # optional - cvxopt - sage: sol = solvers.lp(c,G,h) # random # optional - cvxopt + sage: # needs cvxopt + sage: RealNumber = float + sage: Integer = int + sage: from cvxopt.base import matrix as m + sage: from cvxopt import solvers + sage: c = m([-4., -5.]) + sage: G = m([[2., 1., -1., 0.], [1., 2., 0., -1.]]) + sage: h = m([3., 3., 0., 0.]) + sage: sol = solvers.lp(c,G,h) # random pcost dcost gap pres dres k/t 0: -8.1000e+00 -1.8300e+01 4e+00 0e+00 8e-01 1e+00 1: -8.8055e+00 -9.4357e+00 2e-01 1e-16 4e-02 3e-02 @@ -127,6 +131,6 @@ For a simple linear programming example, if we want to solve :: - sage: print(sol['x']) # optional - cvxopt # ... below since can get -00 or +00 depending on architecture + sage: print(sol['x']) # ... below since can get -00 or +00 depending on architecture # needs cvxopt [ 1.00e...00] [ 1.00e+00] diff --git a/src/doc/en/thematic_tutorials/steenrod_algebra_modules.rst b/src/doc/en/thematic_tutorials/steenrod_algebra_modules.rst index f038ff7acaa..6a096608c68 100644 --- a/src/doc/en/thematic_tutorials/steenrod_algebra_modules.rst +++ b/src/doc/en/thematic_tutorials/steenrod_algebra_modules.rst @@ -41,7 +41,8 @@ with relations, the coefficients for each relation is given:: sage: r1 = [Sq(8), Sq(7), 0] # First relation sage: r2 = [Sq(7), 0, 1] # Second relation sage: M = SteenrodFPModule(A, [0, 1, 7], relations=[r1, r2]); M - Finitely presented left module on 3 generators and 2 relations over mod 2 Steenrod algebra, milnor basis + Finitely presented left module on 3 generators and 2 relations + over mod 2 Steenrod algebra, milnor basis The resulting module will have three generators in the degrees we gave them:: @@ -156,8 +157,8 @@ A vector space presentation can be produced:: Vector space quotient V/W of dimension 4 over Finite Field of size 2 where V: Vector space of dimension 4 over Finite Field of size 2 W: Vector space of degree 4 and dimension 0 over Finite Field of size 2 - Basis matrix: - [] + Basis matrix: + [] Given any element, its coordinates with respect to this basis can be computed:: @@ -188,11 +189,13 @@ such homomorphisms using the function ``Hom``:: sage: Hko = SteenrodFPModule(A, [0], [[Sq(2)], [Sq(1)]]) sage: homspace = Hom(Hko, Hko); homspace - Set of Morphisms from Finitely presented left module on 1 generator and 2 relations - over mod 2 Steenrod algebra, milnor basis - to Finitely presented left module on 1 generator and 2 relations - over mod 2 Steenrod algebra, milnor basis - in Category of finitely presented graded modules over mod 2 Steenrod algebra, milnor basis + Set of Morphisms + from Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis + to Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis + in Category of finitely presented graded modules + over mod 2 Steenrod algebra, milnor basis Just as with module elements, homomorphisms are created using the homspace. The only argument is a list of elements in the codomain, giving the @@ -207,7 +210,8 @@ The resulting homomorphism is the one sending the `i`-th generator of the domain to the `i`-th codomain value given:: sage: f - Module endomorphism of Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> Sq(0,0,1)*g[0] Homomorphisms can be evaluated on elements of the domain module:: @@ -232,7 +236,8 @@ Convenience methods exist for creating the trivial morphism:: sage: x == 0 False sage: zero_map = homspace.zero(); zero_map - Module endomorphism of Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> 0 sage: zero_map(x) 0 @@ -242,7 +247,8 @@ Convenience methods exist for creating the trivial morphism:: as well as the identity endomorphism:: sage: one = Hom(Hko, Hko).identity(); one - Module endomorphism of Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> g[0] sage: one.is_endomorphism() True @@ -271,7 +277,8 @@ Any two homomorphisms can be added as long as they are of the same degree:: sage: (f1 + f2).is_zero() False sage: f1 + f2 - Module endomorphism of Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> (Sq(0,0,3)+Sq(0,2,0,1)+Sq(8,2,1))*g[0] or when at least one of them is zero:: @@ -302,32 +309,32 @@ elements is a linear transformation:: [1 0 0 0 0 0] [0 0 0 0 0 0] [1 0 0 0 0 0] - Domain: Vector space quotient V/W of dimension 3 over Finite Field of size 2 where - V: Vector space of dimension 20 over Finite Field of size 2 - W: Vector space of degree 20 and dimension 17 over Finite Field of size 2 - Basis matrix: - [1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0] - [0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] - [0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0] - [0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1] - [0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1] - [0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 1 0 0 0 1] - [0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 1] - [0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 1 0 0 0 1] - [0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0] - [0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1] - [0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0] - [0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1] - [0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1] - [0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1] - [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1] - [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0] - [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1] + Domain: Vector space quotient V/W of dimension 3 over Finite Field of size 2 where + V: Vector space of dimension 20 over Finite Field of size 2 + W: Vector space of degree 20 and dimension 17 over Finite Field of size 2 + Basis matrix: + [1 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0] + [0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] + [0 0 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0] + [0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 1 0 0 0 1] + [0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 1] + [0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 1 0 0 0 1] + [0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 1] + [0 0 0 0 0 0 0 1 0 0 0 0 1 0 0 1 0 0 0 1] + [0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0] + [0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 1] + [0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0] + [0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1] + [0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 1] + [0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 1] + [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1] + [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0] + [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1] Codomain: Vector space quotient V/W of dimension 6 over Finite Field of size 2 where - V: Vector space of dimension 35 over Finite Field of size 2 - W: Vector space of degree 35 and dimension 29 over Finite Field of size 2 - Basis matrix: - 29 x 35 dense matrix over Finite Field of size 2 + V: Vector space of dimension 35 over Finite Field of size 2 + W: Vector space of degree 35 and dimension 29 over Finite Field of size 2 + Basis matrix: + 29 x 35 dense matrix over Finite Field of size 2 This is compatible with the vector presentations of its domain and codomain modules:: @@ -352,13 +359,13 @@ Elements in the preimage of a homomorphism can be found:: Homomorphisms can be composed as expected:: sage: g = homspace([Sq(0, 0, 0, 1)*gen]); g - Module endomorphism of Finitely presented left module on 1 generator and 2 relations - over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> Sq(0,0,0,1)*g[0] sage: g*f - Module endomorphism of Finitely presented left module on 1 generator and 2 relations - over mod 2 Steenrod algebra, milnor basis + Module endomorphism of Finitely presented left module on 1 generator + and 2 relations over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> Sq(0,0,1,1)*g[0] sage: one = homspace.identity() @@ -412,13 +419,15 @@ homomorphism of free modules. We then construct a candidate for an isomorphism and check that it is both injective and surjective:: sage: HZ = SteenrodFPModule(A, [0], [[Sq(1)]]); HZ - Finitely presented left module on 1 generator and 1 relation over mod 2 Steenrod algebra, milnor basis + Finitely presented left module on 1 generator and 1 relation + over mod 2 Steenrod algebra, milnor basis sage: F = SteenrodFPModule(A, [0]) sage: j = Hom(F, F)([Sq(1)*F.generator(0)]) - sage: coker = j.cokernel_projection() # the natural quotient homomorphism onto the cokernel. + sage: coker = j.cokernel_projection() # the natural quotient homomorphism onto the cokernel. sage: hz = coker.codomain(); hz - Finitely presented left module on 1 generator and 1 relation over mod 2 Steenrod algebra, milnor basis + Finitely presented left module on 1 generator and 1 relation + over mod 2 Steenrod algebra, milnor basis sage: a = Hom(HZ, hz)([hz.generator(0)]) sage: a.is_injective() @@ -435,8 +444,10 @@ injective homomorphism into the domain of `f`:: sage: k = f.kernel_inclusion(); k Module morphism: - From: Finitely presented left module on 1 generator and 3 relations over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 3 relations + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis Defn: g[7] |--> Sq(0,0,1)*g[0] sage: k.codomain() == f.domain() True @@ -445,7 +456,8 @@ injective homomorphism into the domain of `f`:: sage: ker = k.domain() sage: ker - Finitely presented left module on 1 generator and 3 relations over mod 2 Steenrod algebra, milnor basis + Finitely presented left module on 1 generator and 3 relations + over mod 2 Steenrod algebra, milnor basis We can check that the injective image of `k` is the kernel of `f` by showing that `f` factors as `h\circ c`, where `c` is the quotient map @@ -470,8 +482,10 @@ equal to the submodule `\operatorname{im}(f)`:: sage: i = f.image(); i Module morphism: - From: Finitely presented left module on 1 generator and 3 relations over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 3 relations + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis Defn: g[7] |--> Sq(0,0,1)*g[0] sage: i.codomain() == f.codomain() True @@ -483,8 +497,10 @@ lifting `f` over `i`, and showing that the lift is surjective:: sage: f_ = f.lift(i); f_ Module morphism: - From: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 3 relations over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 3 relations + over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> g[7] sage: i*f_ == f # Is im(i) contained in im(f) ? True @@ -501,7 +517,8 @@ domain `\ker(g)`:: sage: K = f.kernel_inclusion() # k: ker(f) -> Hko sage: h = f.homology(f) # h: ker(f) -> ker(f) / im(f) sage: h.codomain() # This is the homology module. - Finitely presented left module on 1 generator and 4 relations over mod 2 Steenrod algebra, milnor basis + Finitely presented left module on 1 generator and 4 relations + over mod 2 Steenrod algebra, milnor basis Free resolutions @@ -632,8 +649,10 @@ The projection:: sage: q = Hom(HZ, Hko)([Hko.generator(0)]) sage: q Module morphism: - From: Finitely presented left module on 1 generator and 1 relation over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 1 relation + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis Defn: g[0] |--> g[0] The map to lift over `q`:: @@ -641,8 +660,10 @@ The map to lift over `q`:: sage: f = Hom(L, Hko)([Sq(0,2,1,1)*Hko.generator(0)]) sage: f Module morphism: - From: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis Defn: g[28] |--> Sq(0,2,1,1)*g[0] sage: f.is_zero() # f is non-trivial. @@ -703,8 +724,10 @@ Start by finding a single lift of `f` over the projection `q`:: sage: fl = f.lift(q); fl Module morphism: - From: Finitely presented left module on 1 generator and 2 relations over mod 2 Steenrod algebra, milnor basis - To: Finitely presented left module on 1 generator and 1 relation over mod 2 Steenrod algebra, milnor basis + From: Finitely presented left module on 1 generator and 2 relations + over mod 2 Steenrod algebra, milnor basis + To: Finitely presented left module on 1 generator and 1 relation + over mod 2 Steenrod algebra, milnor basis Defn: g[28] |--> (Sq(4,3,0,1)+Sq(6,0,1,1)+Sq(7,2,0,1)+Sq(10,1,0,1))*g[0] We verify that ``fl`` is indeed a lift:: diff --git a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_advanced.rst b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_advanced.rst index 104933d7bc8..7bd9934cffd 100644 --- a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_advanced.rst +++ b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_advanced.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_cartesian.rst b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_cartesian.rst index 978aa129395..51300f93bc1 100644 --- a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_cartesian.rst +++ b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_cartesian.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_change.rst b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_change.rst index d7164e7c363..029c5727435 100644 --- a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_change.rst +++ b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_change.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. .. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_curvilinear.rst b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_curvilinear.rst index bdcff4b9af8..af11769e274 100644 --- a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_curvilinear.rst +++ b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_curvilinear.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_plane.rst b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_plane.rst index 59c4270badb..921724105a0 100644 --- a/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_plane.rst +++ b/src/doc/en/thematic_tutorials/vector_calculus/vector_calc_plane.rst @@ -1,4 +1,4 @@ -.. -*- coding: utf-8 -*- +.. sage-doctest: needs sage.plot sage.symbolic .. linkall diff --git a/src/doc/en/tutorial/tour_plotting.rst b/src/doc/en/tutorial/tour_plotting.rst index a218f70ff1e..ad861c3ca56 100644 --- a/src/doc/en/tutorial/tour_plotting.rst +++ b/src/doc/en/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: Plotting diff --git a/src/doc/en/website/templates/index_furo.html b/src/doc/en/website/templates/index_furo.html index 1dca6907c93..2b086f35d8a 100644 --- a/src/doc/en/website/templates/index_furo.html +++ b/src/doc/en/website/templates/index_furo.html @@ -10,10 +10,13 @@ border: none; } a.pdf { - margin-left: 0.5em; - {%- if hide_pdf_links %} + margin-right: 0.3em; + {%- if hide_pdf_links %} display: none; - {%- endif %} + {%- endif %} + } + a.pdf:hover { + text-decoration: none; } table.contentstable { align: center; @@ -41,7 +44,7 @@

- + @@ -75,7 +78,7 @@

- + @@ -90,7 +93,7 @@

- + @@ -108,7 +111,7 @@

- + @@ -128,7 +131,7 @@

- + @@ -153,7 +156,7 @@

- + @@ -184,7 +187,7 @@

- + @@ -201,7 +204,7 @@

- + diff --git a/src/doc/es/tutorial/tour_rings.rst b/src/doc/es/tutorial/tour_rings.rst index 1bdee618525..fd7af3f72d2 100644 --- a/src/doc/es/tutorial/tour_rings.rst +++ b/src/doc/es/tutorial/tour_rings.rst @@ -131,7 +131,7 @@ y anillos de matrices. Veamos algunos de estos anillos:: sage: GF(3) Finite Field of size 3 sage: # es necesario dar un nombre al generador si el número - sage: GF(27, 'a') # de elementos no es primo + sage: GF(27, 'a') # de elementos no es primo Finite Field in a of size 3^3 sage: Zp(5) 5-adic Ring with capped relative precision 20 diff --git a/src/doc/fr/tutorial/tour_plotting.rst b/src/doc/fr/tutorial/tour_plotting.rst index 6233d33db53..3815125ed19 100644 --- a/src/doc/fr/tutorial/tour_plotting.rst +++ b/src/doc/fr/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: Graphiques diff --git a/src/doc/ja/tutorial/tour_plotting.rst b/src/doc/ja/tutorial/tour_plotting.rst index 07f65fc3fdf..baf450fd6eb 100644 --- a/src/doc/ja/tutorial/tour_plotting.rst +++ b/src/doc/ja/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: プロットする diff --git a/src/doc/pt/tutorial/tour_plotting.rst b/src/doc/pt/tutorial/tour_plotting.rst index 1fb3d910dfc..dacf25e063b 100644 --- a/src/doc/pt/tutorial/tour_plotting.rst +++ b/src/doc/pt/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: Gráficos diff --git a/src/doc/ru/tutorial/tour_plotting.rst b/src/doc/ru/tutorial/tour_plotting.rst index 76f6c1ef6a3..f4a755e412e 100644 --- a/src/doc/ru/tutorial/tour_plotting.rst +++ b/src/doc/ru/tutorial/tour_plotting.rst @@ -1,3 +1,5 @@ +.. sage-doctest: needs sage.plot sage.symbolic + .. _section-plot: Построение графиков diff --git a/src/sage/algebras/cellular_basis.py b/src/sage/algebras/cellular_basis.py index e6e7487cba9..c80eee401ff 100644 --- a/src/sage/algebras/cellular_basis.py +++ b/src/sage/algebras/cellular_basis.py @@ -136,21 +136,21 @@ class CellularBasis(CombinatorialFreeModule): sage: len(S.basis()) 6 sage: a,b,c,d,e,f = C.basis() - sage: a + sage: f C([3], [[1, 2, 3]], [[1, 2, 3]]) sage: c C([2, 1], [[1, 3], [2]], [[1, 2], [3]]) sage: d C([2, 1], [[1, 2], [3]], [[1, 3], [2]]) - sage: a * a + sage: f * f C([3], [[1, 2, 3]], [[1, 2, 3]]) - sage: a * c + sage: f * c 0 sage: d * c C([2, 1], [[1, 2], [3]], [[1, 2], [3]]) sage: c * d C([2, 1], [[1, 3], [2]], [[1, 3], [2]]) - sage: S(a) + sage: S(f) 1/6*[1, 2, 3] + 1/6*[1, 3, 2] + 1/6*[2, 1, 3] + 1/6*[2, 3, 1] + 1/6*[3, 1, 2] + 1/6*[3, 2, 1] sage: S(d) diff --git a/src/sage/algebras/clifford_algebra.py b/src/sage/algebras/clifford_algebra.py index ad8bd314c25..ca0d6d41ee8 100644 --- a/src/sage/algebras/clifford_algebra.py +++ b/src/sage/algebras/clifford_algebra.py @@ -1370,7 +1370,7 @@ def __init__(self, R, names): sage: E. = ExteriorAlgebra(QQ) sage: E.category() Category of finite dimensional supercommutative supercocommutative - super hopf algebras with basis over Rational Field + super Hopf algebras with basis over Rational Field sage: TestSuite(E).run() sage: TestSuite(ExteriorAlgebra(GF(3), ['a', 'b'])).run() diff --git a/src/sage/algebras/iwahori_hecke_algebra.py b/src/sage/algebras/iwahori_hecke_algebra.py index a599c28a488..31f15e50c1a 100644 --- a/src/sage/algebras/iwahori_hecke_algebra.py +++ b/src/sage/algebras/iwahori_hecke_algebra.py @@ -1886,7 +1886,7 @@ class Cp(_KLHeckeBasis): Iwahori--Hecke algebra was initialized in the "standard" presentation where `\{q_1,q_2\} = \{v^2,1\}` as sets or the "normalized" presentation where `\{q_1,q_2\} = \{v,-v^{-1}\}` as sets, the function - :func::`product_on_basis` in this class computes products in the + :func:`product_on_basis` in this class computes products in the `C^{\prime}`-basis directly in the basis itself, using ``coxeter3`` to calculate certain `\mu`-coefficients quickly. If the above conditions are not all met, the function computes such products indirectly, by diff --git a/src/sage/algebras/lie_algebras/free_lie_algebra.py b/src/sage/algebras/lie_algebras/free_lie_algebra.py index 60d49a174b6..c07a99e9e44 100644 --- a/src/sage/algebras/lie_algebras/free_lie_algebra.py +++ b/src/sage/algebras/lie_algebras/free_lie_algebra.py @@ -933,7 +933,7 @@ def super_categories(self): sage: L. = LieAlgebra(QQ) sage: bases = FreeLieAlgebraBases(L) sage: bases.super_categories() - [Category of lie algebras with basis over Rational Field, + [Category of Lie algebras with basis over Rational Field, Category of realizations of Free Lie algebra generated by (x, y) over Rational Field] """ return [LieAlgebras(self.base().base_ring()).WithBasis(), Realizations(self.base())] diff --git a/src/sage/algebras/lie_algebras/lie_algebra.py b/src/sage/algebras/lie_algebras/lie_algebra.py index 5e1d44813ac..0013413d6a4 100644 --- a/src/sage/algebras/lie_algebras/lie_algebra.py +++ b/src/sage/algebras/lie_algebras/lie_algebra.py @@ -322,7 +322,7 @@ class LieAlgebra(Parent, UniqueRepresentation): # IndexedGenerators): sage: L Nilpotent Lie algebra on 3 generators (X, Y, Z) over Rational Field sage: L.category() - Category of finite dimensional nilpotent lie algebras with basis over Rational Field + Category of finite dimensional nilpotent Lie algebras with basis over Rational Field A second example defining the Engel Lie algebra:: @@ -530,7 +530,7 @@ def __init__(self, R, names=None, category=None): sage: L. = LieAlgebra(QQ, abelian=True) sage: L.category() - Category of finite dimensional nilpotent lie algebras with basis over Rational Field + Category of finite dimensional nilpotent Lie algebras with basis over Rational Field """ category = LieAlgebras(R).or_subcategory(category) Parent.__init__(self, base=R, names=names, category=category) @@ -805,7 +805,7 @@ def __init__(self, R, names=None, index_set=None, category=None, prefix='L', **k sage: L. = LieAlgebra(QQ, abelian=True) sage: L.category() - Category of finite dimensional nilpotent lie algebras with basis over Rational Field + Category of finite dimensional nilpotent Lie algebras with basis over Rational Field """ self._indices = index_set LieAlgebra.__init__(self, R, names, category) @@ -890,7 +890,7 @@ def __init__(self, R, names=None, index_set=None, category=None): sage: L. = LieAlgebra(QQ, abelian=True) sage: L.category() - Category of finite dimensional nilpotent lie algebras with basis over Rational Field + Category of finite dimensional nilpotent Lie algebras with basis over Rational Field """ LieAlgebraWithGenerators.__init__(self, R, names, index_set, category) self.__ngens = len(self._indices) diff --git a/src/sage/algebras/lie_algebras/morphism.py b/src/sage/algebras/lie_algebras/morphism.py index 3fa39f8ff78..db950155e19 100644 --- a/src/sage/algebras/lie_algebras/morphism.py +++ b/src/sage/algebras/lie_algebras/morphism.py @@ -43,7 +43,7 @@ class LieAlgebraHomomorphism_im_gens(Morphism): It should be a map from the base ring of the domain to the base ring of the codomain. Note that if base_map is nontrivial then the result will - not be a morphism in the category of lie algebras over + not be a morphism in the category of Lie algebras over the base ring. - ``check`` -- whether to run checks on the validity of the defining data @@ -380,7 +380,7 @@ class LieAlgebraMorphism_from_generators(LieAlgebraHomomorphism_im_gens): It should be a map from the base ring of the domain to the base ring of the codomain. Note that if base_map is nontrivial then the result will - not be a morphism in the category of lie algebras over + not be a morphism in the category of Lie algebras over the base ring. - ``check`` -- (default: ``True``) boolean; if ``False`` the values on the Lie brackets implied by ``on_generators`` will diff --git a/src/sage/algebras/lie_algebras/nilpotent_lie_algebra.py b/src/sage/algebras/lie_algebras/nilpotent_lie_algebra.py index a97e422e54b..13b368ad889 100644 --- a/src/sage/algebras/lie_algebras/nilpotent_lie_algebra.py +++ b/src/sage/algebras/lie_algebras/nilpotent_lie_algebra.py @@ -243,7 +243,7 @@ class FreeNilpotentLieAlgebra(NilpotentLieAlgebra_dense): sage: L = LieAlgebra(QQ, 3, step=3) sage: L.category() - Category of finite dimensional stratified lie algebras with basis over Rational Field + Category of finite dimensional stratified Lie algebras with basis over Rational Field sage: L in LieAlgebras(QQ).Nilpotent() True diff --git a/src/sage/algebras/lie_algebras/quotient.py b/src/sage/algebras/lie_algebras/quotient.py index ed64e6ee279..4fe0571543c 100644 --- a/src/sage/algebras/lie_algebras/quotient.py +++ b/src/sage/algebras/lie_algebras/quotient.py @@ -51,7 +51,7 @@ class LieQuotient_finite_dimensional_with_basis(LieAlgebraWithStructureCoefficie L: Free Nilpotent Lie algebra on 5 generators (X_1, X_2, X_12, X_112, X_122) over Rational Field I: Ideal (X_122) sage: E.category() - Join of Category of finite dimensional nilpotent lie algebras with basis + Join of Category of finite dimensional nilpotent Lie algebras with basis over Rational Field and Category of subquotients of sets sage: E.basis().list() [X_1, X_2, X_12, X_112] diff --git a/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx b/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx index 983e2515c04..130c9f5d43a 100644 --- a/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx +++ b/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx @@ -35,7 +35,7 @@ from sage.matrix.matrix_space import MatrixSpace from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense -from .quaternion_algebra_element cimport QuaternionAlgebraElement_rational_field +from sage.algebras.quatalg.quaternion_algebra_element cimport QuaternionAlgebraElement_rational_field from sage.libs.gmp.mpz cimport mpz_t, mpz_lcm, mpz_init, mpz_set, mpz_clear, mpz_init_set, mpz_mul, mpz_fdiv_q, mpz_cmp_si diff --git a/src/sage/algebras/steenrod/steenrod_algebra.py b/src/sage/algebras/steenrod/steenrod_algebra.py index 993e94dc828..3aaacfdf312 100644 --- a/src/sage/algebras/steenrod/steenrod_algebra.py +++ b/src/sage/algebras/steenrod/steenrod_algebra.py @@ -556,7 +556,7 @@ def __init__(self, p=2, basis='milnor', **kwds): sage: TestSuite(SteenrodAlgebra(basis='woody')).run() # long time sage: A3 = SteenrodAlgebra(3) sage: A3.category() - Category of supercocommutative super hopf algebras + Category of supercocommutative super Hopf algebras with basis over Finite Field of size 3 sage: TestSuite(A3).run() # long time sage: TestSuite(SteenrodAlgebra(basis='adem', p=3)).run() @@ -3842,7 +3842,7 @@ def SteenrodAlgebra(p=2, basis='milnor', generic='auto', **kwds): sage: A.is_division_algebra() False sage: A.category() - Category of supercocommutative super hopf algebras + Category of supercocommutative super Hopf algebras with basis over Finite Field of size 2 There are methods for constructing elements of the Steenrod diff --git a/src/sage/categories/action.pyx b/src/sage/categories/action.pyx index b164e9213ce..0e54ceffa27 100644 --- a/src/sage/categories/action.pyx +++ b/src/sage/categories/action.pyx @@ -91,7 +91,7 @@ cdef class Action(Functor): :class:`Action` itself, but other classes may use it """ def __init__(self, G, S, is_left=True, op=None): - from .groupoid import Groupoid + from sage.categories.groupoid import Groupoid Functor.__init__(self, Groupoid(G), category(S)) self.G = G self.US = ref(S) diff --git a/src/sage/categories/category.py b/src/sage/categories/category.py index b200f1a7283..1dd39bfc7d6 100644 --- a/src/sage/categories/category.py +++ b/src/sage/categories/category.py @@ -119,6 +119,9 @@ _join_cache = WeakValueDictionary() +HALL_OF_FAME = ['Coxeter', 'Hopf', 'Weyl', 'Lie', 'Hecke'] + + class Category(UniqueRepresentation, SageObject): r""" The base class for modeling mathematical categories, like for example: @@ -513,14 +516,10 @@ def _repr_object_names(self): sage: PrincipalIdealDomains()._repr_object_names() 'principal ideal domains' """ - i = -1 - s = self._label - while i < len(s) - 1: - for i in range(len(s)): - if s[i].isupper(): - s = s[:i] + " " + s[i].lower() + s[i + 1:] - break - return s.lstrip() + words = "".join(letter if not letter.isupper() else ";" + letter + for letter in self._label).split(";") + return " ".join(w if w in HALL_OF_FAME else w.lower() + for w in words).lstrip() def _short_name(self): """ @@ -1235,7 +1234,7 @@ def structure(self): Category of right modules over Rational Field, Category of left modules over Rational Field) sage: structure(HopfAlgebras(QQ).Graded().WithBasis().Connected()) - (Category of hopf algebras over Rational Field, + (Category of Hopf algebras over Rational Field, Category of graded modules over Rational Field) This method is used in :meth:`is_full_subcategory` for @@ -2018,7 +2017,7 @@ def _with_axiom_as_tuple(self, axiom): Category of commutative magmas, Category of finite additive groups) sage: HopfAlgebras(QQ)._with_axiom_as_tuple('FiniteDimensional') - (Category of hopf algebras over Rational Field, + (Category of Hopf algebras over Rational Field, Category of finite dimensional vector spaces over Rational Field) """ if axiom in self.axioms(): @@ -2595,11 +2594,13 @@ def category_sample(): [Category of Coxeter groups, Category of G-sets for Symmetric group of order 8! as a permutation group, Category of Hecke modules over Rational Field, + Category of Hopf algebras over Rational Field, + Category of Hopf algebras with basis over Rational Field, Category of Lie algebras over Rational Field, Category of Weyl groups, Category of additive magmas, ..., Category of fields, ..., - Category of graded hopf algebras with basis over Rational Field, ..., + Category of graded Hopf algebras with basis over Rational Field, ..., Category of modular abelian varieties over Rational Field, ..., Category of simplicial complexes, ..., Category of vector spaces over Rational Field, ... diff --git a/src/sage/categories/complex_reflection_groups.py b/src/sage/categories/complex_reflection_groups.py index fbc04ff329c..925ee1c228e 100644 --- a/src/sage/categories/complex_reflection_groups.py +++ b/src/sage/categories/complex_reflection_groups.py @@ -45,10 +45,10 @@ class ComplexReflectionGroups(Category_singleton): sage: ComplexReflectionGroups() Category of complex reflection groups sage: ComplexReflectionGroups().super_categories() - [Category of complex reflection or generalized coxeter groups] + [Category of complex reflection or generalized Coxeter groups] sage: ComplexReflectionGroups().all_super_categories() [Category of complex reflection groups, - Category of complex reflection or generalized coxeter groups, + Category of complex reflection or generalized Coxeter groups, Category of groups, Category of monoids, Category of finitely generated semigroups, @@ -87,7 +87,7 @@ def super_categories(self): sage: from sage.categories.complex_reflection_groups import ComplexReflectionGroups sage: ComplexReflectionGroups().super_categories() - [Category of complex reflection or generalized coxeter groups] + [Category of complex reflection or generalized Coxeter groups] """ return [ComplexReflectionOrGeneralizedCoxeterGroups()] diff --git a/src/sage/categories/complex_reflection_or_generalized_coxeter_groups.py b/src/sage/categories/complex_reflection_or_generalized_coxeter_groups.py index d3908a8db03..ca2f1e09235 100644 --- a/src/sage/categories/complex_reflection_or_generalized_coxeter_groups.py +++ b/src/sage/categories/complex_reflection_or_generalized_coxeter_groups.py @@ -82,7 +82,7 @@ class ComplexReflectionOrGeneralizedCoxeterGroups(Category_singleton): sage: from sage.categories.complex_reflection_or_generalized_coxeter_groups import ComplexReflectionOrGeneralizedCoxeterGroups sage: C = ComplexReflectionOrGeneralizedCoxeterGroups(); C - Category of complex reflection or generalized coxeter groups + Category of complex reflection or generalized Coxeter groups sage: C.super_categories() [Category of finitely generated enumerated groups] @@ -108,7 +108,7 @@ def super_categories(self): sage: from sage.categories.complex_reflection_groups import ComplexReflectionGroups sage: ComplexReflectionGroups().super_categories() - [Category of complex reflection or generalized coxeter groups] + [Category of complex reflection or generalized Coxeter groups] """ return [Groups().FinitelyGenerated()] @@ -117,7 +117,7 @@ def Irreducible(self): r""" Return the full subcategory of irreducible objects of ``self``. - A complex reflection group, or generalized coxeter group + A complex reflection group, or generalized Coxeter group is *reducible* if its simple reflections can be split in two sets `X` and `Y` such that the elements of `X` commute with that of `Y`. In particular, the group is then direct diff --git a/src/sage/categories/coxeter_groups.py b/src/sage/categories/coxeter_groups.py index 71285521a5e..3ce730d8f1d 100644 --- a/src/sage/categories/coxeter_groups.py +++ b/src/sage/categories/coxeter_groups.py @@ -43,7 +43,7 @@ class CoxeterGroups(Category_singleton): sage: C = CoxeterGroups(); C Category of Coxeter groups sage: C.super_categories() - [Category of generalized coxeter groups] + [Category of generalized Coxeter groups] sage: W = C.example(); W The symmetric group on {0, ..., 3} @@ -105,7 +105,7 @@ def super_categories(self): EXAMPLES:: sage: CoxeterGroups().super_categories() - [Category of generalized coxeter groups] + [Category of generalized Coxeter groups] """ return [GeneralizedCoxeterGroups()] @@ -128,17 +128,6 @@ def additional_structure(self): Finite = LazyImport('sage.categories.finite_coxeter_groups', 'FiniteCoxeterGroups') Algebras = LazyImport('sage.categories.coxeter_group_algebras', 'CoxeterGroupAlgebras') - def _repr_object_names(self): - """ - Return the name of the objects of this category. - - EXAMPLES:: - - sage: CoxeterGroups().Finite() - Category of finite Coxeter groups - """ - return "Coxeter groups" - class ParentMethods: @abstract_method def coxeter_matrix(self): @@ -1088,7 +1077,7 @@ def bruhat_interval_poset(self, x, y, facade=False): nextlayer.add(t) curlayer = nextlayer - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph return Poset(DiGraph(d, format='dict_of_lists', data_structure='static_sparse'), cover_relations=True, @@ -1174,7 +1163,7 @@ def bruhat_graph(self, x=None, y=None, edge_labels=False): else: d.append((u, v)) - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph return DiGraph(d) def canonical_representation(self): diff --git a/src/sage/categories/examples/hopf_algebras_with_basis.py b/src/sage/categories/examples/hopf_algebras_with_basis.py index 10c89b0f9ad..7f05827c28a 100644 --- a/src/sage/categories/examples/hopf_algebras_with_basis.py +++ b/src/sage/categories/examples/hopf_algebras_with_basis.py @@ -29,7 +29,7 @@ def __init__(self, R, G): sage: from sage.categories.examples.hopf_algebras_with_basis import MyGroupAlgebra sage: A = MyGroupAlgebra(QQ, DihedralGroup(6)) sage: A.category() - Category of finite dimensional hopf algebras with basis over Rational Field + Category of finite dimensional Hopf algebras with basis over Rational Field sage: TestSuite(A).run() """ self._group = G diff --git a/src/sage/categories/filtered_hopf_algebras_with_basis.py b/src/sage/categories/filtered_hopf_algebras_with_basis.py index 0310744d9e1..dadd10dd70e 100644 --- a/src/sage/categories/filtered_hopf_algebras_with_basis.py +++ b/src/sage/categories/filtered_hopf_algebras_with_basis.py @@ -31,9 +31,9 @@ class FilteredHopfAlgebrasWithBasis(FilteredModulesCategory): EXAMPLES:: sage: C = HopfAlgebrasWithBasis(ZZ).Filtered(); C - Category of filtered hopf algebras with basis over Integer Ring + Category of filtered Hopf algebras with basis over Integer Ring sage: C.super_categories() - [Category of hopf algebras with basis over Integer Ring, + [Category of Hopf algebras with basis over Integer Ring, Category of filtered algebras with basis over Integer Ring, Category of filtered coalgebras with basis over Integer Ring] @@ -53,7 +53,7 @@ def super_categories(self): EXAMPLES:: sage: HopfAlgebrasWithBasis(QQ).Filtered().WithRealizations().super_categories() - [Join of Category of hopf algebras over Rational Field + [Join of Category of Hopf algebras over Rational Field and Category of filtered algebras over Rational Field and Category of filtered coalgebras over Rational Field] diff --git a/src/sage/categories/finite_coxeter_groups.py b/src/sage/categories/finite_coxeter_groups.py index 4d422a7541f..9d1b8f6cf68 100644 --- a/src/sage/categories/finite_coxeter_groups.py +++ b/src/sage/categories/finite_coxeter_groups.py @@ -27,7 +27,7 @@ class FiniteCoxeterGroups(CategoryWithAxiom): sage: CoxeterGroups.Finite() Category of finite Coxeter groups sage: FiniteCoxeterGroups().super_categories() - [Category of finite generalized coxeter groups, + [Category of finite generalized Coxeter groups, Category of Coxeter groups] sage: G = CoxeterGroups().Finite().example() @@ -54,7 +54,7 @@ def extra_super_categories(self): EXAMPLES:: sage: CoxeterGroups().Finite().super_categories() - [Category of finite generalized coxeter groups, + [Category of finite generalized Coxeter groups, Category of Coxeter groups] """ from sage.categories.complex_reflection_groups import ComplexReflectionGroups diff --git a/src/sage/categories/finite_dimensional_algebras_with_basis.py b/src/sage/categories/finite_dimensional_algebras_with_basis.py index b8ed6332ead..2ba4069a8d5 100644 --- a/src/sage/categories/finite_dimensional_algebras_with_basis.py +++ b/src/sage/categories/finite_dimensional_algebras_with_basis.py @@ -1437,7 +1437,15 @@ def simple_module_parameterization(self): sage: S = SymmetricGroupAlgebra(QQ, 4) # needs sage.groups sage.modules sage: S.simple_module_parameterization() # needs sage.groups sage.modules - ([4], [3, 1], [2, 2], [2, 1, 1], [1, 1, 1, 1]) + ([1, 1, 1, 1], [2, 1, 1], [2, 2], [3, 1], [4]) + + sage: S = SymmetricGroupAlgebra(GF(3), 4) # needs sage.groups sage.modules + sage: S.simple_module_parameterization() # needs sage.groups sage.modules + ([2, 1, 1], [2, 2], [3, 1], [4]) + + sage: S = SymmetricGroupAlgebra(GF(4), 4) # needs sage.groups sage.modules + sage: S.simple_module_parameterization() # needs sage.groups sage.modules + ([3, 1], [4]) """ return tuple([mu for mu in self.cell_poset() if self.cell_module(mu).nonzero_bilinear_form()]) diff --git a/src/sage/categories/finite_dimensional_graded_lie_algebras_with_basis.py b/src/sage/categories/finite_dimensional_graded_lie_algebras_with_basis.py index c5554a2f094..5377122d3f6 100644 --- a/src/sage/categories/finite_dimensional_graded_lie_algebras_with_basis.py +++ b/src/sage/categories/finite_dimensional_graded_lie_algebras_with_basis.py @@ -29,10 +29,10 @@ class FiniteDimensionalGradedLieAlgebrasWithBasis(CategoryWithAxiom_over_base_ri EXAMPLES:: sage: C = LieAlgebras(ZZ).WithBasis().FiniteDimensional().Graded(); C - Category of finite dimensional graded lie algebras with basis over Integer Ring + Category of finite dimensional graded Lie algebras with basis over Integer Ring sage: C.super_categories() - [Category of graded lie algebras with basis over Integer Ring, - Category of finite dimensional lie algebras with basis over Integer Ring] + [Category of graded Lie algebras with basis over Integer Ring, + Category of finite dimensional Lie algebras with basis over Integer Ring] sage: C is LieAlgebras(ZZ).WithBasis().FiniteDimensional().Graded() True @@ -120,7 +120,7 @@ class Stratified(CategoryWithAxiom_over_base_ring): sage: C = LieAlgebras(QQ).WithBasis().Graded().Stratified().FiniteDimensional() sage: C - Category of finite dimensional stratified lie algebras with basis over Rational Field + Category of finite dimensional stratified Lie algebras with basis over Rational Field A finite-dimensional stratified Lie algebra is nilpotent:: diff --git a/src/sage/categories/finite_dimensional_hopf_algebras_with_basis.py b/src/sage/categories/finite_dimensional_hopf_algebras_with_basis.py index ffa3655fb9b..da3f1365584 100644 --- a/src/sage/categories/finite_dimensional_hopf_algebras_with_basis.py +++ b/src/sage/categories/finite_dimensional_hopf_algebras_with_basis.py @@ -1,16 +1,17 @@ r""" Finite dimensional Hopf algebras with basis """ -#***************************************************************************** +# **************************************************************************** # Copyright (C) 2008 Teresa Gomez-Diaz (CNRS) # 2011 Nicolas M. Thiery # # Distributed under the terms of the GNU General Public License (GPL) -# http://www.gnu.org/licenses/ -#****************************************************************************** +# https://www.gnu.org/licenses/ +# ***************************************************************************** from sage.categories.category_with_axiom import CategoryWithAxiom_over_base_ring + class FiniteDimensionalHopfAlgebrasWithBasis(CategoryWithAxiom_over_base_ring): """ The category of finite dimensional Hopf algebras with a @@ -18,10 +19,10 @@ class FiniteDimensionalHopfAlgebrasWithBasis(CategoryWithAxiom_over_base_ring): EXAMPLES:: - sage: FiniteDimensionalHopfAlgebrasWithBasis(QQ) # fixme: Hopf should be capitalized - Category of finite dimensional hopf algebras with basis over Rational Field + sage: FiniteDimensionalHopfAlgebrasWithBasis(QQ) + Category of finite dimensional Hopf algebras with basis over Rational Field sage: FiniteDimensionalHopfAlgebrasWithBasis(QQ).super_categories() - [Category of hopf algebras with basis over Rational Field, + [Category of Hopf algebras with basis over Rational Field, Category of finite dimensional algebras with basis over Rational Field] TESTS:: diff --git a/src/sage/categories/finitely_generated_lambda_bracket_algebras.py b/src/sage/categories/finitely_generated_lambda_bracket_algebras.py index c997118a3bc..5ff1634ca43 100644 --- a/src/sage/categories/finitely_generated_lambda_bracket_algebras.py +++ b/src/sage/categories/finitely_generated_lambda_bracket_algebras.py @@ -95,7 +95,7 @@ class Graded(GradedModulesCategory): EXAMPLES:: sage: LieConformalAlgebras(QQbar).FinitelyGenerated().Graded() # needs sage.rings.number_field - Category of H-graded finitely generated lie conformal algebras + Category of H-graded finitely generated Lie conformal algebras over Algebraic Field """ def _repr_object_names(self): diff --git a/src/sage/categories/finitely_generated_lie_conformal_algebras.py b/src/sage/categories/finitely_generated_lie_conformal_algebras.py index 53d5ed4ccf6..90b18df668f 100644 --- a/src/sage/categories/finitely_generated_lie_conformal_algebras.py +++ b/src/sage/categories/finitely_generated_lie_conformal_algebras.py @@ -6,21 +6,22 @@ - Reimundo Heluani (2019-10-05): Initial implementation. """ -#****************************************************************************** +# ***************************************************************************** # Copyright (C) 2019 Reimundo Heluani # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. -# http://www.gnu.org/licenses/ -#***************************************************************************** +# https://www.gnu.org/licenses/ +# **************************************************************************** from sage.categories.category_with_axiom import CategoryWithAxiom_over_base_ring from sage.categories.graded_modules import GradedModulesCategory from sage.categories.super_modules import SuperModulesCategory from sage.categories.lie_conformal_algebras import LieConformalAlgebras + class FinitelyGeneratedLieConformalAlgebras(CategoryWithAxiom_over_base_ring): """ The category of finitely generated Lie conformal algebras. @@ -28,7 +29,7 @@ class FinitelyGeneratedLieConformalAlgebras(CategoryWithAxiom_over_base_ring): EXAMPLES:: sage: LieConformalAlgebras(QQbar).FinitelyGenerated() # needs sage.rings.number_field - Category of finitely generated lie conformal algebras over Algebraic Field + Category of finitely generated Lie conformal algebras over Algebraic Field """ _base_category_class_and_axiom = (LieConformalAlgebras, "FinitelyGeneratedAsLambdaBracketAlgebra") @@ -63,7 +64,7 @@ class Super(SuperModulesCategory): EXAMPLES:: sage: LieConformalAlgebras(AA).FinitelyGenerated().Super() # needs sage.rings.number_field - Category of super finitely generated lie conformal algebras + Category of super finitely generated Lie conformal algebras over Algebraic Real Field """ class Graded(GradedModulesCategory): @@ -73,7 +74,7 @@ class Graded(GradedModulesCategory): EXAMPLES:: sage: LieConformalAlgebras(QQbar).FinitelyGenerated().Super().Graded() # needs sage.rings.number_field - Category of H-graded super finitely generated lie conformal algebras + Category of H-graded super finitely generated Lie conformal algebras over Algebraic Field """ def _repr_object_names(self): @@ -85,7 +86,7 @@ def _repr_object_names(self): sage: C = LieConformalAlgebras(QQbar).FinitelyGenerated() # needs sage.rings.number_field sage: C.Super().Graded() # needs sage.rings.number_field Category of H-graded super finitely generated - lie conformal algebras over Algebraic Field + Lie conformal algebras over Algebraic Field """ return "H-graded {}".format(self.base_category()._repr_object_names()) @@ -96,7 +97,7 @@ class Graded(GradedModulesCategory): EXAMPLES:: sage: LieConformalAlgebras(QQbar).FinitelyGenerated().Graded() # needs sage.rings.number_field - Category of H-graded finitely generated lie conformal algebras + Category of H-graded finitely generated Lie conformal algebras over Algebraic Field """ def _repr_object_names(self): diff --git a/src/sage/categories/generalized_coxeter_groups.py b/src/sage/categories/generalized_coxeter_groups.py index a59da41b3f1..844472ba6be 100644 --- a/src/sage/categories/generalized_coxeter_groups.py +++ b/src/sage/categories/generalized_coxeter_groups.py @@ -34,7 +34,7 @@ class GeneralizedCoxeterGroups(Category_singleton): sage: from sage.categories.generalized_coxeter_groups import GeneralizedCoxeterGroups sage: C = GeneralizedCoxeterGroups(); C - Category of generalized coxeter groups + Category of generalized Coxeter groups TESTS:: @@ -47,7 +47,7 @@ def super_categories(self): sage: from sage.categories.generalized_coxeter_groups import GeneralizedCoxeterGroups sage: GeneralizedCoxeterGroups().super_categories() - [Category of complex reflection or generalized coxeter groups] + [Category of complex reflection or generalized Coxeter groups] """ return [ComplexReflectionOrGeneralizedCoxeterGroups()] diff --git a/src/sage/categories/graded_hopf_algebras.py b/src/sage/categories/graded_hopf_algebras.py index c4d5a24e3fe..60d5befd6f5 100644 --- a/src/sage/categories/graded_hopf_algebras.py +++ b/src/sage/categories/graded_hopf_algebras.py @@ -1,13 +1,14 @@ r""" Graded Hopf algebras """ -#***************************************************************************** +# **************************************************************************** # Copyright (C) 2008 Teresa Gomez-Diaz (CNRS) # 2008-2011 Nicolas M. Thiery # # Distributed under the terms of the GNU General Public License (GPL) # https://www.gnu.org/licenses/ -#****************************************************************************** +# ***************************************************************************** + def GradedHopfAlgebras(base_ring): r""" @@ -16,7 +17,7 @@ def GradedHopfAlgebras(base_ring): EXAMPLES:: sage: C = GradedHopfAlgebras(QQ); C - Join of Category of hopf algebras over Rational Field + Join of Category of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field sage: C is HopfAlgebras(QQ).Graded() diff --git a/src/sage/categories/graded_hopf_algebras_with_basis.py b/src/sage/categories/graded_hopf_algebras_with_basis.py index 41beadad8a4..60cf4977eae 100644 --- a/src/sage/categories/graded_hopf_algebras_with_basis.py +++ b/src/sage/categories/graded_hopf_algebras_with_basis.py @@ -22,9 +22,9 @@ class GradedHopfAlgebrasWithBasis(GradedModulesCategory): EXAMPLES:: sage: C = GradedHopfAlgebrasWithBasis(ZZ); C - Category of graded hopf algebras with basis over Integer Ring + Category of graded Hopf algebras with basis over Integer Ring sage: C.super_categories() - [Category of filtered hopf algebras with basis over Integer Ring, + [Category of filtered Hopf algebras with basis over Integer Ring, Category of graded algebras with basis over Integer Ring, Category of graded coalgebras with basis over Integer Ring] @@ -64,7 +64,7 @@ def super_categories(self): EXAMPLES:: sage: GradedHopfAlgebrasWithBasis(QQ).WithRealizations().super_categories() - [Join of Category of hopf algebras over Rational Field + [Join of Category of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field] diff --git a/src/sage/categories/graded_lie_algebras_with_basis.py b/src/sage/categories/graded_lie_algebras_with_basis.py index 885a4dfb8cd..8552218e074 100644 --- a/src/sage/categories/graded_lie_algebras_with_basis.py +++ b/src/sage/categories/graded_lie_algebras_with_basis.py @@ -15,6 +15,7 @@ from sage.categories.graded_modules import GradedModulesCategory from sage.misc.lazy_import import LazyImport + class GradedLieAlgebrasWithBasis(GradedModulesCategory): """ The category of graded Lie algebras with a distinguished basis. @@ -22,10 +23,10 @@ class GradedLieAlgebrasWithBasis(GradedModulesCategory): EXAMPLES:: sage: C = LieAlgebras(ZZ).WithBasis().Graded(); C - Category of graded lie algebras with basis over Integer Ring + Category of graded Lie algebras with basis over Integer Ring sage: C.super_categories() [Category of graded modules with basis over Integer Ring, - Category of lie algebras with basis over Integer Ring, + Category of Lie algebras with basis over Integer Ring, Category of graded Lie algebras over Integer Ring] sage: C is LieAlgebras(ZZ).WithBasis().Graded() diff --git a/src/sage/categories/group_algebras.py b/src/sage/categories/group_algebras.py index 1f68c28c3b4..7a41d4877fd 100644 --- a/src/sage/categories/group_algebras.py +++ b/src/sage/categories/group_algebras.py @@ -40,7 +40,7 @@ class GroupAlgebras(AlgebrasCategory): sage: C = Groups().Algebras(ZZ); C Category of group algebras over Integer Ring sage: C.super_categories() - [Category of hopf algebras with basis over Integer Ring, + [Category of Hopf algebras with basis over Integer Ring, Category of monoid algebras over Integer Ring] We can also construct this category with:: @@ -92,9 +92,9 @@ def extra_super_categories(self): sage: C = Groups().Algebras(QQ) sage: C.extra_super_categories() - [Category of hopf algebras over Rational Field] + [Category of Hopf algebras over Rational Field] sage: sorted(C.super_categories(), key=str) - [Category of hopf algebras with basis over Rational Field, + [Category of Hopf algebras with basis over Rational Field, Category of monoid algebras over Rational Field] """ from sage.categories.hopf_algebras import HopfAlgebras diff --git a/src/sage/categories/hopf_algebras.py b/src/sage/categories/hopf_algebras.py index 218abc1ca27..49091b3de60 100644 --- a/src/sage/categories/hopf_algebras.py +++ b/src/sage/categories/hopf_algebras.py @@ -25,7 +25,7 @@ class HopfAlgebras(Category_over_base_ring): EXAMPLES:: sage: HopfAlgebras(QQ) - Category of hopf algebras over Rational Field + Category of Hopf algebras over Rational Field sage: HopfAlgebras(QQ).super_categories() [Category of bialgebras over Rational Field] @@ -53,11 +53,11 @@ def dual(self): sage: C = HopfAlgebras(QQ) sage: C.dual() - Category of hopf algebras over Rational Field + Category of Hopf algebras over Rational Field """ return self - WithBasis = LazyImport('sage.categories.hopf_algebras_with_basis', 'HopfAlgebrasWithBasis') + WithBasis = LazyImport('sage.categories.hopf_algebras_with_basis', 'HopfAlgebrasWithBasis') class ElementMethods: @@ -89,12 +89,12 @@ def antipode(self): # return operator.antipode(self) class ParentMethods: - #def __setup__(self): # Check the conventions for _setup_ or __setup__ + # def __setup__(self): # Check the conventions for _setup_ or __setup__ # if self.implements("antipode"): # coercion.declare(operator.antipode, [self], self.antipode) # - #@lazy_attribute - #def antipode(self): + # @lazy_attribute + # def antipode(self): # # delegates to the overloading mechanism but # # guarantees that the result is in self # compose(self, operator.antipode, domain=self) @@ -126,7 +126,7 @@ def dual(self): sage: C = HopfAlgebras(QQ).Super() sage: C.dual() - Category of super hopf algebras over Rational Field + Category of super Hopf algebras over Rational Field """ return self @@ -155,9 +155,9 @@ def extra_super_categories(self): sage: C = HopfAlgebras(QQ).TensorProducts() sage: C.extra_super_categories() - [Category of hopf algebras over Rational Field] + [Category of Hopf algebras over Rational Field] sage: sorted(C.super_categories(), key=str) - [Category of hopf algebras over Rational Field, + [Category of Hopf algebras over Rational Field, Category of tensor products of algebras over Rational Field, Category of tensor products of coalgebras over Rational Field] """ @@ -165,8 +165,8 @@ def extra_super_categories(self): class ParentMethods: # TODO: enable when tensor product of morphisms will be implemented - #@lazy_attribute - #def antipode(self): + # @lazy_attribute + # def antipode(self): # return tensor([module.antipode for module in self.modules]) pass @@ -179,8 +179,8 @@ class DualCategory(Category_over_base_ring): """ class ParentMethods: - #@lazy_attribute - #def antipode(self): + # @lazy_attribute + # def antipode(self): # self.dual().antipode.dual() # Check that this is the correct formula pass diff --git a/src/sage/categories/hopf_algebras_with_basis.py b/src/sage/categories/hopf_algebras_with_basis.py index 615fc4eae06..d56adc36eb1 100644 --- a/src/sage/categories/hopf_algebras_with_basis.py +++ b/src/sage/categories/hopf_algebras_with_basis.py @@ -25,9 +25,9 @@ class HopfAlgebrasWithBasis(CategoryWithAxiom_over_base_ring): sage: C = HopfAlgebrasWithBasis(QQ) sage: C - Category of hopf algebras with basis over Rational Field + Category of Hopf algebras with basis over Rational Field sage: C.super_categories() - [Category of hopf algebras over Rational Field, + [Category of Hopf algebras over Rational Field, Category of bialgebras with basis over Rational Field] We now show how to use a simple Hopf algebra, namely the group algebra of the dihedral group @@ -38,7 +38,7 @@ class HopfAlgebrasWithBasis(CategoryWithAxiom_over_base_ring): Dihedral group of order 6 as a permutation group over Rational Field sage: A.rename("A") # needs sage.groups sage: A.category() # needs sage.groups - Category of finite dimensional hopf algebras with basis over Rational Field + Category of finite dimensional Hopf algebras with basis over Rational Field sage: A.one_basis() # needs sage.groups () @@ -149,7 +149,7 @@ def example(self, G=None): # sage: C = HopfAlgebrasWithBasis(QQ) # sage: C.dual() -# Category of hopf algebras with basis over Rational Field +# Category of Hopf algebras with basis over Rational Field # """ # return self @@ -283,7 +283,7 @@ class ElementMethods: class TensorProducts(TensorProductsCategory): """ - The category of hopf algebras with basis constructed by tensor product of hopf algebras with basis + The category of Hopf algebras with basis constructed by tensor product of Hopf algebras with basis """ @cached_method @@ -293,11 +293,11 @@ def extra_super_categories(self): sage: C = HopfAlgebrasWithBasis(QQ).TensorProducts() sage: C.extra_super_categories() - [Category of hopf algebras with basis over Rational Field] + [Category of Hopf algebras with basis over Rational Field] sage: sorted(C.super_categories(), key=str) - [Category of hopf algebras with basis over Rational Field, - Category of tensor products of algebras with basis over Rational Field, - Category of tensor products of hopf algebras over Rational Field] + [Category of Hopf algebras with basis over Rational Field, + Category of tensor products of Hopf algebras over Rational Field, + Category of tensor products of algebras with basis over Rational Field] """ return [self.base_category()] diff --git a/src/sage/categories/lambda_bracket_algebras.py b/src/sage/categories/lambda_bracket_algebras.py index 16dbd7c7fa9..56818bf4d04 100644 --- a/src/sage/categories/lambda_bracket_algebras.py +++ b/src/sage/categories/lambda_bracket_algebras.py @@ -92,7 +92,7 @@ def FinitelyGeneratedAsLambdaBracketAlgebra(self): EXAMPLES:: sage: LieConformalAlgebras(QQ).FinitelyGenerated() - Category of finitely generated lie conformal algebras over Rational Field + Category of finitely generated Lie conformal algebras over Rational Field """ return self._with_axiom("FinitelyGeneratedAsLambdaBracketAlgebra") @@ -103,7 +103,7 @@ def FinitelyGenerated(self): EXAMPLES:: sage: LieConformalAlgebras(QQ).FinitelyGenerated() - Category of finitely generated lie conformal algebras over Rational Field + Category of finitely generated Lie conformal algebras over Rational Field """ return self._with_axiom("FinitelyGeneratedAsLambdaBracketAlgebra") diff --git a/src/sage/categories/lie_algebras.py b/src/sage/categories/lie_algebras.py index 7244eab161b..32aa9f00041 100644 --- a/src/sage/categories/lie_algebras.py +++ b/src/sage/categories/lie_algebras.py @@ -108,7 +108,7 @@ def Nilpotent(self): sage: LieAlgebras(QQ).Nilpotent() Category of nilpotent Lie algebras over Rational Field sage: LieAlgebras(QQ).WithBasis().Nilpotent() - Category of nilpotent lie algebras with basis over Rational Field + Category of nilpotent Lie algebras with basis over Rational Field """ return self._with_axiom("Nilpotent") diff --git a/src/sage/categories/lie_conformal_algebras.py b/src/sage/categories/lie_conformal_algebras.py index 8ade3811845..d1e77c3c56b 100644 --- a/src/sage/categories/lie_conformal_algebras.py +++ b/src/sage/categories/lie_conformal_algebras.py @@ -186,12 +186,12 @@ def super_categories(self): sage: C.super_categories() [Category of Lambda bracket algebras over Rational Field] sage: C = LieConformalAlgebras(QQ).FinitelyGenerated(); C - Category of finitely generated lie conformal algebras over Rational Field + Category of finitely generated Lie conformal algebras over Rational Field sage: C.super_categories() [Category of finitely generated lambda bracket algebras over Rational Field, Category of Lie conformal algebras over Rational Field] sage: C.all_super_categories() - [Category of finitely generated lie conformal algebras over Rational Field, + [Category of finitely generated Lie conformal algebras over Rational Field, Category of finitely generated lambda bracket algebras over Rational Field, Category of Lie conformal algebras over Rational Field, Category of Lambda bracket algebras over Rational Field, diff --git a/src/sage/categories/morphism.pyx b/src/sage/categories/morphism.pyx index 32fcd565e34..a30cf52e5c9 100644 --- a/src/sage/categories/morphism.pyx +++ b/src/sage/categories/morphism.pyx @@ -467,7 +467,7 @@ cdef class CallMorphism(Morphism): cdef class IdentityMorphism(Morphism): def __init__(self, parent): - from .homset import Homset, Hom + from sage.categories.homset import Homset, Hom if not isinstance(parent, Homset): parent = Hom(parent, parent) Morphism.__init__(self, parent) diff --git a/src/sage/categories/primer.py b/src/sage/categories/primer.py index 14f8d5fbbe5..0aff713bd94 100644 --- a/src/sage/categories/primer.py +++ b/src/sage/categories/primer.py @@ -159,7 +159,7 @@ Category of fields sage: HopfAlgebras(QQ) - Category of hopf algebras over Rational Field + Category of Hopf algebras over Rational Field Each of the above is called a *category*. It typically specifies what are the operations on the elements, as well as the axioms satisfied by diff --git a/src/sage/categories/realizations.py b/src/sage/categories/realizations.py index 1c40e597676..d22b6f6a80a 100644 --- a/src/sage/categories/realizations.py +++ b/src/sage/categories/realizations.py @@ -78,11 +78,11 @@ def Realizations(self): The subset algebra of {1, 2, 3} over Rational Field sage: C = GradedHopfAlgebrasWithBasis(QQ).Realizations(); C - Join of Category of graded hopf algebras with basis over Rational Field - and Category of realizations of hopf algebras over Rational Field + Join of Category of graded Hopf algebras with basis over Rational Field + and Category of realizations of Hopf algebras over Rational Field sage: C.super_categories() - [Category of graded hopf algebras with basis over Rational Field, - Category of realizations of hopf algebras over Rational Field] + [Category of graded Hopf algebras with basis over Rational Field, + Category of realizations of Hopf algebras over Rational Field] sage: TestSuite(C).run() diff --git a/src/sage/categories/shephard_groups.py b/src/sage/categories/shephard_groups.py index 5e5c8089f87..945274bcd84 100644 --- a/src/sage/categories/shephard_groups.py +++ b/src/sage/categories/shephard_groups.py @@ -36,6 +36,6 @@ def super_categories(self): sage: from sage.categories.shephard_groups import ShephardGroups sage: ShephardGroups().super_categories() - [Category of finite generalized coxeter groups] + [Category of finite generalized Coxeter groups] """ return [GeneralizedCoxeterGroups().Finite()] diff --git a/src/sage/categories/simplicial_sets.py b/src/sage/categories/simplicial_sets.py index c07871402fd..19ec792d9ab 100644 --- a/src/sage/categories/simplicial_sets.py +++ b/src/sage/categories/simplicial_sets.py @@ -8,13 +8,21 @@ # https://www.gnu.org/licenses/ # ***************************************************************************** +from sage.functions.generalized import sign +from sage.matrix.special import identity_matrix from sage.misc.cachefunc import cached_method +from sage.misc.lazy_import import lazy_import from sage.categories.category_singleton import Category_singleton from sage.categories.category_with_axiom import CategoryWithAxiom from sage.categories.sets_cat import Sets from sage.categories.homsets import HomsetsCategory +from sage.matrix.constructor import matrix +from sage.misc.misc_c import prod from sage.rings.infinity import Infinity from sage.rings.integer import Integer +from sage.rings.integer_ring import ZZ + +lazy_import('sage.matrix.constructor', 'matrix') class SimplicialSets(Category_singleton): @@ -360,10 +368,9 @@ def _universal_cover_dict(self): [1, f, f * f] """ from sage.groups.free_group import FreeGroup - skel = self.n_skeleton(2) - graph = skel.graph() - if not skel.is_connected(): - graph = graph.subgraph(skel.base_point()) + graph = self.graph() + if not self.is_connected(): + graph = graph.subgraph(self.base_point()) edges = [e[2] for e in graph.edges(sort=False)] spanning_tree = [e[2] for e in graph.min_spanning_tree()] gens = [e for e in edges if e not in spanning_tree] @@ -371,9 +378,9 @@ def _universal_cover_dict(self): FG = FreeGroup(len(gens), 'e') rels = [] - for f in skel.n_cells(2): + for f in self.n_cells(2): z = dict() - for i, sigma in enumerate(skel.faces(f)): + for i, sigma in enumerate(self.faces(f)): if sigma in spanning_tree: z[i] = FG.one() elif sigma.is_degenerate(): @@ -385,7 +392,7 @@ def _universal_cover_dict(self): z[i] = FG.one() rels.append(z[0]*z[1].inverse()*z[2]) G = FG.quotient(rels) - char = {g : G.gen(i) for i,g in enumerate(gens)} + char = {g: G.gen(i) for i, g in enumerate(gens)} for e in edges: if e not in gens: char[e] = G.one() @@ -506,7 +513,7 @@ def covering_map(self, character): grelems.append(cells_dict[(f.nondegenerate(), g)].apply_degeneracies(*f.degeneracies())) faces_dict[cell] = grelems cover = SimplicialSet(faces_dict, base_point=cells_dict[(self.base_point(), G.one())]) - cover_map_data = {c : s[0] for (s,c) in cells_dict.items()} + cover_map_data = {c: s[0] for (s, c) in cells_dict.items()} return SimplicialSetMorphism(data=cover_map_data, domain=cover, codomain=self) def cover(self, character): @@ -574,6 +581,414 @@ def universal_cover(self): """ return self.universal_cover_map().domain() + def _canonical_twisting_operator(self): + r""" + The canonical twisting operator corresponds to the abelianization of the fundamental + group. It assigns each edge to the corresponding element in the algebra of the + abelianization of the fundamental group, which is a quotient of a Laurent polynomial + ring. + + EXAMPLES:: + + sage: X = simplicial_sets.Torus() + sage: d = X._canonical_twisting_operator() + sage: d + {(s_0 v_0, sigma_1): f3, (sigma_1, s_0 v_0): f2*f3^-1, (sigma_1, sigma_1): f2} + sage: list(d.values())[0].parent() + Multivariate Laurent Polynomial Ring in f2, f3 over Integer Ring + sage: Y = simplicial_sets.RealProjectiveSpace(2) + sage: d2 = Y._canonical_twisting_operator() + sage: d2 + {f: F1bar} + sage: list(d2.values())[0].parent() + Quotient of Univariate Laurent Polynomial Ring in F1 over Integer Ring by the ideal (-1 + F1^2) + + """ + G, d = self._universal_cover_dict() + phi = G.abelianization_map() + abelG, R, I, images = G.abelianization_to_algebra(ZZ) + QRP = R.quotient_ring(I) + res = dict() + for s, el in d.items(): + res[s] = QRP(prod(images[abs(a)-1]**sign(a) for a in el.Tietze())) + return res + + def twisted_chain_complex(self, twisting_operator=None, dimensions=None, augmented=False, + cochain=False, verbose=False, subcomplex=None, + check=False): + r""" + Return the normalized chain complex twisted by some operator. + + A twisting operator is a map from the set of simplices to some algebra. + The differentials are then twisted by this operator. + + INPUT: + + - ``twisting_operator`` -- a dictionary, associating the twist of each + simplex. If it is not given, the canonical one (associated to the + laurent polynomial ring abelianization of the fundamental group, ignoring + torsion) is used. + + - ``dimensions`` -- if ``None``, compute the chain complex in all + dimensions. If a list or tuple of integers, compute the + chain complex in those dimensions, setting the chain groups + in all other dimensions to zero. + + - ``augmented`` (optional, default ``False``) -- if ``True``, + return the augmented chain complex (that is, include a class + in dimension `-1` corresponding to the empty cell). + + - ``cochain`` (optional, default ``False``) -- if ``True``, + return the cochain complex (that is, the dual of the chain + complex). + + - ``verbose`` (optional, default ``False``) -- ignored. + + - ``subcomplex`` (optional, default ``None``) -- if present, + compute the chain complex relative to this subcomplex. + + - ``check`` (optional, default ``False``) -- If ``True``, make + sure that the chain complex is actually a chain complex: + the differentials are composable and their product is zero. + + The normalized chain complex of a simplicial set is isomorphic + to the chain complex obtained by modding out by degenerate + simplices, and the latter is what is actually constructed + here. + + EXAMPLES:: + + sage: W = simplicial_sets.Sphere(1).wedge(simplicial_sets.Sphere(2)) + sage: W.nondegenerate_simplices() + [*, sigma_1, sigma_2] + sage: s1 = W.nondegenerate_simplices()[1] + sage: L. = LaurentPolynomialRing(QQ) + sage: tw = {s1:t} + sage: ChC = W.twisted_chain_complex(tw) + sage: ChC.differential(1) + [-1 + t] + sage: ChC.differential(2) + [0] + + :: + + sage: X = simplicial_sets.Torus() + sage: C = X.twisted_chain_complex() + sage: C.differential(1) + [ f3 - 1 f2*f3^-1 - 1 f2 - 1] + sage: C.differential(2) + [ 1 f2*f3^-1] + [ f3 1] + [ -1 -1] + sage: C.differential(3) + [] + + :: + + sage: Y = simplicial_sets.RealProjectiveSpace(2) + sage: C = Y.twisted_chain_complex() + sage: C.differential(1) + [-1 + F1] + sage: C.differential(2) + [1 + F1] + sage: C.differential(3) + [] + + """ + from sage.homology.chain_complex import ChainComplex + from sage.structure.element import get_coercion_model + cm = get_coercion_model() + + if twisting_operator: + twop = twisting_operator + else: + di = self._canonical_twisting_operator() + if hasattr(list(di.values())[0], "lift"): + twop = {a: b.lift() for a, b in di.items()} + else: + twop = di + + def twist(s): + if s in twop: + return twop[s] + if s.dimension() > 1: + return twist(self.face(s,s.dimension())) + return 1 + base_ring = cm.common_parent(*twop.values()) + + if dimensions is None: + if not self.cells(): # Empty + if cochain: + return ChainComplex({-1: matrix(base_ring, 0, 0)}, + degree_of_differential=1) + return ChainComplex({0: matrix(base_ring, 0, 0)}, + degree_of_differential=-1) + dimensions = list(range(self.dimension() + 1)) + else: + if not isinstance(dimensions, (list, tuple, range)): + dimensions = list(range(dimensions - 1, dimensions + 2)) + else: + dimensions = [n for n in dimensions if n >= 0] + if not dimensions: + # Return the empty chain complex. + if cochain: + return ChainComplex(base_ring=base_ring, degree=1) + else: + return ChainComplex(base_ring=base_ring, degree=-1) + + differentials = {} + # Convert the tuple self._data to a dictionary indexed by the + # non-degenerate simplices. + if subcomplex: + X = self.quotient(subcomplex) + face_data = X.face_data() + nondegens = X.nondegenerate_simplices() + else: + face_data = self.face_data() + nondegens = self.nondegenerate_simplices() + # simplices: dictionary indexed by dimension, values the list + # of non-degenerate simplices in that dimension. + simplices = {} + for sigma in nondegens: + if sigma.dimension() in simplices: + simplices[sigma.dimension()].append(sigma) + else: + simplices[sigma.dimension()] = [sigma] + first = dimensions.pop(0) + if first in simplices: + rank = len(simplices[first]) + current = sorted(simplices[first]) + else: + rank = 0 + current = [] + if augmented and first == 0: + differentials[first-1] = matrix(base_ring, 0, 1) + differentials[first] = matrix(base_ring, 1, rank, + [1] * rank) + else: + differentials[first] = matrix(base_ring, 0, rank) + + for d in dimensions: + old_rank = rank + faces = {_[1]: _[0] for _ in enumerate(current)} + if d in simplices: + current = sorted(simplices[d]) + rank = len(current) + # old_rank: number of simplices in dimension d-1. + # faces: list of simplices in dimension d-1. + # rank: number of simplices in dimension d. + # current: list of simplices in dimension d. + if not faces: + differentials[d] = matrix(base_ring, old_rank, rank) + else: + matrix_data = {} + for col, sigma in enumerate(current): + sign = 1 + twists = len(face_data[sigma]) * [1] + twists[0] = twist(sigma) + for (ch, tau) in zip(twists, face_data[sigma]): + if tau.is_nondegenerate(): + row = faces[tau] + if (row, col) in matrix_data: + matrix_data[(row, col)] += sign*ch + else: + matrix_data[(row, col)] = sign*ch + sign *= -1 + + differentials[d] = matrix(base_ring, old_rank, + rank, matrix_data, sparse=False) + + else: + rank = 0 + current = [] + differentials[d] = matrix(base_ring, old_rank, rank, sparse=False) + + if cochain: + new_diffs = {} + for d in differentials: + new_diffs[d-1] = differentials[d].transpose() + return ChainComplex(new_diffs, degree_of_differential=1, + check=check) + return ChainComplex(differentials, degree_of_differential=-1, + check=check) + + def twisted_homology(self, n, reduced=False): + r""" + The `n`-th twisted homology module of the simplicial set with respect to + the abelianization of the fundamental_group. + + It is a module over a polynomial ring, including relations to make some + variables the multiplicative inverses of others. + + INPUT: + + - ``n`` - a positive integer. + + - ``reduced`` - (default: False) if set to True, the presentation matrix + will be reduced. + + EXAMPLES:: + + sage: X = simplicial_sets.Sphere(1).wedge(simplicial_sets.Sphere(2)) + sage: X.twisted_homology(1) + Quotient module by Submodule of Ambient free module of rank 0 over the integral domain Multivariate Polynomial Ring in f1, f1inv over Integer Ring + Generated by the rows of the matrix: + [] + sage: X.twisted_homology(2) + Quotient module by Submodule of Ambient free module of rank 1 over the integral domain Multivariate Polynomial Ring in f1, f1inv over Integer Ring + Generated by the rows of the matrix: + [f1*f1inv - 1] + + :: + + sage: Y = simplicial_sets.Torus() + sage: Y.twisted_homology(1) + Quotient module by Submodule of Ambient free module of rank 5 over the integral domain Multivariate Polynomial Ring in f2, f2inv, f3, f3inv over Integer Ring + Generated by the rows of the matrix: + [ 1 0 0 0 0] + [ 0 1 0 0 0] + [ 0 0 1 0 0] + [ 0 0 0 1 0] + [ 0 0 0 0 1] + [f2*f2inv - 1 0 0 0 0] + [ 0 f2*f2inv - 1 0 0 0] + [ 0 0 f2*f2inv - 1 0 0] + [ 0 0 0 f2*f2inv - 1 0] + [ 0 0 0 0 f2*f2inv - 1] + [f3*f3inv - 1 0 0 0 0] + [ 0 f3*f3inv - 1 0 0 0] + [ 0 0 f3*f3inv - 1 0 0] + [ 0 0 0 f3*f3inv - 1 0] + [ 0 0 0 0 f3*f3inv - 1] + sage: Y.twisted_homology(2) + Quotient module by Submodule of Ambient free module of rank 0 over the integral domain Multivariate Polynomial Ring in f2, f2inv, f3, f3inv over Integer Ring + Generated by the rows of the matrix: + [] + sage: Y.twisted_homology(1, reduced=True) + Quotient module by Submodule of Ambient free module of rank 5 over the integral domain Multivariate Polynomial Ring in f2, f2inv, f3, f3inv over Integer Ring + Generated by the rows of the matrix: + [1 0 0 0 0] + [0 1 0 0 0] + [0 0 1 0 0] + [0 0 0 1 0] + [0 0 0 0 1] + + TESTS:: + + sage: X = simplicial_sets.PresentationComplex(groups.presentation.FGAbelian((3,2))) + sage: TW2 = X.twisted_homology(2, reduced=True) + sage: M = TW2.relations_matrix() + sage: from sage.libs.singular.function import singular_function + sage: vdim = singular_function("vdim") + sage: vdim(M.T, ring=M.base_ring()) + // ** considering the image in Q[...] + // ** _ is no standard basis + 5 + sage: X.universal_cover().homology(2) + Z^5 + sage: from sage.libs.singular.function import singular_function + + """ + from sage.libs.singular.function import singular_function + from sage.libs.singular.option import opt_verb + opt_verb['not_warn_sb'] = True + singstd = singular_function("std") + singsyz = singular_function("syz") + singred = singular_function("reduce") + singlift = singular_function("lift") + G, d = self._universal_cover_dict() + phi = G.abelianization_map() + abelG, R, I, images = G.abelianization_to_algebra(ZZ) + CC = self.twisted_chain_complex() + M1 = CC.differential(n).T + M2 = CC.differential(n + 1).T + + def convert_to_polynomial(p): + if hasattr(p, "lift"): + return p.lift()._as_extended_polynomial() + else: + return p._as_extended_polynomial() + M1 = M1.apply_map(convert_to_polynomial) + M2 = M2.apply_map(convert_to_polynomial) + RP = R._extended_ring + IP = RP.ideal([convert_to_polynomial(g) for g in I]) + JP = R._extended_ring_ideal + GB = (IP+JP).groebner_basis() + GBI = RP.ideal(GB) + + def reduce_laurent(a): + return singred(a, GBI, ring=RP) + + def group_to_polynomial(el, RP): + res = RP.one() + for a in el.Tietze(): + if a > 0: + res *= RP.gen(2*a-2) + else: + res *= RP.gen(-2*a-1) + return res + + def mkernel(M): + if M.nrows() == 0: + return matrix(M.base_ring(), 0, 0) + if M.ncols() == 0: + return M.T + res = M + n = res.ncols() + for g in (IP+JP).gens(): + res = res.stack(g*identity_matrix(n)) + syz = matrix(singsyz(res.T, ring=res.base_ring())).T + trimmed = syz.T.submatrix(0, 0, syz.ncols(), M.nrows()) + trimmed = trimmed.apply_map(reduce_laurent) + to_delete = [i for (i, r) in enumerate(trimmed.rows()) if not r] + return trimmed.delete_rows(to_delete) + + def lift_to_submodule(S, M): + if S.nrows() == 0 or S.ncols() == 0: + return S + res = M + for g in GB: + res = res.stack(g*identity_matrix(M.ncols())) + singres = matrix(singlift(res.T, S.T,ring=res.base_ring())) + return singres.submatrix(0, 0, M.nrows(), S.nrows()) + + def mgb(M): + if M.nrows() == 0 or M.ncols() == 0: + return M + res = M + for g in GB: + res = res.stack(g*identity_matrix(M.ncols())) + sres = matrix(singstd(res.T, ring=RP)) + to_delete = [i for i, r in enumerate(sres.apply_map(reduce_laurent)) if not r] + return sres.delete_rows(to_delete) + M2 = border_matrix(n+1) + if M1.nrows() == 0: + opt_verb.reset_default() + return (RP**0).quotient_module([]) + K = mkernel(M1) + DK = mkernel(K) + if M2.nrows() > 0: + S = lift_to_submodule(M2, K) + if S.nrows() > 0 and S.ncols() > 0: + res = mgb(DK.stack(S.T)) + else: + res = DK + else: + res = mgb(DK) + resmat = mgb(res.apply_map(reduce_laurent)) + AM = RP ** K.nrows() + if resmat.ncols() == 0: + SM = AM.submodule([]) + opt_verb.reset_default() + return AM.quotient_module(SM) + for g in (IP+JP).gens(): + resmat = resmat.stack(g * identity_matrix(resmat.ncols())) + if reduced: + resmat = matrix(singstd(resmat.T, ring=RP)) + SM = AM.submodule(resmat) + opt_verb.reset_default() + return AM.quotient_module(SM) + def is_simply_connected(self): """ Return ``True`` if this pointed simplicial set is simply connected. diff --git a/src/sage/categories/super_hopf_algebras_with_basis.py b/src/sage/categories/super_hopf_algebras_with_basis.py index afaafc2b8f7..b3b86d0973d 100644 --- a/src/sage/categories/super_hopf_algebras_with_basis.py +++ b/src/sage/categories/super_hopf_algebras_with_basis.py @@ -18,11 +18,11 @@ class SuperHopfAlgebrasWithBasis(SuperModulesCategory): EXAMPLES:: sage: C = HopfAlgebras(ZZ).WithBasis().Super(); C - Category of super hopf algebras with basis over Integer Ring + Category of super Hopf algebras with basis over Integer Ring sage: sorted(C.super_categories(), key=str) - [Category of super algebras with basis over Integer Ring, - Category of super coalgebras with basis over Integer Ring, - Category of super hopf algebras over Integer Ring] + [Category of super Hopf algebras over Integer Ring, + Category of super algebras with basis over Integer Ring, + Category of super coalgebras with basis over Integer Ring] TESTS:: diff --git a/src/sage/categories/super_modules.py b/src/sage/categories/super_modules.py index 0fbd94fbf31..a6d17ea32b0 100644 --- a/src/sage/categories/super_modules.py +++ b/src/sage/categories/super_modules.py @@ -46,7 +46,7 @@ def default_super_categories(cls, category, *args): EXAMPLES:: sage: HopfAlgebras(ZZ).WithBasis().FiniteDimensional().Super() # indirect doctest - Category of finite dimensional super hopf algebras with basis over Integer Ring + Category of finite dimensional super Hopf algebras with basis over Integer Ring """ axioms = axiom_whitelist.intersection(category.axioms()) C = super().default_super_categories(category, *args) diff --git a/src/sage/categories/triangular_kac_moody_algebras.py b/src/sage/categories/triangular_kac_moody_algebras.py index e9c3f1ad167..f5730707d36 100644 --- a/src/sage/categories/triangular_kac_moody_algebras.py +++ b/src/sage/categories/triangular_kac_moody_algebras.py @@ -37,7 +37,7 @@ def super_categories(self): sage: from sage.categories.triangular_kac_moody_algebras import TriangularKacMoodyAlgebras sage: TriangularKacMoodyAlgebras(QQ).super_categories() - [Join of Category of graded lie algebras with basis over Rational Field + [Join of Category of graded Lie algebras with basis over Rational Field and Category of kac moody algebras over Rational Field] """ diff --git a/src/sage/categories/weyl_groups.py b/src/sage/categories/weyl_groups.py index 79db1d40001..5a52c10e04b 100644 --- a/src/sage/categories/weyl_groups.py +++ b/src/sage/categories/weyl_groups.py @@ -74,17 +74,6 @@ def additional_structure(self): """ return None - def _repr_object_names(self): - """ - Return the name of the objects of this category. - - EXAMPLES:: - - sage: WeylGroups().Finite() - Category of finite Weyl groups - """ - return "Weyl groups" - Finite = LazyImport('sage.categories.finite_weyl_groups', 'FiniteWeylGroups') class ParentMethods: diff --git a/src/sage/categories/with_realizations.py b/src/sage/categories/with_realizations.py index d0dc8d148bd..eaabcdaf04a 100644 --- a/src/sage/categories/with_realizations.py +++ b/src/sage/categories/with_realizations.py @@ -271,9 +271,9 @@ def WithRealizations(self): sage: Semigroups().WithRealizations() Join of Category of semigroups and Category of sets with realizations sage: C = GradedHopfAlgebrasWithBasis(QQ).WithRealizations(); C - Category of graded hopf algebras with basis over Rational Field with realizations + Category of graded Hopf algebras with basis over Rational Field with realizations sage: C.super_categories() - [Join of Category of hopf algebras over Rational Field + [Join of Category of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field] sage: TestSuite(Semigroups().WithRealizations()).run() @@ -303,7 +303,7 @@ def _repr_(self): EXAMPLES:: sage: C = GradedHopfAlgebrasWithBasis(QQ).WithRealizations(); C #indirect doctest - Category of graded hopf algebras with basis over Rational Field with realizations + Category of graded Hopf algebras with basis over Rational Field with realizations """ s = repr(self.base_category()) - return s+" with realizations" + return s + " with realizations" diff --git a/src/sage/combinat/binary_tree.py b/src/sage/combinat/binary_tree.py index 3f7b8ae2fc5..f58f7558a73 100644 --- a/src/sage/combinat/binary_tree.py +++ b/src/sage/combinat/binary_tree.py @@ -748,7 +748,7 @@ def graph(self, with_leaves=True): sage: t1.graph(with_leaves=False).edges(sort=True) [(0, 1, None), (0, 2, None), (2, 3, None), (2, 4, None)] """ - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph if with_leaves: # We want leaves and nodes. diff --git a/src/sage/combinat/chas/fsym.py b/src/sage/combinat/chas/fsym.py index f1c149c66f1..7f63a24c798 100644 --- a/src/sage/combinat/chas/fsym.py +++ b/src/sage/combinat/chas/fsym.py @@ -214,10 +214,10 @@ def super_categories(self): sage: bases = FSymBases(FSym) sage: bases.super_categories() [Category of realizations of Hopf algebra of standard tableaux over the Integer Ring, - Join of Category of realizations of hopf algebras over Integer Ring + Join of Category of realizations of Hopf algebras over Integer Ring and Category of graded algebras over Integer Ring and Category of graded coalgebras over Integer Ring, - Category of graded connected hopf algebras with basis over Integer Ring] + Category of graded connected Hopf algebras with basis over Integer Ring] """ R = self.base().base_ring() return [self.base().Realizations(), diff --git a/src/sage/combinat/chas/wqsym.py b/src/sage/combinat/chas/wqsym.py index 57b90761c88..567e1f1b9f5 100644 --- a/src/sage/combinat/chas/wqsym.py +++ b/src/sage/combinat/chas/wqsym.py @@ -1945,18 +1945,18 @@ def super_categories(self): sage: bases = WQSymBases(WQSym, True) sage: bases.super_categories() [Category of realizations of Word Quasi-symmetric functions over Integer Ring, - Join of Category of realizations of hopf algebras over Integer Ring + Join of Category of realizations of Hopf algebras over Integer Ring and Category of graded algebras over Integer Ring and Category of graded coalgebras over Integer Ring, - Category of graded connected hopf algebras with basis over Integer Ring] + Category of graded connected Hopf algebras with basis over Integer Ring] sage: bases = WQSymBases(WQSym, False) sage: bases.super_categories() [Category of realizations of Word Quasi-symmetric functions over Integer Ring, - Join of Category of realizations of hopf algebras over Integer Ring + Join of Category of realizations of Hopf algebras over Integer Ring and Category of graded algebras over Integer Ring and Category of graded coalgebras over Integer Ring, - Join of Category of filtered connected hopf algebras with basis over Integer Ring + Join of Category of filtered connected Hopf algebras with basis over Integer Ring and Category of graded algebras over Integer Ring and Category of graded coalgebras over Integer Ring] """ diff --git a/src/sage/combinat/combination.py b/src/sage/combinat/combination.py index 8561935b403..916ca836c6b 100644 --- a/src/sage/combinat/combination.py +++ b/src/sage/combinat/combination.py @@ -153,6 +153,13 @@ class of combinations of ``mset`` of size ``k``. TESTS: + Run the test suites:: + + sage: C = Combinations([2,3]) + sage: TestSuite(C).run() + sage: C = Combinations([2,3], 1) + sage: TestSuite(C).run() + We check that the code works even for non mutable objects:: sage: l = [vector((0,0)), vector((0,1))] # needs sage.modules @@ -199,7 +206,7 @@ def __init__(self, mset): self.mset = mset Parent.__init__(self, category=FiniteEnumeratedSets()) - def __contains__(self, x): + def __contains__(self, x) -> bool: """ EXAMPLES:: @@ -218,7 +225,7 @@ def __contains__(self, x): return all(i in self.mset for i in x) and len(set(x)) == len(x) - def __eq__(self, other): + def __eq__(self, other) -> bool: """ Test for equality. @@ -232,7 +239,7 @@ def __eq__(self, other): """ return isinstance(other, Combinations_mset) and self.mset == other.mset - def __ne__(self, other): + def __ne__(self, other) -> bool: """ Test for unequality. @@ -244,7 +251,7 @@ def __ne__(self, other): """ return not (self == other) - def __repr__(self): + def __repr__(self) -> str: """ TESTS:: @@ -263,7 +270,7 @@ def __iter__(self): for k in range(len(self.mset) + 1): yield from Combinations_msetk(self.mset, k) - def cardinality(self): + def cardinality(self) -> Integer: """ TESTS:: @@ -272,10 +279,8 @@ def cardinality(self): sage: Combinations(['a','a','b']).cardinality() # needs sage.libs.gap 6 """ - c = 0 - for k in range(len(self.mset) + 1): - c += Combinations_msetk(self.mset, k).cardinality() - return c + return ZZ.sum(Combinations_msetk(self.mset, k).cardinality() + for k in range(len(self.mset) + 1)) class Combinations_set(Combinations_mset): @@ -332,7 +337,7 @@ def cardinality(self): sage: Combinations(range(16000)).cardinality() == 2^16000 True """ - return 2**len(self.mset) + return ZZ(2)**len(self.mset) class Combinations_msetk(Parent): @@ -348,7 +353,7 @@ def __init__(self, mset, k): self.k = k Parent.__init__(self, category=FiniteEnumeratedSets()) - def __contains__(self, x): + def __contains__(self, x) -> bool: """ EXAMPLES:: @@ -370,7 +375,7 @@ def __contains__(self, x): return False return x in Combinations_mset(self.mset) and len(x) == self.k - def __eq__(self, other): + def __eq__(self, other) -> bool: """ Test for equality. @@ -385,7 +390,7 @@ def __eq__(self, other): return (isinstance(other, Combinations_msetk) and self.mset == other.mset and self.k == other.k) - def __ne__(self, other): + def __ne__(self, other) -> bool: """ Test for unequality. @@ -397,7 +402,7 @@ def __ne__(self, other): """ return not (self == other) - def __repr__(self): + def __repr__(self) -> str: """ TESTS:: @@ -422,7 +427,7 @@ def __iter__(self): yield sum([[self.mset[indices[i]]] * iv[i] for i in range(len(indices))], []) - def cardinality(self): + def cardinality(self) -> Integer: """ Return the size of combinations(mset, k). @@ -490,7 +495,7 @@ def __iter__(self): else: return self._iterator(self.mset, self.k) - def list(self): + def list(self) -> list: """ EXAMPLES:: @@ -529,7 +534,7 @@ def rank(self, x): x = [self.mset.index(i) for i in x] return rank(x, len(self.mset)) - def cardinality(self): + def cardinality(self) -> Integer: """ Return the size of combinations(set, k). @@ -538,7 +543,7 @@ def cardinality(self): sage: Combinations(range(16000), 5).cardinality() 8732673194560003200 """ - return binomial(len(self.mset), self.k) + return ZZ(binomial(len(self.mset), self.k)) def rank(comb, n, check=True): diff --git a/src/sage/combinat/fqsym.py b/src/sage/combinat/fqsym.py index 48780725faa..fbfbf7b54bc 100644 --- a/src/sage/combinat/fqsym.py +++ b/src/sage/combinat/fqsym.py @@ -1276,10 +1276,10 @@ def super_categories(self): sage: bases = FQSymBases(FQSym) sage: bases.super_categories() [Category of realizations of Free Quasi-symmetric functions over Integer Ring, - Join of Category of realizations of hopf algebras over Integer Ring + Join of Category of realizations of Hopf algebras over Integer Ring and Category of graded algebras over Integer Ring and Category of graded coalgebras over Integer Ring, - Category of graded connected hopf algebras with basis over Integer Ring] + Category of graded connected Hopf algebras with basis over Integer Ring] """ R = self.base().base_ring() return [self.base().Realizations(), diff --git a/src/sage/combinat/free_module.py b/src/sage/combinat/free_module.py index 3c77ac6ef16..d8092f4bea1 100644 --- a/src/sage/combinat/free_module.py +++ b/src/sage/combinat/free_module.py @@ -777,20 +777,6 @@ def _convert_map_from_(self, S): lambda x: self.sum_of_terms((G(g), K(c)) for c, g in x)) - def _an_element_impl(self): # TODO: REMOVE? - """ - Return an element of ``self``, namely the zero element. - - EXAMPLES:: - - sage: F = CombinatorialFreeModule(QQ, ['a', 'b', 'c']) - sage: F._an_element_impl() - 0 - sage: _.parent() is F - True - """ - return self.element_class(self, {}) - def _first_ngens(self, n): """ Used by the preparser for ``F. = ...``. diff --git a/src/sage/combinat/multiset_partition_into_sets_ordered.py b/src/sage/combinat/multiset_partition_into_sets_ordered.py index a8855beb412..c544d9ae2ef 100755 --- a/src/sage/combinat/multiset_partition_into_sets_ordered.py +++ b/src/sage/combinat/multiset_partition_into_sets_ordered.py @@ -1699,7 +1699,7 @@ def _satisfies_constraints(self, x): .. NOTE:: This test will cause an infinite recursion with - ``self._element_constructor()`` if the ``__contains__`` + ``self._element_constructor_()`` if the ``__contains__`` method in ``OrderedMultisetPartitionsIntoSets_X`` is removed. TESTS:: diff --git a/src/sage/combinat/ncsf_qsym/generic_basis_code.py b/src/sage/combinat/ncsf_qsym/generic_basis_code.py index bbf4d7af76c..4fe908d727c 100644 --- a/src/sage/combinat/ncsf_qsym/generic_basis_code.py +++ b/src/sage/combinat/ncsf_qsym/generic_basis_code.py @@ -69,8 +69,8 @@ def super_categories(self): sage: QSym = QuasiSymmetricFunctions(QQ) sage: BasesOfQSymOrNCSF(QSym).super_categories() [Category of realizations of Quasisymmetric functions over the Rational Field, - Category of graded hopf algebras with basis over Rational Field, - Join of Category of realizations of hopf algebras over Rational Field + Category of graded Hopf algebras with basis over Rational Field, + Join of Category of realizations of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field] """ @@ -1051,7 +1051,7 @@ def __init__(self, domain, on_generators, position=0, codomain=None, category=No sage: f(2*Psi[[]] + 3 * Psi[1,3,2] + Psi[2,4] ) 2*Psi[] - 3*Psi[1, 3, 2] + Psi[2, 4] sage: f.category() - Category of endsets of hopf algebras over Rational Field and graded modules over Rational Field + Category of endsets of Hopf algebras over Rational Field and graded modules over Rational Field If ``anti`` is true, this returns an anti-algebra morphism:: diff --git a/src/sage/combinat/ncsf_qsym/ncsf.py b/src/sage/combinat/ncsf_qsym/ncsf.py index f8d3fb64844..0d91379f408 100644 --- a/src/sage/combinat/ncsf_qsym/ncsf.py +++ b/src/sage/combinat/ncsf_qsym/ncsf.py @@ -66,7 +66,7 @@ class NonCommutativeSymmetricFunctions(UniqueRepresentation, Parent): one generator in each degree:: sage: NCSF.category() - Join of Category of hopf algebras over Rational Field + Join of Category of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of monoids with realizations and Category of graded coalgebras over Rational Field @@ -2134,7 +2134,7 @@ def algebra_morphism(self, on_generators, **keywords): sage: f(2*Psi[[]] + 3 * Psi[1,3,2] + Psi[2,4] ) 2*Psi[] - 3*Psi[1, 3, 2] + Psi[2, 4] sage: f.category() - Category of endsets of hopf algebras over Rational Field and graded modules over Rational Field + Category of endsets of Hopf algebras over Rational Field and graded modules over Rational Field If ``anti`` is true, this returns an anti-algebra morphism:: diff --git a/src/sage/combinat/ncsf_qsym/qsym.py b/src/sage/combinat/ncsf_qsym/qsym.py index 527724e95b6..75b60c617a5 100644 --- a/src/sage/combinat/ncsf_qsym/qsym.py +++ b/src/sage/combinat/ncsf_qsym/qsym.py @@ -185,7 +185,7 @@ class QuasiSymmetricFunctions(UniqueRepresentation, Parent): sage: QSym = QuasiSymmetricFunctions(QQ) sage: QSym.category() - Join of Category of hopf algebras over Rational Field + Join of Category of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of commutative algebras over Rational Field and Category of monoids with realizations diff --git a/src/sage/combinat/ncsym/bases.py b/src/sage/combinat/ncsym/bases.py index 9d4aac2cdf1..466d1ad42e5 100644 --- a/src/sage/combinat/ncsym/bases.py +++ b/src/sage/combinat/ncsym/bases.py @@ -74,8 +74,8 @@ def super_categories(self): sage: NCSymOrNCSymDualBases(NCSym).super_categories() [Category of realizations of Symmetric functions in non-commuting variables over the Rational Field, - Category of graded hopf algebras with basis over Rational Field, - Join of Category of realizations of hopf algebras over Rational Field + Category of graded Hopf algebras with basis over Rational Field, + Join of Category of realizations of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field] """ diff --git a/src/sage/combinat/partition.py b/src/sage/combinat/partition.py index 9966a174cb1..7d16d5d3410 100644 --- a/src/sage/combinat/partition.py +++ b/src/sage/combinat/partition.py @@ -5518,7 +5518,7 @@ def specht_module_dimension(self, base_ring=None): INPUT: - - ``BR`` -- (default: `\QQ`) the base ring + - ``base_ring`` -- (default: `\QQ`) the base ring EXAMPLES:: @@ -5534,6 +5534,43 @@ def specht_module_dimension(self, base_ring=None): from sage.combinat.specht_module import specht_module_rank return specht_module_rank(self, base_ring) + def simple_module_dimension(self, base_ring=None): + r""" + Return the dimension of the simple module corresponding to ``self``. + + When the base ring is a field of characteristic `0`, this is equal + to the dimension of the Specht module. + + INPUT: + + - ``base_ring`` -- (default: `\QQ`) the base ring + + EXAMPLES:: + + sage: Partition([2,2,1]).simple_module_dimension() + 5 + sage: Partition([2,2,1]).specht_module_dimension(GF(3)) # optional - sage.rings.finite_rings + 5 + sage: Partition([2,2,1]).simple_module_dimension(GF(3)) # optional - sage.rings.finite_rings + 4 + + sage: for la in Partitions(6, regular=3): + ....: print(la, la.specht_module_dimension(), la.simple_module_dimension(GF(3))) + [6] 1 1 + [5, 1] 5 4 + [4, 2] 9 9 + [4, 1, 1] 10 6 + [3, 3] 5 1 + [3, 2, 1] 16 4 + [2, 2, 1, 1] 9 9 + """ + from sage.categories.fields import Fields + if base_ring is None or (base_ring in Fields() and base_ring.characteristic() == 0): + from sage.combinat.tableau import StandardTableaux + return StandardTableaux(self).cardinality() + from sage.combinat.specht_module import simple_module_rank + return simple_module_rank(self, base_ring) + ############## # Partitions # diff --git a/src/sage/combinat/posets/hasse_cython.pyx b/src/sage/combinat/posets/hasse_cython.pyx index 8f7a869fc17..2048febd192 100644 --- a/src/sage/combinat/posets/hasse_cython.pyx +++ b/src/sage/combinat/posets/hasse_cython.pyx @@ -31,7 +31,7 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): as given by the lazy attribute ``_leq_storage`` of Hasse diagrams. - ``element_constructor`` -- used to determine the type of chains, - for example ``list`` or ``tuple`` + for example :class:`list` or :class:`tuple` - ``exclude`` -- list of integers that should not belong to the chains @@ -71,7 +71,7 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): self._greater_than = positions self._vertices = list(range(n)) - self._element_constructor = element_constructor + self._constructor = element_constructor self._conversion = conversion if conversion is not None: self._from_poset = {elt: i for i, elt in enumerate(conversion)} @@ -92,8 +92,8 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): sage: from sage.combinat.posets.hasse_cython import IncreasingChains sage: D = IncreasingChains([{0,1},{1}], list, []) - sage: [x in D for x in D] - [True, True, True, True] + sage: all(x in D for x in D) + True sage: [2] in D False sage: [1,1] in D @@ -102,6 +102,13 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): sage: P = Poset({'a':['b'],'b':[]}) sage: ['a'] in P.chains() True + + TESTS:: + + sage: from sage.combinat.posets.hasse_cython import IncreasingChains + sage: D = IncreasingChains([{0,1},{1}], list, []) + sage: all(tuple(x) in D for x in D) + True """ cdef int k cdef Py_ssize_t i, x, y @@ -109,9 +116,8 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): return True if self._conversion is not None: tup = [self._from_poset[elt] for elt in tup] - for i in tup: - if not(0 <= i < self._n): - return False + if any(not(0 <= i < self._n) for i in tup): + return False y = tup[0] for k in range(1, len(tup)): x = y @@ -142,8 +148,8 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): """ cdef Py_ssize_t i if self._conversion is not None: - return self._element_constructor(self._conversion[i] for i in chain) - return self._element_constructor(chain) + return self._constructor(self._conversion[i] for i in chain) + return self._constructor(chain) def children(self, chain): """ @@ -163,6 +169,5 @@ class IncreasingChains(RecursivelyEnumeratedSet_forest): cdef Py_ssize_t x, y if not chain: return [(x,) for x in self._vertices] - else: - x = chain[-1] - return [chain + (y,) for y in self._greater_than[x] if x != y] + x = chain[-1] + return [chain + (y,) for y in self._greater_than[x] if x != y] diff --git a/src/sage/combinat/sf/k_dual.py b/src/sage/combinat/sf/k_dual.py index be19a9fd413..4fa2e971e36 100644 --- a/src/sage/combinat/sf/k_dual.py +++ b/src/sage/combinat/sf/k_dual.py @@ -490,7 +490,7 @@ def super_categories(self): sage: KQB = KBoundedQuotientBases(Q) sage: KQB.super_categories() [Category of realizations of 3-Bounded Quotient of Symmetric Functions over Univariate Polynomial Ring in t over Rational Field with t=1, - Join of Category of graded hopf algebras with basis over Univariate Polynomial Ring in t over Rational Field + Join of Category of graded Hopf algebras with basis over Univariate Polynomial Ring in t over Rational Field and Category of quotients of algebras over Univariate Polynomial Ring in t over Rational Field and Category of quotients of graded modules with basis over Univariate Polynomial Ring in t over Rational Field] """ diff --git a/src/sage/combinat/sf/sf.py b/src/sage/combinat/sf/sf.py index 16999699f42..ad86bfd6c7f 100644 --- a/src/sage/combinat/sf/sf.py +++ b/src/sage/combinat/sf/sf.py @@ -73,7 +73,7 @@ class SymmetricFunctions(UniqueRepresentation, Parent): Sage knows certain categorical information about this algebra:: sage: Sym.category() - Join of Category of hopf algebras over Rational Field + Join of Category of Hopf algebras over Rational Field and Category of unique factorization domains and Category of graded algebras over Rational Field and Category of commutative algebras over Rational Field @@ -165,7 +165,7 @@ class SymmetricFunctions(UniqueRepresentation, Parent): [Category of graded bases of Symmetric Functions over Rational Field, Category of filtered bases of Symmetric Functions over Rational Field, Category of bases of Symmetric Functions over Rational Field, - Category of graded hopf algebras with basis over Rational Field, + Category of graded Hopf algebras with basis over Rational Field, ...] To start with, ``p`` is a graded algebra, the grading being induced diff --git a/src/sage/combinat/sf/sfa.py b/src/sage/combinat/sf/sfa.py index 9a5d8fb70a3..bca95b7f9da 100644 --- a/src/sage/combinat/sf/sfa.py +++ b/src/sage/combinat/sf/sfa.py @@ -360,8 +360,8 @@ def super_categories(self): sage: bases = SymmetricFunctionsBases(Sym) sage: bases.super_categories() [Category of realizations of Symmetric Functions over Rational Field, - Category of commutative hopf algebras with basis over Rational Field, - Join of Category of realizations of hopf algebras over Rational Field + Category of commutative Hopf algebras with basis over Rational Field, + Join of Category of realizations of Hopf algebras over Rational Field and Category of graded algebras over Rational Field and Category of graded coalgebras over Rational Field, Category of unique factorization domains] @@ -370,8 +370,8 @@ def super_categories(self): sage: bases = SymmetricFunctionsBases(Sym) sage: bases.super_categories() [Category of realizations of Symmetric Functions over Univariate Polynomial Ring in x over Integer Ring, - Category of commutative hopf algebras with basis over Univariate Polynomial Ring in x over Integer Ring, - Join of Category of realizations of hopf algebras over Univariate Polynomial Ring in x over Integer Ring + Category of commutative Hopf algebras with basis over Univariate Polynomial Ring in x over Integer Ring, + Join of Category of realizations of Hopf algebras over Univariate Polynomial Ring in x over Integer Ring and Category of graded algebras over Univariate Polynomial Ring in x over Integer Ring and Category of graded coalgebras over Univariate Polynomial Ring in x over Integer Ring] """ @@ -1532,7 +1532,7 @@ def super_categories(self): sage: bases = FilteredSymmetricFunctionsBases(Sym) sage: bases.super_categories() [Category of bases of Symmetric Functions over Rational Field, - Category of commutative filtered hopf algebras with basis over Rational Field] + Category of commutative filtered Hopf algebras with basis over Rational Field] """ cat = HopfAlgebras(self.base().base_ring()).Commutative().WithBasis().Filtered() return [SymmetricFunctionsBases(self.base()), cat] @@ -1582,7 +1582,7 @@ def super_categories(self): sage: bases = GradedSymmetricFunctionsBases(Sym) sage: bases.super_categories() [Category of filtered bases of Symmetric Functions over Rational Field, - Category of commutative graded hopf algebras with basis over Rational Field] + Category of commutative graded Hopf algebras with basis over Rational Field] """ cat = HopfAlgebras(self.base().base_ring()).Commutative().WithBasis().Graded() return [FilteredSymmetricFunctionsBases(self.base()), cat] diff --git a/src/sage/combinat/specht_module.py b/src/sage/combinat/specht_module.py index 209890c1bd1..62842b11a30 100644 --- a/src/sage/combinat/specht_module.py +++ b/src/sage/combinat/specht_module.py @@ -457,3 +457,111 @@ def specht_module_rank(D, base_ring=None): if base_ring is None: base_ring = QQ return matrix(base_ring, [v.to_vector() for v in span_set]).rank() + + +def polytabloid(T): + r""" + Compute the polytabloid element associated to a tableau ``T``. + + For a tableau `T`, the polytabloid associated to `T` is + + .. MATH:: + + e_T = \sum_{\sigma \in C_T} (-1)^{\sigma} \{\sigma T\}, + + where `\{\}` is the row-equivalence class, i.e. a tabloid, + and `C_T` is the column stabilizer of `T`. The sum takes place in + the module spanned by tabloids `\{T\}`. + + OUTPUT: + + A ``dict`` whose keys are tabloids represented by tuples of frozensets + and whose values are the coefficient. + + EXAMPLES:: + + sage: from sage.combinat.specht_module import polytabloid + sage: T = StandardTableau([[1,3,4],[2,5]]) + sage: polytabloid(T) + {(frozenset({1, 3, 4}), frozenset({2, 5})): 1, + (frozenset({1, 4, 5}), frozenset({2, 3})): -1, + (frozenset({2, 3, 4}), frozenset({1, 5})): -1, + (frozenset({2, 4, 5}), frozenset({1, 3})): 1} + """ + e_T = {} + C_T = T.column_stabilizer() + for perm in C_T: + TT = tuple([frozenset(perm(val) for val in row) for row in T]) + if TT in e_T: + e_T[TT] += perm.sign() + else: + e_T[TT] = perm.sign() + return e_T + + +def tabloid_gram_matrix(la, base_ring): + r""" + Compute the Gram matrix of the bilinear form of a Specht module + pulled back from the tabloid module. + + For the module spanned by all tabloids, we define an bilinear form + by having the tabloids be an orthonormal basis. We then pull this + bilinear form back across the natural injection of the Specht module + into the tabloid module. + + EXAMPLES:: + + sage: from sage.combinat.specht_module import tabloid_gram_matrix + sage: tabloid_gram_matrix([3,2], GF(5)) + [4 2 2 1 4] + [2 4 1 2 1] + [2 1 4 2 1] + [1 2 2 4 2] + [4 1 1 2 4] + """ + from sage.combinat.tableau import StandardTableaux + ST = StandardTableaux(la) + + def bilinear_form(p1, p2): + if len(p2) < len(p1): + p1, p2 = p2, p1 + return sum(c1 * p2.get(T1, 0) for T1, c1 in p1.items() if c1) + + gram_matrix = [[bilinear_form(polytabloid(T1), polytabloid(T2)) for T1 in ST] for T2 in ST] + return matrix(base_ring, gram_matrix) + + +def simple_module_rank(la, base_ring): + r""" + Return the rank of the simple `S_n`-module corresponding to the + partition ``la`` of size `n` over ``base_ring``. + + EXAMPLES:: + + sage: from sage.combinat.specht_module import simple_module_rank + sage: simple_module_rank([3,2,1,1], GF(3)) + 13 + + TESTS:: + + sage: from sage.combinat.specht_module import simple_module_rank + sage: simple_module_rank([1,1,1,1], GF(3)) + Traceback (most recent call last): + ... + ValueError: the partition [1, 1, 1, 1] is not 3-regular + + sage: from sage.combinat.specht_module import simple_module_rank + sage: simple_module_rank([2,1], GF(3)['x']) + Traceback (most recent call last): + ... + NotImplementedError: the base must be a field + """ + from sage.categories.fields import Fields + from sage.combinat.partition import Partition + if base_ring not in Fields(): + raise NotImplementedError("the base must be a field") + p = base_ring.characteristic() + la = Partition(la) + if not la.is_regular(p): + raise ValueError(f"the partition {la} is not {p}-regular") + return tabloid_gram_matrix(la, base_ring).rank() diff --git a/src/sage/combinat/symmetric_group_algebra.py b/src/sage/combinat/symmetric_group_algebra.py index 84b29a770b2..7672c8c7649 100644 --- a/src/sage/combinat/symmetric_group_algebra.py +++ b/src/sage/combinat/symmetric_group_algebra.py @@ -689,7 +689,7 @@ def cell_poset(self): """ from sage.combinat.posets.posets import Poset from sage.combinat.partition import Partitions - return Poset([Partitions(self.n), lambda x, y: x.dominates(y)]) + return Poset([Partitions(self.n), lambda x, y: y.dominates(x)]) def cell_module_indices(self, la): r""" @@ -716,25 +716,67 @@ def _from_cellular_index(self, x): sage: S = SymmetricGroupAlgebra(QQ, 3) sage: C = S.cellular_basis() sage: [S._from_cellular_index(i) for i in C.basis().keys()] - [1/6*[1, 2, 3] + 1/6*[1, 3, 2] + 1/6*[2, 1, 3] - + 1/6*[2, 3, 1] + 1/6*[3, 1, 2] + 1/6*[3, 2, 1], + [1/6*[1, 2, 3] - 1/6*[1, 3, 2] - 1/6*[2, 1, 3] + 1/6*[2, 3, 1] + + 1/6*[3, 1, 2] - 1/6*[3, 2, 1], 1/3*[1, 2, 3] + 1/6*[1, 3, 2] - 1/3*[2, 1, 3] - 1/6*[2, 3, 1] - 1/6*[3, 1, 2] + 1/6*[3, 2, 1], 1/3*[1, 3, 2] + 1/3*[2, 3, 1] - 1/3*[3, 1, 2] - 1/3*[3, 2, 1], 1/4*[1, 3, 2] - 1/4*[2, 3, 1] + 1/4*[3, 1, 2] - 1/4*[3, 2, 1], 1/3*[1, 2, 3] - 1/6*[1, 3, 2] + 1/3*[2, 1, 3] - 1/6*[2, 3, 1] - 1/6*[3, 1, 2] - 1/6*[3, 2, 1], - 1/6*[1, 2, 3] - 1/6*[1, 3, 2] - 1/6*[2, 1, 3] + 1/6*[2, 3, 1] - + 1/6*[3, 1, 2] - 1/6*[3, 2, 1]] + 1/6*[1, 2, 3] + 1/6*[1, 3, 2] + 1/6*[2, 1, 3] + + 1/6*[2, 3, 1] + 1/6*[3, 1, 2] + 1/6*[3, 2, 1]] + + sage: S = SymmetricGroupAlgebra(GF(3), 3) + sage: C = S.cellular_basis() + sage: [S._from_cellular_index(i) for i in C.basis().keys()] + [[1, 2, 3] + [1, 3, 2] + [2, 1, 3] + [2, 3, 1] + [3, 1, 2] + [3, 2, 1], + [1, 2, 3] + [2, 1, 3], + [1, 2, 3] + [1, 3, 2] + [2, 1, 3] + [3, 1, 2], + [1, 2, 3] + [1, 3, 2] + [2, 1, 3] + [2, 3, 1], + [1, 2, 3] + [1, 3, 2], + [1, 2, 3]] + sage: TestSuite(C).run() """ + if ~factorial(self.n) not in self.base_ring(): + from sage.combinat.rsk import RSK_inverse + from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet + G = self.basis().keys() + R = self.base_ring() + one = R.one() + # check if the KL polynomials can be computed using ``coxeter3`` + try: + from sage.libs.coxeter3.coxeter_group import CoxeterGroup as Coxeter3Group + except ImportError: + # Falback to using the KL polynomial + from sage.combinat.kazhdan_lusztig import KazhdanLusztigPolynomial + from sage.groups.perm_gps.permgroup_named import SymmetricGroup + q = PolynomialRing(R, 'q').gen() + KLG = SymmetricGroup(self.n) + self._cellular_KL = KazhdanLusztigPolynomial(KLG, q) + polyfunc = self._cellular_KL.P + else: + self._cellular_KL = Coxeter3Group(['A', self.n+1]) + KLG = self._cellular_KL + polyfunc = self._cellular_KL.kazhdan_lusztig_polynomial + + def func(S, T, mult=None): + w = KLG.from_reduced_word(RSK_inverse(T, S, output="permutation").reduced_word()) + bruhat = RecursivelyEnumeratedSet([w], lambda u: u.bruhat_lower_covers(), structure='graded') + return self.element_class(self, {G.from_reduced_word(v.reduced_word()): R(c(q=one)) + for v in bruhat if (c := polyfunc(v, w))}) + + else: + func = self.epsilon_ik + SGA = SymmetricGroupAlgebra(self.base_ring(), self.n) P = self.basis().keys() if SGA.basis().keys() is P: # Indexed by permutations - return self.epsilon_ik(x[1], x[2]) + return func(x[1], x[2]) from sage.groups.perm_gps.permgroup_named import SymmetricGroup if P == SymmetricGroup(self.n): - return self.epsilon_ik(x[1], x[2]) - ret = SGA.epsilon_ik(x[1], x[2], mult='r2l') + return func(x[1], x[2]) + ret = func(x[1], x[2], mult='r2l') try: return self(ret) except TypeError: @@ -1587,6 +1629,30 @@ def specht_module_dimension(self, D): span_set = specht_module_spanning_set(D, self) return matrix(self.base_ring(), [v.to_vector() for v in span_set]).rank() + def simple_module_dimension(self, la): + r""" + Return the dimension of the simple module of ``self`` indexed by the + partition ``la``. + + EXAMPLES:: + + sage: SGA = SymmetricGroupAlgebra(GF(5), 6) + sage: SGA.simple_module_dimension(Partition([4,1,1])) + 10 + + TESTS:: + + sage: SGA = SymmetricGroupAlgebra(GF(5), 6) + sage: SGA.simple_module_dimension(Partition([3,1,1])) + Traceback (most recent call last): + ... + ValueError: [3, 1, 1] is not a partition of 6 + """ + if sum(la) != self.n: + raise ValueError(f"{la} is not a partition of {self.n}") + from sage.combinat.specht_module import simple_module_rank + return simple_module_rank(la, self.base_ring()) + def jucys_murphy(self, k): r""" Return the Jucys-Murphy element `J_k` (also known as a diff --git a/src/sage/combinat/tableau.py b/src/sage/combinat/tableau.py index cf44091d16d..f716c7cd117 100644 --- a/src/sage/combinat/tableau.py +++ b/src/sage/combinat/tableau.py @@ -2999,7 +2999,16 @@ def column_stabilizer(self): sage: PermutationGroupElement([(1,4)]) in cs True """ - return self.conjugate().row_stabilizer() + # Ensure that the permutations involve all elements of the + # tableau, by including the identity permutation on the set [1..k]. + k = self.size() + gens = [list(range(1, k + 1))] + ell = len(self) + while ell > 1: + ell -= 1 + for i, val in enumerate(self[ell]): + gens.append((val, self[ell-1][i])) + return PermutationGroup(gens) def height(self): """ diff --git a/src/sage/cpython/getattr.pyx b/src/sage/cpython/getattr.pyx index 3a06167ea99..e4982020879 100644 --- a/src/sage/cpython/getattr.pyx +++ b/src/sage/cpython/getattr.pyx @@ -4,7 +4,7 @@ Variants of getattr() from cpython.object cimport PyObject, PyTypeObject, Py_TYPE, descrgetfunc -from .string cimport bytes_to_str +from sage.cpython.string cimport bytes_to_str cdef extern from "Python.h": r""" diff --git a/src/sage/cpython/wrapperdescr.pyx b/src/sage/cpython/wrapperdescr.pyx index 108ca690b8d..5738a87af46 100644 --- a/src/sage/cpython/wrapperdescr.pyx +++ b/src/sage/cpython/wrapperdescr.pyx @@ -30,7 +30,7 @@ Pure Python classes have normal methods, not slot wrappers:: # https://www.gnu.org/licenses/ # **************************************************************************** -from .string import bytes_to_str +from sage.cpython.string import bytes_to_str def wrapperdescr_call(slotwrapper, self, *args, **kwds): diff --git a/src/sage/crypto/mq/sr.py b/src/sage/crypto/mq/sr.py index c4293c5a0e2..49b7d67374d 100644 --- a/src/sage/crypto/mq/sr.py +++ b/src/sage/crypto/mq/sr.py @@ -308,23 +308,21 @@ - [MR2002]_ """ -from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF -from sage.rings.integer_ring import ZZ -from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing, BooleanPolynomialRing_constructor as BooleanPolynomialRing - -from sage.structure.element import is_Matrix from sage.matrix.constructor import Matrix, random_matrix from sage.matrix.matrix_space import MatrixSpace - -from sage.misc.verbose import get_verbose from sage.misc.flatten import flatten - +from sage.misc.verbose import get_verbose from sage.modules.vector_modn_dense import Vector_modn_dense - +from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF +from sage.rings.integer_ring import ZZ from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence -from .mpolynomialsystemgenerator import MPolynomialSystemGenerator - +from sage.rings.polynomial.polynomial_ring_constructor import \ + BooleanPolynomialRing_constructor as BooleanPolynomialRing +from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.rings.polynomial.term_order import TermOrder +from sage.structure.element import is_Matrix + +from .mpolynomialsystemgenerator import MPolynomialSystemGenerator def SR(n=1, r=1, c=1, e=4, star=False, **kwargs): diff --git a/src/sage/features/symengine_py.py b/src/sage/features/symengine_py.py new file mode 100644 index 00000000000..d32492085b7 --- /dev/null +++ b/src/sage/features/symengine_py.py @@ -0,0 +1,43 @@ +r""" +Check for symengine_py +""" + +# **************************************************************************** +# Copyright (C) 2023 Dima Pasechnik +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# https://www.gnu.org/licenses/ +# **************************************************************************** + +from . import PythonModule +from .join_feature import JoinFeature + + +class symengine_py(JoinFeature): + r""" + A :class:`sage.features.Feature` describing the presence of the + Python package :ref:`symengine_py `. + + EXAMPLES:: + + sage: from sage.features.symengine_py import symengine_py + sage: symengine_py().is_present() # optional - symengine_py + FeatureTestResult('symengine_py', True) + """ + def __init__(self): + r""" + TESTS:: + + sage: from sage.features.symengine_py import symengine_py + sage: isinstance(symengine_py(), symengine_py) + True + """ + JoinFeature.__init__(self, 'symengine_py', + [PythonModule('symengine', spkg="symengine_py", + url="https://pypi.org/project/symengine")]) + +def all_features(): + return [symengine_py()] diff --git a/src/sage/geometry/lattice_polytope.py b/src/sage/geometry/lattice_polytope.py index 1cd9f578113..136cd370373 100644 --- a/src/sage/geometry/lattice_polytope.py +++ b/src/sage/geometry/lattice_polytope.py @@ -131,7 +131,6 @@ is_PointCollection, read_palp_point_collection) from sage.geometry.toric_lattice import ToricLattice, is_ToricLattice -from sage.graphs.graph import DiGraph, Graph from sage.groups.perm_gps.permgroup_named import SymmetricGroup from sage.misc.lazy_import import lazy_import @@ -2058,6 +2057,7 @@ def LPFace(vertices, facets): else: # Get face lattice as a sublattice of the ambient one allowed_indices = frozenset(self._ambient_vertex_indices) + from sage.graphs.digraph import DiGraph L = DiGraph() empty = self._ambient.face_lattice().bottom() L.add_vertex(0) # In case it is the only one @@ -3966,6 +3966,7 @@ def skeleton(self): sage: g.edges(sort=True) # needs palp sage.graphs [(0, 1, None), (0, 3, None), (1, 2, None), (2, 3, None)] """ + from sage.graphs.graph import Graph skeleton = Graph() skeleton.add_vertices(self.skeleton_points(1)) for edge in self.edges(): diff --git a/src/sage/graphs/base/static_sparse_graph.pxd b/src/sage/graphs/base/static_sparse_graph.pxd index b5cd2d73009..4a427f81237 100644 --- a/src/sage/graphs/base/static_sparse_graph.pxd +++ b/src/sage/graphs/base/static_sparse_graph.pxd @@ -14,7 +14,7 @@ cdef extern from "stdlib.h": size_t size, int(*compar)(const_void *, const_void *)) nogil ctypedef struct short_digraph_s: - uint32_t * edges + uint32_t * edges uint32_t ** neighbors PyObject * edge_labels int m diff --git a/src/sage/graphs/base/static_sparse_graph.pyx b/src/sage/graphs/base/static_sparse_graph.pyx index ddb30927931..35f3de67c98 100644 --- a/src/sage/graphs/base/static_sparse_graph.pyx +++ b/src/sage/graphs/base/static_sparse_graph.pyx @@ -784,10 +784,8 @@ cdef void strongly_connected_components_digraph_C(short_digraph g, int nscc, int cdef size_t s_nscc = nscc cdef vector[vector[int]] scc_list = vector[vector[int]](nscc, vector[int]()) cdef vector[vector[int]] sons = vector[vector[int]](nscc + 1, vector[int]()) - cdef vector[int].iterator iter cdef short *neighbors = mem.calloc(nscc, sizeof(short)) cdef long m = 0 - cdef uint32_t degv cdef uint32_t *p_tmp for v in range(s_nscc): diff --git a/src/sage/graphs/bliss.pyx b/src/sage/graphs/bliss.pyx index 40a576a99cb..eac56e21f0d 100644 --- a/src/sage/graphs/bliss.pyx +++ b/src/sage/graphs/bliss.pyx @@ -102,7 +102,6 @@ cdef void add_gen(void *user_param, unsigned int n, const unsigned int *aut) noe cdef int cur = 0 cdef list perm = [] cdef bint* done = check_calloc(n, sizeof(bint)) - cdef int i gens, int_to_vertex, N = user_param @@ -511,7 +510,6 @@ cpdef canonical_form(G, partition=None, return_graph=False, use_edge_labels=True cdef bint directed = G.is_directed() - cdef int labInd cdef list Vout = [] cdef list Vin = [] cdef list labels = [] @@ -581,7 +579,7 @@ cpdef canonical_form(G, partition=None, return_graph=False, use_edge_labels=True if return_graph: if directed: - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph H = DiGraph(new_edges, loops=G.allows_loops(), multiedges=G.allows_multiple_edges()) else: from sage.graphs.graph import Graph diff --git a/src/sage/graphs/centrality.pyx b/src/sage/graphs/centrality.pyx index 2fa2d4d303e..118edd5d7b0 100755 --- a/src/sage/graphs/centrality.pyx +++ b/src/sage/graphs/centrality.pyx @@ -696,7 +696,7 @@ def centrality_closeness_top_k(G, int k=1, int verbose=0): cdef int* reachU cdef int* pred = mem.calloc(n, sizeof(int)) cdef double *farness = mem.malloc(n * sizeof(double)) - cdef int d, nd, x, v, w + cdef int d, nd, x, v cdef long f, gamma cdef int* queue = mem.malloc(n * sizeof(int)) cdef double tildefL, tildefU diff --git a/src/sage/graphs/connectivity.pxd b/src/sage/graphs/connectivity.pxd index 329d2d29dad..5e49e66cc3a 100644 --- a/src/sage/graphs/connectivity.pxd +++ b/src/sage/graphs/connectivity.pxd @@ -36,7 +36,7 @@ cdef class TriconnectivitySPQR: cdef int* edge_extremity_first cdef int* edge_extremity_second cdef list int_to_original_edge_label - cdef int virtual_edge_num # number of created virtual edges + cdef int virtual_edge_num # number of created virtual edges cdef int* edge_status cdef bint* reverse_edges @@ -48,25 +48,25 @@ cdef class TriconnectivitySPQR: # Translates DFS number of a vertex to its new number cdef int* old_to_new - cdef int* newnum # new number of vertex i - cdef int* node_at # node at dfs number of i - cdef int* lowpt1 # lowpt1 number of vertex i - cdef int* lowpt2 # lowpt2 number of vertex i + cdef int* newnum # new number of vertex i + cdef int* node_at # node at dfs number of i + cdef int* lowpt1 # lowpt1 number of vertex i + cdef int* lowpt2 # lowpt2 number of vertex i cdef _LinkedList ** adj cdef _LinkedListNode ** in_adj cdef int* nd # Number of descendants of vertex i cdef int* parent # Parent vertex of vertex i in the palm tree - cdef int* degree # Degree of vertex i - cdef int* tree_arc # Tree arc entering the vertex i - cdef int* vertex_at # vertex with DFS number of i + cdef int* degree # Degree of vertex i + cdef int* tree_arc # Tree arc entering the vertex i + cdef int* vertex_at # vertex with DFS number of i cdef int dfs_counter - cdef list components_list # list of components of `graph_copy` - cdef list graph_copy_adjacency # Stores adjacency list + cdef list components_list # list of components of `graph_copy` + cdef list graph_copy_adjacency # Stores adjacency list - cdef bint* starts_path # Does edge e_index start a path - cdef int start_vertex # First vertex of exploration + cdef bint* starts_path # Does edge e_index start a path + cdef int start_vertex # First vertex of exploration # Stacks used in `path_search` function cdef list e_stack @@ -75,10 +75,10 @@ cdef class TriconnectivitySPQR: cdef int* t_stack_b cdef int t_stack_top - cdef list comp_final_edge_list # entry i is list of edges in component i - cdef list comp_type # entry i is type of component i - cdef dict final_edge_to_edge_index # associate final edge e to its index in int_to_edge - cdef GenericGraph_pyx spqr_tree # The final SPQR tree is stored + cdef list comp_final_edge_list # entry i is list of edges in component i + cdef list comp_type # entry i is type of component i + cdef dict final_edge_to_edge_index # associate final edge e to its index in int_to_edge + cdef GenericGraph_pyx spqr_tree # The final SPQR tree is stored # Arrays used in different methods. Allocated only once cdef int* tmp_array_n_int_1 @@ -86,7 +86,7 @@ cdef class TriconnectivitySPQR: cdef int* tmp_array_n_int_3 cdef bint* tmp_array_n_bint_1 - ### Methods ### + # === Methods === cdef inline __tstack_push(self, int h, int a, int b) noexcept: """ @@ -142,7 +142,6 @@ cdef class TriconnectivitySPQR: return self.edge_extremity_second[e_index] return self.edge_extremity_first[e_index] - cdef int __new_virtual_edge(self, int u, int v) noexcept cdef _LinkedListNode * __new_LinkedListNode(self, Py_ssize_t e_index) noexcept cdef Py_ssize_t __high(self, Py_ssize_t v) noexcept @@ -155,4 +154,3 @@ cdef class TriconnectivitySPQR: cdef int __path_search(self, int start) except -1 cdef __assemble_triconnected_components(self) noexcept cdef __build_spqr_tree(self) noexcept - diff --git a/src/sage/graphs/connectivity.pyx b/src/sage/graphs/connectivity.pyx index 8880d1f2b75..5c8166bd540 100644 --- a/src/sage/graphs/connectivity.pyx +++ b/src/sage/graphs/connectivity.pyx @@ -71,6 +71,7 @@ Methods from sage.misc.superseded import deprecation + def is_connected(G): """ Check whether the (di)graph is connected. @@ -2041,7 +2042,7 @@ def bridges(G, labels=True): if G.order() < 2 or not is_connected(G): return - B, C = G.blocks_and_cut_vertices() + B, _ = G.blocks_and_cut_vertices() # A block of size 2 is a bridge, unless the vertices are connected with # multiple edges. @@ -2209,8 +2210,9 @@ def cleave(G, cut_vertices=None, virtual_edges=True, solver=None, verbose=0, # If a vertex cut is given, we check that it is valid. Otherwise, we compute # a small vertex cut if cut_vertices is None: - cut_size, cut_vertices = G.vertex_connectivity(value_only=False, solver=solver, verbose=verbose, - integrality_tolerance=integrality_tolerance) + _, cut_vertices = G.vertex_connectivity(value_only=False, + solver=solver, verbose=verbose, + integrality_tolerance=integrality_tolerance) if not cut_vertices: # Typical example is a clique raise ValueError("the input graph has no vertex cut") @@ -2218,7 +2220,7 @@ def cleave(G, cut_vertices=None, virtual_edges=True, solver=None, verbose=0, cut_vertices = list(cut_vertices) for u in cut_vertices: if u not in G: - raise ValueError("vertex {} is not a vertex of the input graph".format(u)) + raise ValueError(f"vertex {u} is not a vertex of the input graph") H = G.copy(immutable=False) H.delete_vertices(cut_vertices) diff --git a/src/sage/graphs/digraph.py b/src/sage/graphs/digraph.py index c57224eba22..8ba57d90b3c 100644 --- a/src/sage/graphs/digraph.py +++ b/src/sage/graphs/digraph.py @@ -444,9 +444,9 @@ class DiGraph(GenericGraph): #. An igraph directed Graph (see also :meth:`~sage.graphs.generic_graph.GenericGraph.igraph_graph`):: - sage: import igraph # optional - python_igraph - sage: g = igraph.Graph([(0,1),(0,2)], directed=True) # optional - python_igraph - sage: DiGraph(g) # optional - python_igraph + sage: import igraph # optional - python_igraph + sage: g = igraph.Graph([(0,1),(0,2)], directed=True) # optional - python_igraph + sage: DiGraph(g) # optional - python_igraph Digraph on 3 vertices If ``vertex_labels`` is ``True``, the names of the vertices are given by @@ -462,8 +462,9 @@ class DiGraph(GenericGraph): If the igraph Graph has edge attributes, they are used as edge labels:: - sage: g = igraph.Graph([(0,1),(0,2)], directed=True, edge_attrs={'name':['a','b'], 'weight':[1,3]}) # optional - python_igraph - sage: DiGraph(g).edges(sort=True) # optional - python_igraph + sage: g = igraph.Graph([(0, 1), (0, 2)], directed=True, # optional - python_igraph + ....: edge_attrs={'name':['a', 'b'], 'weight':[1, 3]}) + sage: DiGraph(g).edges(sort=True) # optional - python_igraph [(0, 1, {'name': 'a', 'weight': 1}), (0, 2, {'name': 'b', 'weight': 3})] @@ -621,8 +622,8 @@ def __init__(self, data=None, pos=None, loops=None, format=None, Sage DiGraph from igraph undirected graph:: - sage: import igraph # optional - python_igraph - sage: DiGraph(igraph.Graph()) # optional - python_igraph + sage: import igraph # optional - python_igraph + sage: DiGraph(igraph.Graph()) # optional - python_igraph Traceback (most recent call last): ... ValueError: a *directed* igraph graph was expected. To build an undirected graph, call the Graph constructor diff --git a/src/sage/graphs/distances_all_pairs.pyx b/src/sage/graphs/distances_all_pairs.pyx index a61fd4168a4..ec24fd5378f 100644 --- a/src/sage/graphs/distances_all_pairs.pyx +++ b/src/sage/graphs/distances_all_pairs.pyx @@ -192,8 +192,6 @@ cdef inline c_all_pairs_shortest_path_BFS(short_digraph sd, # This data structure is well documented in the module # sage.graphs.base.static_sparse_graph cdef uint32_t** p_vertices = sd.neighbors - cdef uint32_t* p_edges = sd.edges - cdef uint32_t* p_next = p_edges # We run n different BFS taking each vertex as a source for source in range(n): @@ -549,7 +547,7 @@ def is_distance_regular(G, parameters=False): ([3, 2, 2, 2, 2, 2, None], [None, 1, 1, 1, 1, 1, 3]) """ - cdef int i, l, u, v, d, b, c, k + cdef int i, u, v, d, b, c, k cdef int n = G.order() cdef int infinity = -1 @@ -776,7 +774,7 @@ cdef uint32_t * c_eccentricity_bounding(short_digraph sd) except NULL: cdef bitset_t seen bitset_init(seen, n) - cdef uint32_t v, w, next_v, tmp, cpt = 0 + cdef uint32_t v, w, next_v, cpt = 0 # The first vertex is the one with largest degree next_v = max((out_degree(sd, v), v) for v in range(n))[1] @@ -1122,9 +1120,8 @@ cdef uint32_t diameter_lower_bound_2sweep(short_digraph g, - ``seen`` -- bitset of size ``n`` that must be initialized before calling this method (i.e., bitset_init(seen, n)). However, there is no need to clear it. - """ - cdef uint32_t LB, i, k, tmp + cdef uint32_t LB # We do a first BFS from source and get the eccentricity of source LB = simple_BFS(g, source, distances, NULL, waiting_list, seen) @@ -1354,11 +1351,11 @@ cdef uint32_t diameter_iFUB(short_digraph g, - ``source`` -- starting node of the first BFS """ - cdef uint32_t i, LB, s, m, d + cdef uint32_t i, LB, m cdef uint32_t n = g.n # We select a vertex m with low eccentricity using multi-sweep - LB, s, m, d = diameter_lower_bound_multi_sweep(g, source) + LB, _, m, _ = diameter_lower_bound_multi_sweep(g, source) # If the lower bound is a very large number, it means that the graph is not # connected and so the diameter is infinite. @@ -1457,12 +1454,12 @@ cdef uint32_t diameter_DiFUB(short_digraph sd, cdef short_digraph rev_sd # Copy of sd with edges reversed init_reverse(rev_sd, sd) - cdef uint32_t LB, s, m, d, LB_1, LB_2, UB + cdef uint32_t LB, m, LB_1, LB_2, UB cdef size_t i cdef bitset_t seen # We select a vertex with low eccentricity using 2Dsweep - LB, s, m, d = diameter_lower_bound_2Dsweep(sd, rev_sd, source) + LB, _, m, _ = diameter_lower_bound_2Dsweep(sd, rev_sd, source) # If the lower bound is a very large number, it means that the digraph is # not strongly connected and so the diameter is infinite. @@ -2725,15 +2722,15 @@ def floyd_warshall(gg, paths=True, distances=False): cdef unsigned int n = max(gverts) + 1 if n >= -1: - raise ValueError("the graph backend contains more than "+str( -1)+" nodes") + raise ValueError("the graph backend contains more than " + str( -1) + " nodes") # All this just creates two tables prec[n][n] and dist[n][n] cdef MemoryAllocator mem = MemoryAllocator() cdef unsigned short* t_prec = NULL - cdef unsigned short** prec = NULL + cdef unsigned short** prec = NULL # init dist - cdef unsigned short* t_dist = mem.allocarray(n * n, sizeof(unsigned short)) - cdef unsigned short** dist = mem.allocarray(n, sizeof(unsigned short*)) + cdef unsigned short* t_dist = mem.allocarray(n * n, sizeof(unsigned short)) + cdef unsigned short** dist = mem.allocarray(n, sizeof(unsigned short*)) dist[0] = t_dist cdef unsigned int i for i in range(1, n): diff --git a/src/sage/graphs/dot2tex_utils.py b/src/sage/graphs/dot2tex_utils.py index ce2cd873c8b..f8eb55485ac 100644 --- a/src/sage/graphs/dot2tex_utils.py +++ b/src/sage/graphs/dot2tex_utils.py @@ -21,7 +21,7 @@ def have_dot2tex(): EXAMPLES:: - sage: sage.graphs.dot2tex_utils.have_dot2tex() # optional - dot2tex graphviz + sage: sage.graphs.dot2tex_utils.have_dot2tex() # optional - dot2tex graphviz True sage: sage.graphs.dot2tex_utils.have_dot2tex() in [True, False] True @@ -41,7 +41,7 @@ def assert_have_dot2tex(): EXAMPLES:: - sage: sage.graphs.dot2tex_utils.assert_have_dot2tex() # optional - dot2tex graphviz + sage: sage.graphs.dot2tex_utils.assert_have_dot2tex() # optional - dot2tex graphviz """ check_error_string = """ An error occurs while testing the dot2tex installation. diff --git a/src/sage/graphs/edge_connectivity.pyx b/src/sage/graphs/edge_connectivity.pyx index 72416b560b6..22163fc9c77 100644 --- a/src/sage/graphs/edge_connectivity.pyx +++ b/src/sage/graphs/edge_connectivity.pyx @@ -984,9 +984,6 @@ cdef class GabowEdgeConnectivity: sage: GabowEdgeConnectivity(D).edge_connectivity() 4 """ - # Target x and source y of joining edge e_id - cdef int x = self.my_to[e_id] - cdef int y = self.my_from[e_id] # Previous state (tree Ti or unused) of an edge cdef int previous_state = self.FIRSTEDGE diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py index 7bbd96fd9be..0f0f995bfbd 100644 --- a/src/sage/graphs/generic_graph.py +++ b/src/sage/graphs/generic_graph.py @@ -1622,8 +1622,8 @@ def igraph_graph(self, vertex_list=None, vertex_attrs={}, edge_attrs={}): sage: G = Graph([(1, 2, 'a'), (2, 3, 'b')]) sage: E = list(G.edge_iterator()) - sage: H = G.igraph_graph(edge_attrs={'label': [e[2] for e in E]}) # optional - python_igraph - sage: H.es['label'] # optional - python_igraph + sage: H = G.igraph_graph(edge_attrs={'label': [e[2] for e in E]}) # optional - python_igraph + sage: H.es['label'] # optional - python_igraph ['a', 'b'] @@ -1632,84 +1632,86 @@ def igraph_graph(self, vertex_list=None, vertex_attrs={}, edge_attrs={}): sage: G = Graph([(1, 2, {'weight': 1}), (2, 3, {'weight': 2})]) sage: E = list(G.edge_iterator()) - sage: H = G.igraph_graph(edge_attrs={'weight': [e[2]['weight'] for e in E]}) # optional - python_igraph - sage: H.is_weighted() # optional - python_igraph + sage: H = G.igraph_graph(edge_attrs={'weight': [e[2]['weight'] for e in E]}) # optional - python_igraph + sage: H.is_weighted() # optional - python_igraph True - sage: H.es['weight'] # optional - python_igraph + sage: H.es['weight'] # optional - python_igraph [1, 2] Adding vertex attributes:: sage: G = graphs.GridGraph([2, 2]) - sage: H = G.igraph_graph(vertex_attrs={'name': G.vertices(sort=True)}) # optional - python_igraph - sage: H.vs()['name'] # optional - python_igraph + sage: H = G.igraph_graph(vertex_attrs={'name': G.vertices(sort=True)}) # optional - python_igraph + sage: H.vs()['name'] # optional - python_igraph [(0, 0), (0, 1), (1, 0), (1, 1)] Providing a mapping from vertices to consecutive integers:: sage: G = graphs.GridGraph([2, 2]) sage: V = list(G) - sage: H = G.igraph_graph(vertex_list=V, vertex_attrs={'name': V}) # optional - python_igraph - sage: H.vs()['name'] == V # optional - python_igraph + sage: H = G.igraph_graph(vertex_list=V, vertex_attrs={'name': V}) # optional - python_igraph + sage: H.vs()['name'] == V # optional - python_igraph True Sometimes, Sage integer/floats are not compatible with igraph:: sage: G = Graph([(0, 1, 2)]) sage: E = list(G.edge_iterator()) - sage: H = G.igraph_graph(edge_attrs={'capacity': [e[2] for e in E]}) # optional - python_igraph - sage: H.maxflow_value(0, 1, 'capacity') # optional - python_igraph + sage: H = G.igraph_graph(edge_attrs={'capacity': [e[2] for e in E]}) # optional - python_igraph + sage: H.maxflow_value(0, 1, 'capacity') # optional - python_igraph 1.0 - sage: H = G.igraph_graph(edge_attrs={'capacity': [float(e[2]) for e in E]}) # optional - python_igraph - sage: H.maxflow_value(0, 1, 'capacity') # optional - python_igraph + sage: H = G.igraph_graph(edge_attrs={'capacity': [float(e[2]) for e in E]}) # optional - python_igraph + sage: H.maxflow_value(0, 1, 'capacity') # optional - python_igraph 2.0 TESTS: Converting a DiGraph back and forth:: + sage: # optional - python_igraph sage: G = DiGraph([('a', 'b', {'w': 1}), ('b', 'c', {'w': 2})]) sage: vertex_attrs = {'name': G.vertices(sort=False)} sage: E = list(G.edge_iterator()) sage: edge_attrs = {'w': [e[2]['w'] for e in E]} - sage: H = DiGraph(G.igraph_graph(vertex_attrs=vertex_attrs, edge_attrs=edge_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = DiGraph(G.igraph_graph(vertex_attrs=vertex_attrs, edge_attrs=edge_attrs)) + sage: G == H True - sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph + sage: G.edges(sort=True) == H.edges(sort=True) True - sage: H = DiGraph(G.igraph_graph(edge_attrs=edge_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = DiGraph(G.igraph_graph(edge_attrs=edge_attrs)) + sage: G == H False When checking for equality, edge labels are not taken into account:: - sage: H = DiGraph(G.igraph_graph(vertex_attrs=vertex_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = DiGraph(G.igraph_graph(vertex_attrs=vertex_attrs)) # optional - python_igraph + sage: G == H # optional - python_igraph True - sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph + sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph False Converting a Graph back and forth:: + sage: # optional - python_igraph sage: G = Graph([('a', 'b', {'w': 1}), ('b', 'c', {'w': 2})]) sage: vertex_attrs = {'name': G.vertices(sort=False)} sage: E = list(G.edge_iterator()) sage: edge_attrs = {'w': [e[2]['w'] for e in E]} - sage: H = Graph(G.igraph_graph(vertex_attrs=vertex_attrs, edge_attrs=edge_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = Graph(G.igraph_graph(vertex_attrs=vertex_attrs, edge_attrs=edge_attrs)) + sage: G == H True - sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph + sage: G.edges(sort=True) == H.edges(sort=True) True - sage: H = Graph(G.igraph_graph(edge_attrs=edge_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = Graph(G.igraph_graph(edge_attrs=edge_attrs)) + sage: G == H False When checking for equality, edge labels are not taken into account:: - sage: H = Graph(G.igraph_graph(vertex_attrs=vertex_attrs)) # optional - python_igraph - sage: G == H # optional - python_igraph + sage: H = Graph(G.igraph_graph(vertex_attrs=vertex_attrs)) # optional - python_igraph + sage: G == H # optional - python_igraph True - sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph + sage: G.edges(sort=True) == H.edges(sort=True) # optional - python_igraph False Check input parameter ``vertex_list``:: @@ -7331,7 +7333,7 @@ def edge_cut(self, s, t, value_only=True, use_edge_labels=False, vertices=False, ....: g.set_edge_label(u,v,round(random(),5)) sage: g.edge_cut(0, 1, algorithm="FF") == g.edge_cut(0, 1, algorithm="LP") # needs sage.numerical.mip True - sage: g.edge_cut(0, 1, algorithm="FF") == g.edge_cut(0, 1, algorithm="igraph") # optional - python_igraph + sage: g.edge_cut(0, 1, algorithm="FF") == g.edge_cut(0, 1, algorithm="igraph") # optional - python_igraph True Rounded return value when using the LP method:: @@ -9583,8 +9585,8 @@ def flow(self, x, y, value_only=True, integer=False, use_edge_labels=True, sage: flow_lp = g.flow(0, 1, algorithm="LP") # needs sage.numerical.mip sage: abs(flow_ff - flow_lp) < 0.01 # needs sage.numerical.mip True - sage: flow_igraph = g.flow(0, 1, algorithm="igraph") # optional python_igraph - sage: abs(flow_ff - flow_igraph) < 0.00001 # optional python_igraph + sage: flow_igraph = g.flow(0, 1, algorithm="igraph") # optional - python_igraph + sage: abs(flow_ff - flow_igraph) < 0.00001 # optional - python_igraph True """ self._scream_if_not_simple(allow_loops=True) @@ -23268,7 +23270,7 @@ def automorphism_group(self, partition=None, verbosity=0, sage: G.automorphism_group(edge_labels=True) # needs sage.groups Permutation Group with generators [(1,4)(2,3)] - sage: G.automorphism_group(edge_labels=True, algorithm="bliss") # optional - bliss + sage: G.automorphism_group(edge_labels=True, algorithm="bliss") # optional - bliss Permutation Group with generators [(1,4)(2,3)] sage: G.automorphism_group(edge_labels=True, algorithm="sage") # needs sage.groups diff --git a/src/sage/graphs/generic_graph_pyx.pyx b/src/sage/graphs/generic_graph_pyx.pyx index 613d6c1c4ef..d27b3b65047 100644 --- a/src/sage/graphs/generic_graph_pyx.pyx +++ b/src/sage/graphs/generic_graph_pyx.pyx @@ -612,6 +612,7 @@ def binary_string_from_dig6(s, n): m = "".join(l) return m[:n*n] + # Exhaustive search in graphs cdef class SubgraphSearch: @@ -831,16 +832,16 @@ cdef class SubgraphSearch: # whether both are of the same type) self.directed = G.is_directed() - cdef int i, j, k + cdef int i, j # A vertex is said to be busy if it is already part of the partial copy # of H in G. - self.busy = self.mem.allocarray(self.ng, sizeof(int)) - self.tmp_array = self.mem.allocarray(self.ng, sizeof(int)) - self.stack = self.mem.allocarray(self.nh, sizeof(int)) - self.vertices = self.mem.allocarray(self.nh, sizeof(int)) + self.busy = self.mem.allocarray(self.ng, sizeof(int)) + self.tmp_array = self.mem.allocarray(self.ng, sizeof(int)) + self.stack = self.mem.allocarray(self.nh, sizeof(int)) + self.vertices = self.mem.allocarray(self.nh, sizeof(int)) self.line_h_out = self.mem.allocarray(self.nh, sizeof(int *)) - self.line_h_in = self.mem.allocarray(self.nh, sizeof(int *)) if self.directed else NULL + self.line_h_in = self.mem.allocarray(self.nh, sizeof(int *)) if self.directed else NULL self.line_h_out[0] = self.mem.allocarray(self.nh*self.nh, sizeof(int)) @@ -1030,6 +1031,7 @@ cdef inline bint vectors_inferior(int n, int *a, int *b) noexcept: return False return True + ############################## # Further tests. Unit tests for methods, functions, classes defined with cdef. ############################## diff --git a/src/sage/graphs/genus.pyx b/src/sage/graphs/genus.pyx index 4370f3135af..441fae754d6 100644 --- a/src/sage/graphs/genus.pyx +++ b/src/sage/graphs/genus.pyx @@ -143,7 +143,7 @@ cdef class simple_connected_genus_backtracker: cdef int *w = self.mem.malloc((self.num_verts + self.num_darts) * sizeof(int)) cdef int *s = self.mem.malloc(2 * (self.num_darts - self.num_verts) * sizeof(int)) - cdef int i, j, du, dv, u, v + cdef int i, j, dv, u, v for v in range(self.num_verts): if not G.has_vertex(v): @@ -341,7 +341,6 @@ cdef class simple_connected_genus_backtracker: before the flip, the cycle breaks into three. Otherwise, the number of cycles stays the same. """ - cdef int cycles = 0 cdef int *w = self.vertex_darts[v] cdef int *face_map = self.face_map @@ -393,7 +392,7 @@ cdef class simple_connected_genus_backtracker: """ Count all cycles. """ - cdef int i, j, c, m + cdef int i self.num_cycles = 0 for i in range(self.num_darts): @@ -447,7 +446,7 @@ cdef class simple_connected_genus_backtracker: sage: gb.genus() 0 """ - cdef int g, i + cdef int g # in the original genus implementation, this case resulted in infinite # recursion. oops. Let's skip that. diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py index b3c845af376..8988765d767 100644 --- a/src/sage/graphs/graph.py +++ b/src/sage/graphs/graph.py @@ -213,9 +213,9 @@ - an igraph Graph:: - sage: import igraph # optional - python_igraph - sage: g = Graph(igraph.Graph([(1,3),(3,2),(0,2)])) # optional - python_igraph - sage: g # optional - python_igraph + sage: import igraph # optional - python_igraph + sage: g = Graph(igraph.Graph([(1,3),(3,2),(0,2)])) # optional - python_igraph + sage: g # optional - python_igraph Graph on 4 vertices Generators @@ -421,7 +421,6 @@ from sage.rings.integer_ring import ZZ import sage.graphs.generic_graph_pyx as generic_graph_pyx from sage.graphs.generic_graph import GenericGraph -from sage.graphs.digraph import DiGraph from sage.graphs.independent_sets import IndependentSets from sage.misc.rest_index_of_methods import doc_index, gen_thematic_rest_table_index from sage.graphs.views import EdgesView @@ -820,9 +819,9 @@ class Graph(GenericGraph): #. An igraph Graph (see also :meth:`~sage.graphs.generic_graph.GenericGraph.igraph_graph`):: - sage: import igraph # optional - python_igraph - sage: g = igraph.Graph([(0, 1), (0, 2)]) # optional - python_igraph - sage: Graph(g) # optional - python_igraph + sage: import igraph # optional - python_igraph + sage: g = igraph.Graph([(0, 1), (0, 2)]) # optional - python_igraph + sage: Graph(g) # optional - python_igraph Graph on 3 vertices If ``vertex_labels`` is ``True``, the names of the vertices are given by @@ -838,8 +837,8 @@ class Graph(GenericGraph): If the igraph Graph has edge attributes, they are used as edge labels:: - sage: g = igraph.Graph([(0,1),(0,2)], edge_attrs={'name':['a','b'], 'weight':[1,3]}) # optional - python_igraph - sage: Graph(g).edges(sort=True) # optional - python_igraph + sage: g = igraph.Graph([(0,1),(0,2)], edge_attrs={'name':['a','b'], 'weight':[1,3]}) # optional - python_igraph + sage: Graph(g).edges(sort=True) # optional - python_igraph [(0, 1, {'name': 'a', 'weight': 1}), (0, 2, {'name': 'b', 'weight': 3})] @@ -883,7 +882,7 @@ class Graph(GenericGraph): ... ValueError: Unknown input format 'HeyHeyHey' - sage: Graph(igraph.Graph(directed=True)) # optional - python_igraph + sage: Graph(igraph.Graph(directed=True)) # optional - python_igraph Traceback (most recent call last): ... ValueError: An *undirected* igraph graph was expected. To build an directed graph, call the DiGraph constructor. @@ -3514,6 +3513,7 @@ def orientations(self, data_structure=None, sparse=None): if name: name = 'An orientation of ' + name + from sage.graphs.digraph import DiGraph if not self.size(): D = DiGraph(data=[self.vertices(sort=False), []], format='vertices_and_edges', @@ -7175,7 +7175,7 @@ def vertex_cover(self, algorithm="Cliquer", value_only=False, Testing mcqd:: - sage: graphs.PetersenGraph().vertex_cover(algorithm="mcqd", value_only=True) # optional - mcqd + sage: graphs.PetersenGraph().vertex_cover(algorithm="mcqd", value_only=True) # optional - mcqd 6 Given a wrong algorithm:: diff --git a/src/sage/graphs/graph_coloring.pyx b/src/sage/graphs/graph_coloring.pyx index 327435969fe..f5025a641ac 100644 --- a/src/sage/graphs/graph_coloring.pyx +++ b/src/sage/graphs/graph_coloring.pyx @@ -1437,7 +1437,6 @@ def edge_coloring(g, value_only=False, vizing=False, hex_colors=False, solver=No cdef list L = [g] if g.is_connected() else g.connected_components_subgraphs() cdef int chi = 0 cdef list classes = [], vertices - cdef list values if vizing: classes = _vizing_edge_coloring(g) @@ -1684,13 +1683,14 @@ def _vizing_edge_coloring(g): rotate_fan(fan_center, fan) e_colors[frozenset((fan_center, fan[-1]))] = d - matchings = dict() + matchings = {} for edge, c in e_colors.items(): matchings[c] = matchings.get(c, []) + [tuple(edge)] classes = list(matchings.values()) return classes + def round_robin(n): r""" Compute a round-robin coloring of the complete graph on `n` vertices. diff --git a/src/sage/graphs/graph_decompositions/tree_decomposition.pyx b/src/sage/graphs/graph_decompositions/tree_decomposition.pyx index f1ebec67af7..5bdf2d0dd00 100644 --- a/src/sage/graphs/graph_decompositions/tree_decomposition.pyx +++ b/src/sage/graphs/graph_decompositions/tree_decomposition.pyx @@ -29,7 +29,7 @@ treewidth of a tree equal to one. The *length* of a tree decomposition, as proposed in [DG2006]_, is the maximum *diameter* in `G` of its bags, where the diameter of a bag `X_i` is the largest distance in `G` between the vertices in `X_i` (i.e., `\max_{u, v \in X_i} -dist_G(u, v)`). The *treelength* `tl(G)` of a graph `G` is the minimum length +\dist_G(u, v)`). The *treelength* `tl(G)` of a graph `G` is the minimum length among all possible tree decompositions of `G`. While deciding whether a graph has treelength 1 can be done in linear time @@ -80,6 +80,7 @@ The treewidth of a clique is `n-1` and its treelength is 1:: :meth:`is_valid_tree_decomposition` | Check whether `T` is a valid tree-decomposition for `G`. :meth:`reduced_tree_decomposition` | Return a reduced tree-decomposition of `T`. :meth:`width_of_tree_decomposition` | Return the width of the tree decomposition `T` of `G`. + :meth:`length_of_tree_decomposition` | Return the length of the tree decomposition `T` of `G`. .. TODO: @@ -1086,6 +1087,116 @@ def label_nice_tree_decomposition(nice_TD, root): # Treelength # +def length_of_tree_decomposition(G, T, check=True): + r""" + Return the length of the tree decomposition `T` of `G`. + + The *length* of a tree decomposition, as proposed in [DG2006]_, is the + maximum *diameter* in `G` of its bags, where the diameter of a bag `X_i` is + the largest distance in `G` between the vertices in `X_i` (i.e., `\max_{u, v + \in X_i} \dist_G(u, v)`). See the documentation of the + :mod:`~sage.graphs.graph_decompositions.tree_decomposition` module for more + details. + + INPUT: + + - ``G`` -- a graph + + - ``T`` -- a tree-decomposition for `G` + + - ``check`` -- boolean (default: ``True``); whether to check that the + tree-decomposition `T` is valid for `G` + + EXAMPLES: + + Trees and cliques have treelength 1:: + + sage: from sage.graphs.graph_decompositions.tree_decomposition import length_of_tree_decomposition + sage: G = graphs.CompleteGraph(5) + sage: tl, T = G.treelength(certificate=True) + sage: tl + 1 + sage: length_of_tree_decomposition(G, T, check=True) + 1 + sage: G = graphs.RandomTree(20) + sage: tl, T = G.treelength(certificate=True) + sage: tl + 1 + sage: length_of_tree_decomposition(G, T, check=True) + 1 + + The Petersen graph has treelength 2:: + + sage: G = graphs.PetersenGraph() + sage: tl, T = G.treelength(certificate=True) + sage: tl + 2 + sage: length_of_tree_decomposition(G, T) + 2 + + When a tree-decomposition has a single bag containing all vertices of a + graph, the length of this tree-decomposition is the diameter of the graph:: + + sage: G = graphs.Grid2dGraph(2, 5) + sage: G.treelength() + 2 + sage: G.diameter() + 5 + sage: T = Graph({Set(G): []}) + sage: length_of_tree_decomposition(G, T) + 5 + + TESTS:: + + sage: G = Graph() + sage: _, T = G.treelength(certificate=True) + sage: length_of_tree_decomposition(G, T, check=True) + 0 + sage: length_of_tree_decomposition(Graph(1), T, check=True) + Traceback (most recent call last): + ... + ValueError: the tree-decomposition is not valid for this graph + """ + if check and not is_valid_tree_decomposition(G, T): + raise ValueError("the tree-decomposition is not valid for this graph") + + cdef unsigned int n = G.order() + + if n < 2: + return 0 + if any(len(bag) == n for bag in T): + return G.diameter() + + cdef unsigned int i, j + + # We map vertices to integers in range 0..n-1 + cdef list int_to_vertex = list(G) + cdef dict vertex_to_int = {u: i for i, u in enumerate(int_to_vertex)} + + # We compute the distance matrix. + cdef unsigned short * c_distances = c_distances_all_pairs(G, vertex_list=int_to_vertex) + cdef unsigned short ** distances = sig_calloc(n, sizeof(unsigned short *)) + for i in range(n): + distances[i] = c_distances + i * n + + # We now compute the maximum lengths of the bags + from itertools import combinations + cdef list bag_int + cdef unsigned short dij + cdef unsigned short length = 0 + for bag in T: + bag_int = [vertex_to_int[u] for u in bag] + for i, j in combinations(bag_int, 2): + dij = distances[i][j] + if dij > length: + length = dij + + sig_free(c_distances) + sig_free(distances) + + return length + + def treelength_lowerbound(G): r""" Return a lower bound on the treelength of `G`. @@ -1583,7 +1694,7 @@ def treelength(G, k=None, certificate=False): The *length* of a tree decomposition, as proposed in [DG2006]_, is the maximum *diameter* in `G` of its bags, where the diameter of a bag `X_i` is the largest distance in `G` between the vertices in `X_i` (i.e., `\max_{u, v - \in X_i} dist_G(u, v)`). The *treelength* `tl(G)` of a graph `G` is the + \in X_i} \dist_G(u, v)`). The *treelength* `tl(G)` of a graph `G` is the minimum length among all possible tree decompositions of `G`. See the documentation of the :mod:`~sage.graphs.graph_decompositions.tree_decomposition` module for more diff --git a/src/sage/graphs/graph_decompositions/vertex_separation.pyx b/src/sage/graphs/graph_decompositions/vertex_separation.pyx index 548229f303b..eaec31b5c96 100644 --- a/src/sage/graphs/graph_decompositions/vertex_separation.pyx +++ b/src/sage/graphs/graph_decompositions/vertex_separation.pyx @@ -332,7 +332,6 @@ def lower_bound(G): raise ValueError("the (di)graph can have at most 31 vertices") cdef FastDigraph FD = FastDigraph(G) - cdef int * g = FD.graph cdef unsigned int n = FD.n # minimums[i] is means to store the value of c'_{i+1} diff --git a/src/sage/graphs/graph_generators.py b/src/sage/graphs/graph_generators.py index 485316db4e3..0677028e451 100644 --- a/src/sage/graphs/graph_generators.py +++ b/src/sage/graphs/graph_generators.py @@ -1450,17 +1450,17 @@ def fullerenes(self, order, ipr=False): There are 1812 isomers of `\textrm{C}_{60}`, i.e., 1812 fullerene graphs on 60 vertices:: - sage: gen = graphs.fullerenes(60) # optional buckygen - sage: len(list(gen)) # optional buckygen + sage: gen = graphs.fullerenes(60) # optional - buckygen + sage: len(list(gen)) # optional - buckygen 1812 However, there is only one IPR fullerene graph on 60 vertices: the famous Buckminster Fullerene:: - sage: gen = graphs.fullerenes(60, ipr=True) # optional buckygen - sage: next(gen) # optional buckygen + sage: gen = graphs.fullerenes(60, ipr=True) # optional - buckygen + sage: next(gen) # optional - buckygen Graph on 60 vertices - sage: next(gen) # optional buckygen + sage: next(gen) # optional - buckygen Traceback (most recent call last): ... StopIteration @@ -1557,26 +1557,26 @@ def fusenes(self, hexagon_count, benzenoids=False): There is a unique fusene with 2 hexagons:: - sage: gen = graphs.fusenes(2) # optional benzene - sage: len(list(gen)) # optional benzene + sage: gen = graphs.fusenes(2) # optional - benzene + sage: len(list(gen)) # optional - benzene 1 This fusene is naphthalene (`\textrm{C}_{10}\textrm{H}_{8}`). In the fusene graph the H-atoms are not stored, so this is a graph on just 10 vertices:: - sage: gen = graphs.fusenes(2) # optional benzene - sage: next(gen) # optional benzene + sage: gen = graphs.fusenes(2) # optional - benzene + sage: next(gen) # optional - benzene Graph on 10 vertices - sage: next(gen) # optional benzene + sage: next(gen) # optional - benzene Traceback (most recent call last): ... StopIteration There are 6505 benzenoids with 9 hexagons:: - sage: gen = graphs.fusenes(9, benzenoids=True) # optional benzene - sage: len(list(gen)) # optional benzene + sage: gen = graphs.fusenes(9, benzenoids=True) # optional - benzene + sage: len(list(gen)) # optional - benzene 6505 """ if hexagon_count < 0: @@ -1760,7 +1760,7 @@ def plantri_gen(self, options=""): An overview of the number of quadrangulations on up to 12 vertices. This agrees with :oeis:`A113201`:: - sage: for i in range(4, 13): # optional plantri + sage: for i in range(4, 13): # optional - plantri ....: cmd = '-qm2c2 {}'.format(i) ....: L = len(list(graphs.plantri_gen(cmd))) ....: print("{:2d} {:3d}".format(i, L)) @@ -1778,9 +1778,9 @@ def plantri_gen(self, options=""): Wrong input, ``"-c=3"`` instead of ``"-c3"``:: - sage: list(graphs.plantri_gen("6 -c3")) # optional plantri + sage: list(graphs.plantri_gen("6 -c3")) # optional - plantri [Graph on 6 vertices, Graph on 6 vertices] - sage: list(graphs.plantri_gen("6 -c=3")) # optional plantri + sage: list(graphs.plantri_gen("6 -c=3")) # optional - plantri Traceback (most recent call last): ... AttributeError: invalid options '6 -c=3' @@ -1879,20 +1879,20 @@ def planar_graphs(self, order, minimum_degree=None, There are 6 planar graphs on 4 vertices:: - sage: gen = graphs.planar_graphs(4) # optional plantri - sage: len(list(gen)) # optional plantri + sage: gen = graphs.planar_graphs(4) # optional - plantri + sage: len(list(gen)) # optional - plantri 6 Three of these planar graphs are bipartite:: - sage: gen = graphs.planar_graphs(4, only_bipartite=True) # optional plantri - sage: len(list(gen)) # optional plantri + sage: gen = graphs.planar_graphs(4, only_bipartite=True) # optional - plantri + sage: len(list(gen)) # optional - plantri 3 Setting ``dual=True`` gives the planar dual graphs:: - sage: gen = graphs.planar_graphs(4, dual=True) # optional plantri - sage: [u for u in list(gen)] # optional plantri + sage: gen = graphs.planar_graphs(4, dual=True) # optional - plantri + sage: [u for u in list(gen)] # optional - plantri [Graph on 4 vertices, Multi-graph on 3 vertices, Multi-graph on 2 vertices, @@ -1903,8 +1903,8 @@ def planar_graphs(self, order, minimum_degree=None, The cycle of length 4 is the only 2-connected bipartite planar graph on 4 vertices:: - sage: l = list(graphs.planar_graphs(4, minimum_connectivity=2, only_bipartite=True)) # optional plantri - sage: l[0].get_embedding() # optional plantri + sage: l = list(graphs.planar_graphs(4, minimum_connectivity=2, only_bipartite=True)) # optional - plantri + sage: l[0].get_embedding() # optional - plantri {1: [2, 3], 2: [1, 4], 3: [1, 4], @@ -1913,9 +1913,9 @@ def planar_graphs(self, order, minimum_degree=None, There is one planar graph with one vertex. This graph obviously has minimum degree equal to 0:: - sage: list(graphs.planar_graphs(1)) # optional plantri + sage: list(graphs.planar_graphs(1)) # optional - plantri [Graph on 1 vertex] - sage: list(graphs.planar_graphs(1, minimum_degree=1)) # optional plantri + sage: list(graphs.planar_graphs(1, minimum_degree=1)) # optional - plantri [] Specifying lower and upper bounds on the number of edges:: @@ -1932,9 +1932,9 @@ def planar_graphs(self, order, minimum_degree=None, Specifying the maximum size of a face:: - sage: len(list(graphs.planar_graphs(4, maximum_face_size=3))) # optional plantri + sage: len(list(graphs.planar_graphs(4, maximum_face_size=3))) # optional - plantri 1 - sage: len(list(graphs.planar_graphs(4, maximum_face_size=4))) # optional plantri + sage: len(list(graphs.planar_graphs(4, maximum_face_size=4))) # optional - plantri 3 TESTS: @@ -2102,28 +2102,28 @@ def triangulations(self, order, minimum_degree=None, minimum_connectivity=None, The unique planar embedding of the `K_4` is the only planar triangulations on 4 vertices:: - sage: gen = graphs.triangulations(4) # optional plantri - sage: [g.get_embedding() for g in gen] # optional plantri + sage: gen = graphs.triangulations(4) # optional - plantri + sage: [g.get_embedding() for g in gen] # optional - plantri [{1: [2, 3, 4], 2: [1, 4, 3], 3: [1, 2, 4], 4: [1, 3, 2]}] but, of course, this graph is not Eulerian:: - sage: gen = graphs.triangulations(4, only_eulerian=True) # optional plantri - sage: len(list(gen)) # optional plantri + sage: gen = graphs.triangulations(4, only_eulerian=True) # optional - plantri + sage: len(list(gen)) # optional - plantri 0 The unique Eulerian triangulation on 6 vertices is isomorphic to the octahedral graph. :: - sage: gen = graphs.triangulations(6, only_eulerian=True) # optional plantri - sage: g = next(gen) # optional plantri - sage: g.is_isomorphic(graphs.OctahedralGraph()) # optional plantri + sage: gen = graphs.triangulations(6, only_eulerian=True) # optional - plantri + sage: g = next(gen) # optional - plantri + sage: g.is_isomorphic(graphs.OctahedralGraph()) # optional - plantri True An overview of the number of 5-connected triangulations on up to 22 vertices. This agrees with :oeis:`A081621`:: - sage: for i in range(12, 23): # optional plantri + sage: for i in range(12, 23): # optional - plantri ....: L = len(list(graphs.triangulations(i, minimum_connectivity=5))) ....: print("{} {:3d}".format(i,L)) 12 1 @@ -2140,7 +2140,8 @@ def triangulations(self, order, minimum_degree=None, minimum_connectivity=None, The minimum connectivity can be at most the minimum degree:: - sage: gen = next(graphs.triangulations(10, minimum_degree=3, minimum_connectivity=5)) # optional plantri + sage: gen = next(graphs.triangulations(10, minimum_degree=3, # optional - plantri + ....: minimum_connectivity=5)) Traceback (most recent call last): ... ValueError: Minimum connectivity can be at most the minimum degree. @@ -2148,19 +2149,23 @@ def triangulations(self, order, minimum_degree=None, minimum_connectivity=None, There are 5 triangulations with 9 vertices and minimum degree equal to 4 that are 3-connected, but only one of them is not 4-connected:: - sage: len([g for g in graphs.triangulations(9, minimum_degree=4, minimum_connectivity=3)]) # optional plantri + sage: len([g for g in graphs.triangulations(9, minimum_degree=4, # optional - plantri + ....: minimum_connectivity=3)]) 5 - sage: len([g for g in graphs.triangulations(9, minimum_degree=4, minimum_connectivity=3, exact_connectivity=True)]) # optional plantri + sage: len([g for g in graphs.triangulations(9, minimum_degree=4, # optional - plantri + ....: minimum_connectivity=3, + ....: exact_connectivity=True)]) 1 Setting ``dual=True`` gives the planar dual graphs:: - sage: [len(g) for g in graphs.triangulations(9, minimum_degree=4, minimum_connectivity=3, dual=True)] # optional plantri + sage: [len(g) for g in graphs.triangulations(9, minimum_degree=4, # optional plantri + ....: minimum_connectivity=3, dual=True)] [14, 14, 14, 14, 14] TESTS:: - sage: [g.size() for g in graphs.triangulations(6, minimum_connectivity=3)] # optional plantri + sage: [g.size() for g in graphs.triangulations(6, minimum_connectivity=3)] # optional - plantri [12, 12] """ if order < 0: @@ -2282,7 +2287,7 @@ def quadrangulations(self, order, minimum_degree=None, minimum_connectivity=None An overview of the number of quadrangulations on up to 12 vertices. This agrees with :oeis:`A113201`:: - sage: for i in range(4,13): # optional plantri + sage: for i in range(4,13): # optional - plantri ....: L = len(list(graphs.quadrangulations(i))) ....: print("{:2d} {:3d}".format(i,L)) 4 1 @@ -2298,12 +2303,12 @@ def quadrangulations(self, order, minimum_degree=None, minimum_connectivity=None There are 2 planar quadrangulation on 12 vertices that do not have a non-facial quadrangle:: - sage: len([g for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True)]) # optional plantri + sage: len([g for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True)]) # optional - plantri 2 Setting ``dual=True`` gives the planar dual graphs:: - sage: [len(g) for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True, dual=True)] # optional plantri + sage: [len(g) for g in graphs.quadrangulations(12, no_nonfacial_quadrangles=True, dual=True)] # optional - plantri [10, 10] """ if order < 0: diff --git a/src/sage/graphs/graph_generators_pyx.pyx b/src/sage/graphs/graph_generators_pyx.pyx index 060ea9275c6..033e8b22adc 100644 --- a/src/sage/graphs/graph_generators_pyx.pyx +++ b/src/sage/graphs/graph_generators_pyx.pyx @@ -6,17 +6,17 @@ AUTHORS: - David Coudert (2012) """ - -################################################################################ +# ############################################################################# # Copyright (C) 2012 David Coudert # # Distributed under the terms of the GNU General Public License (GPL) -# http://www.gnu.org/licenses/ -################################################################################ +# https://www.gnu.org/licenses/ +# ############################################################################# from sage.misc.randstate cimport random from sage.misc.randstate import set_random_seed + def RandomGNP(n, p, bint directed=False, bint loops=False, seed=None): r""" Return a random graph or a digraph on `n` nodes. @@ -63,8 +63,6 @@ def RandomGNP(n, p, bint directed=False, bint loops=False, seed=None): ... ValueError: parameter 'loops' can be set to True only when 'directed' is True """ - from sage.graphs.graph import Graph, DiGraph - if seed is not None: set_random_seed(seed) @@ -74,8 +72,10 @@ def RandomGNP(n, p, bint directed=False, bint loops=False, seed=None): cdef int pp = int(round(float(p * RAND_MAX_f))) if directed: + from sage.graphs.digraph import DiGraph G = DiGraph(loops=loops) else: + from sage.graphs.graph import Graph G = Graph() if loops: raise ValueError("parameter 'loops' can be set to True only when 'directed' is True") diff --git a/src/sage/graphs/graph_latex.py b/src/sage/graphs/graph_latex.py index 76db076502c..1cd878bec5a 100644 --- a/src/sage/graphs/graph_latex.py +++ b/src/sage/graphs/graph_latex.py @@ -1329,8 +1329,8 @@ def latex(self): sage: C = [[0,1], [2]] sage: kwds = dict(subgraph_clusters=C,color_by_label=True,prog='dot',format='dot2tex') sage: opts = G_with_labels.latex_options() - sage: opts.set_options(edge_labels=True, **kwds) # optional - dot2tex graphviz - sage: latex(G_with_labels) # optional - dot2tex graphviz + sage: opts.set_options(edge_labels=True, **kwds) # optional - dot2tex graphviz + sage: latex(G_with_labels) # optional - dot2tex graphviz \begin{tikzpicture}[>=latex,line join=bevel,] %% \begin{scope} @@ -1388,7 +1388,7 @@ def dot2tex_picture(self): sage: G = DiGraph() sage: G.add_edge(3333, 88, 'my_label') sage: G.set_latex_options(edge_labels=True) - sage: print(G.latex_options().dot2tex_picture()) # optional - dot2tex graphviz + sage: print(G.latex_options().dot2tex_picture()) # optional - dot2tex graphviz \begin{tikzpicture}[>=latex,line join=bevel,] %% \node (node_...) at (...bp,...bp) [draw,draw=none] {$...$}; @@ -1404,7 +1404,7 @@ def dot2tex_picture(self): sage: G = Graph([(0,1)]) sage: G.set_latex_options(edge_colors = {(0,1): 'red'}) - sage: print(G.latex_options().dot2tex_picture()) # optional - dot2tex graphviz + sage: print(G.latex_options().dot2tex_picture()) # optional - dot2tex graphviz \begin{tikzpicture}[>=latex,line join=bevel,] ... \draw [red,] (node_0) ... (node_1); diff --git a/src/sage/graphs/hyperbolicity.pyx b/src/sage/graphs/hyperbolicity.pyx index 5361ebbff95..6474e9d6869 100644 --- a/src/sage/graphs/hyperbolicity.pyx +++ b/src/sage/graphs/hyperbolicity.pyx @@ -641,7 +641,7 @@ cdef tuple hyperbolicity_BCCM(int N, cdef int a, b, c, d, h_UB, n_val, n_acc, i, j cdef int hplusone cdef int condacc - cdef int x, y, S1, S2, S3 + cdef int x, S1, S2, S3 cdef list certificate = [] cdef uint32_t nb_p # The total number of pairs. cdef unsigned short *dist_a @@ -1672,7 +1672,7 @@ def hyperbolicity_distribution(G, algorithm='sampling', sampling_size=10**6): return {0: sampling_size if algorithm=='sampling' else binomial(G.num_verts(), 4)} cdef int N = G.num_verts() - cdef int i, j + cdef int i cdef unsigned short** distances cdef unsigned short* _distances_ cdef dict hdict diff --git a/src/sage/graphs/independent_sets.pxd b/src/sage/graphs/independent_sets.pxd index 1ccf3837af1..91f65b64ff7 100644 --- a/src/sage/graphs/independent_sets.pxd +++ b/src/sage/graphs/independent_sets.pxd @@ -10,4 +10,3 @@ cdef class IndependentSets: cdef int i cdef int count_only cdef int maximal - diff --git a/src/sage/graphs/independent_sets.pyx b/src/sage/graphs/independent_sets.pyx index c5105df067d..3064ccbc86f 100644 --- a/src/sage/graphs/independent_sets.pyx +++ b/src/sage/graphs/independent_sets.pyx @@ -223,7 +223,6 @@ cdef class IndependentSets: bitset_init(tmp, self.n) cdef uint64_t count = 0 - cdef list ans cdef int j try: diff --git a/src/sage/graphs/lovasz_theta.py b/src/sage/graphs/lovasz_theta.py index bd18dcb944e..49bc7e32092 100644 --- a/src/sage/graphs/lovasz_theta.py +++ b/src/sage/graphs/lovasz_theta.py @@ -46,9 +46,9 @@ def lovasz_theta(graph): EXAMPLES:: sage: C = graphs.PetersenGraph() - sage: C.lovasz_theta() # optional csdp + sage: C.lovasz_theta() # optional - csdp 4.0 - sage: graphs.CycleGraph(5).lovasz_theta() # optional csdp + sage: graphs.CycleGraph(5).lovasz_theta() # optional - csdp 2.236068 TESTS:: diff --git a/src/sage/graphs/matchpoly.pyx b/src/sage/graphs/matchpoly.pyx index 7bd14c38bcd..5d70faf40a1 100644 --- a/src/sage/graphs/matchpoly.pyx +++ b/src/sage/graphs/matchpoly.pyx @@ -389,7 +389,7 @@ cdef void delete_and_add(int **edges, int nverts, int nedges, int totverts, int cdef int edge1 = edges1[nedges] cdef int edge2 = edges2[nedges] cdef int new_nedges = 0 - cdef int i, new_edge1, new_edge2 + cdef int i # The new edges are all the edges that are not incident with (edge1, edge2) diff --git a/src/sage/graphs/path_enumeration.pyx b/src/sage/graphs/path_enumeration.pyx index 6ef3e79143e..140bbda60e7 100644 --- a/src/sage/graphs/path_enumeration.pyx +++ b/src/sage/graphs/path_enumeration.pyx @@ -1790,9 +1790,7 @@ def all_paths_iterator(self, starting_vertices=None, ending_vertices=None, starting_vertices = self cdef dict data = {} cdef dict vertex_iterators - cdef list paths = [] cdef list path - cdef list shortest_path if report_edges and labels: if use_multiedges: diff --git a/src/sage/graphs/planarity.pyx b/src/sage/graphs/planarity.pyx index 1088a7659de..987669d97fe 100644 --- a/src/sage/graphs/planarity.pyx +++ b/src/sage/graphs/planarity.pyx @@ -152,7 +152,6 @@ def is_planar(g, kuratowski=False, set_pos=False, set_embedding=False): if not kuratowski: return False g_dict = {} - from sage.graphs.graph import Graph for i in range(1, theGraph.N + 1): linked_list = [] j = theGraph.V[i].link[1] diff --git a/src/sage/graphs/strongly_regular_db.pyx b/src/sage/graphs/strongly_regular_db.pyx index dc5f9d960bf..4095448b606 100644 --- a/src/sage/graphs/strongly_regular_db.pyx +++ b/src/sage/graphs/strongly_regular_db.pyx @@ -1229,7 +1229,6 @@ def SRG_from_RSHCD(v, k, l, mu, existence=False, check=True): n = v a = (n-4*mu)//2 e = 2*k - n + 1 + a - t = abs(a//2) if (e**2 == 1 and k == (n-1-a+e)/2 and @@ -1510,7 +1509,7 @@ def is_twograph_descendant_of_srg(int v, int k0, int l, int mu): sage: graphs.strongly_regular_graph(279, 150, 85, 75).is_strongly_regular(parameters=True) # optional - gap_package_design internet (279, 150, 85, 75) """ - cdef int b, k, s + cdef int b, k if k0 != 2*mu or not v % 2: return b = v+1+4*mu @@ -1570,9 +1569,8 @@ def is_taylor_twograph_srg(int v, int k, int l, int mu): sage: is_taylor_twograph_srg(730, 369, 168, 205) # needs sage.libs.pari (, 9) - """ - r, s = eigenvalues(v, k, l, mu) + r, _ = eigenvalues(v, k, l, mu) if r is None: return p, t = is_prime_power(v-1, get_data=True) @@ -2391,8 +2389,8 @@ def strongly_regular_from_two_weight_code(L): if is_Matrix(L): L = LinearCode(L) V = [tuple(l) for l in L] - w1, w2 = sorted(set(sum(map(bool, x)) for x in V).difference([0])) - G = Graph([V, lambda u, v: sum(uu!=vv for uu, vv in zip(u, v)) == w1]) + w1, _ = sorted(set(sum(map(bool, x)) for x in V).difference([0])) + G = Graph([V, lambda u, v: sum(uu != vv for uu, vv in zip(u, v)) == w1]) G.relabel() G.name('two-weight code: '+str(L)) return G diff --git a/src/sage/graphs/weakly_chordal.pyx b/src/sage/graphs/weakly_chordal.pyx index d1a6b03ae5d..9153c8ee93d 100644 --- a/src/sage/graphs/weakly_chordal.pyx +++ b/src/sage/graphs/weakly_chordal.pyx @@ -204,14 +204,13 @@ def is_long_hole_free(g, certificate=False): if g.order() < 5: return (True, []) if certificate else True - cdef int a, b, c, d, i, u, v, w, vv, ww + cdef int u, v, w, vv, ww # Make a copy of the graph as a short_digraph. This data structure is well # documented in the module sage.graphs.base.static_sparse_graph. # Vertices are relabeled in 0..n-1 cdef int n = g.order() cdef list id_label = list(g) - cdef dict label_id = {label: i for i, label in enumerate(id_label)} cdef short_digraph sd init_short_digraph(sd, g, edge_labelled=False, vertex_list=id_label) @@ -228,7 +227,6 @@ def is_long_hole_free(g, certificate=False): # Allocate some data structures cdef MemoryAllocator mem = MemoryAllocator() cdef int* path = mem.allocarray(n, sizeof(int)) - cdef int path_top cdef int* InPath = mem.allocarray(n, sizeof(int)) for u in range(n): InPath[u] = -1 @@ -433,14 +431,13 @@ def is_long_antihole_free(g, certificate=False): if g.order() < 5: return (True, []) if certificate else True - cdef int a, b, c, d, i, u, v, w, vv, ww + cdef int u, v, w, vv, ww # Make a copy of the graph as a short_digraph. This data structure is well # documented in the module sage.graphs.base.static_sparse_graph. # Vertices are relabeled in 0..n-1 cdef int n = g.order() cdef list id_label = list(g) - cdef dict label_id = {label: i for i, label in enumerate(id_label)} cdef short_digraph sd init_short_digraph(sd, g, edge_labelled=False, vertex_list=id_label) @@ -457,7 +454,6 @@ def is_long_antihole_free(g, certificate=False): # Allocate some data structures cdef MemoryAllocator mem = MemoryAllocator() cdef int* path = mem.allocarray(n, sizeof(int)) - cdef int path_top cdef int* InPath = mem.allocarray(n, sizeof(int)) for u in range(n): InPath[u] = -1 diff --git a/src/sage/groups/matrix_gps/finitely_generated_gap.py b/src/sage/groups/matrix_gps/finitely_generated_gap.py index fcfb223b58d..af676af3673 100644 --- a/src/sage/groups/matrix_gps/finitely_generated_gap.py +++ b/src/sage/groups/matrix_gps/finitely_generated_gap.py @@ -34,9 +34,9 @@ from sage.modules.free_module_element import vector from sage.rings.fraction_field import FractionField from sage.rings.integer_ring import ZZ +from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.rings.power_series_ring import PowerSeriesRing -from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence class FinitelyGeneratedMatrixGroup_gap(MatrixGroup_gap): @@ -313,8 +313,9 @@ def invariant_generators(self): - S. King, "Minimal Generating Sets of non-modular invariant rings of finite groups", :arxiv:`math/0703035`. """ - from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.interfaces.singular import singular + from sage.rings.polynomial.polynomial_ring_constructor import \ + PolynomialRing gens = self.gens() singular.LIB("finvar.lib") n = self.degree() # len((gens[0].matrix()).rows()) @@ -755,6 +756,7 @@ def reynolds_operator(self, poly, chi=None): if chi is None: # then this is the trivial character if R.characteristic() == 0: from sage.rings.qqbar import QQbar + # non-modular case if C == QQbar or R == QQbar: L = QQbar @@ -788,6 +790,7 @@ def reynolds_operator(self, poly, chi=None): K = chi.values()[0].parent() if R.characteristic() == 0: from sage.rings.qqbar import QQbar + # extend base_ring to compositum if C == QQbar or K == QQbar or R == QQbar: L = QQbar diff --git a/src/sage/interfaces/axiom.py b/src/sage/interfaces/axiom.py index 5933e633d38..1112588b981 100644 --- a/src/sage/interfaces/axiom.py +++ b/src/sage/interfaces/axiom.py @@ -318,8 +318,7 @@ def _commands(self): i = s.find(start) end = "To get more information about" j = s.find(end) - s = s[i+len(start):j].split() - return s + return s[i + len(start):j].split() def _tab_completion(self, verbose=True, use_disk_cache=True): """ @@ -359,15 +358,15 @@ def _tab_completion(self, verbose=True, use_disk_cache=True): print("To force rebuild later, delete %s." % self._COMMANDS_CACHE) v = self._commands() - #Process we now need process the commands to strip out things which - #are not valid Python identifiers. + # Process we now need process the commands to strip out things which + # are not valid Python identifiers. valid = re.compile('[^a-zA-Z0-9_]+') names = [x for x in v if valid.search(x) is None] - #Change everything that ends with ? to _q and - #everything that ends with ! to _e - names += [x[:-1]+"_q" for x in v if x.endswith("?")] - names += [x[:-1]+"_e" for x in v if x.endswith("!")] + # Change everything that ends with ? to _q and + # everything that ends with ! to _e + names += [x[:-1] + "_q" for x in v if x.endswith("?")] + names += [x[:-1] + "_e" for x in v if x.endswith("!")] self.__tab_completion = names if len(v) > 200: @@ -433,7 +432,7 @@ def _eval_line(self, line, reformat=True, allow_use_file=False, if self._expect is None: self._start() if allow_use_file and self.__eval_using_file_cutoff and \ - len(line) > self.__eval_using_file_cutoff: + len(line) > self.__eval_using_file_cutoff: return self._eval_line_using_file(line) try: E = self._expect @@ -468,7 +467,7 @@ def _eval_line(self, line, reformat=True, allow_use_file=False, line = line.rstrip() if line[:4] == ' (': i = line.find('(') - i += line[i:].find(')')+1 + i += line[i:].find(')') + 1 if line[i:] == "": i = 0 outs = outs[1:] @@ -603,14 +602,13 @@ def _richcmp_(self, other, op): sage: f = axiom('sin(x)'); g = axiom('cos(x)') #optional - axiom sage: f == g #optional - axiom False - """ P = self.parent() - if 'true' in P.eval("(%s = %s) :: Boolean" % (self.name(),other.name())): + if 'true' in P.eval("(%s = %s) :: Boolean" % (self.name(), other.name())): return rich_to_bool(op, 0) elif 'true' in P.eval("(%s < %s) :: Boolean" % (self.name(), other.name())): return rich_to_bool(op, -1) - elif 'true' in P.eval("(%s > %s) :: Boolean" % (self.name(),other.name())): + elif 'true' in P.eval("(%s > %s) :: Boolean" % (self.name(), other.name())): return rich_to_bool(op, 1) return NotImplemented @@ -642,7 +640,7 @@ def __len__(self): P = self._check_valid() s = P.eval('# %s ' % self.name()) i = s.rfind('Type') - return int(s[:i-1]) + return int(s[:i - 1]) def __getitem__(self, n): r""" @@ -716,12 +714,12 @@ def _latex_(self): i = s.find('$$') j = s.rfind('$$') s = s[i + 2:j] - s = multiple_replace({'\r':'', '\n':' ', - ' \\sp ':'^', - '\\arcsin ':'\\sin^{-1} ', - '\\arccos ':'\\cos^{-1} ', - '\\arctan ':'\\tan^{-1} '}, - re.sub(r'\\leqno\(.*?\)','',s)) # no eq number! + s = multiple_replace({'\r': '', '\n': ' ', + ' \\sp ': '^', + '\\arcsin ': '\\sin^{-1} ', + '\\arccos ': '\\cos^{-1} ', + '\\arctan ': '\\tan^{-1} '}, + re.sub(r'\\leqno\(.*?\)', '', s)) # no eq number! return s def as_type(self, type): @@ -760,16 +758,13 @@ def unparsed_input_form(self): s = P.eval('unparse(%s::InputForm)' % self._name) if 'translation error' in s or 'Cannot convert' in s: raise NotImplementedError - s = multiple_replace({'\r\n':'', # fix stupid Fortran-ish - 'DSIN(':'sin(', - 'DCOS(':'cos(', - 'DTAN(':'tan(', - 'DSINH(':'sinh('}, s) - r = re.search(r'"(.*)"',s) - if r: - return r.groups(0)[0] - else: - return s + s = multiple_replace({'\r\n': '', # fix stupid Fortran-ish + 'DSIN(': 'sin(', + 'DCOS(': 'cos(', + 'DTAN(': 'tan(', + 'DSINH(': 'sinh('}, s) + r = re.search(r'"(.*)"', s) + return r.groups(0)[0] if r else s def _sage_(self): """ @@ -843,8 +838,8 @@ def _sage_(self): from sage.rings.integer_ring import ZZ prec = max(self.mantissa().length()._sage_(), 53) R = RealField(prec) - x,e,b = self.unparsed_input_form().lstrip('float(').rstrip(')').split(',') - return R(ZZ(x)*ZZ(b)**ZZ(e)) + x, e, b = self.unparsed_input_form().lstrip('float(').rstrip(')').split(',') + return R(ZZ(x) * ZZ(b)**ZZ(e)) elif type == "DoubleFloat": from sage.rings.real_double import RDF return RDF(repr(self)) @@ -858,16 +853,18 @@ def _sage_(self): R = PolynomialRing(base_ring, vars) return R(self.unparsed_input_form()) elif type.startswith('Fraction'): - return self.numer().sage()/self.denom().sage() + return self.numer().sage() / self.denom().sage() - #If all else fails, try using the unparsed input form + # If all else fails, try using the unparsed input form try: import sage.misc.sage_eval vars = sage.symbolic.ring.var(str(self.variables())[1:-1]) - if isinstance(vars,tuple): - return sage.misc.sage_eval.sage_eval(self.unparsed_input_form(), locals={str(x):x for x in vars}) + if isinstance(vars, tuple): + return sage.misc.sage_eval.sage_eval(self.unparsed_input_form(), + locals={str(x): x for x in vars}) else: - return sage.misc.sage_eval.sage_eval(self.unparsed_input_form(), locals={str(vars):vars}) + return sage.misc.sage_eval.sage_eval(self.unparsed_input_form(), + locals={str(vars): vars}) except Exception: raise NotImplementedError @@ -970,9 +967,10 @@ def is_AxiomElement(x): return isinstance(x, AxiomElement) -#Instances +# Instances axiom = Axiom(name='axiom') + def reduce_load_Axiom(): """ Returns the Axiom interface object defined in @@ -986,6 +984,7 @@ def reduce_load_Axiom(): """ return axiom + def axiom_console(): """ Spawn a new Axiom command-line session. diff --git a/src/sage/interfaces/gap.py b/src/sage/interfaces/gap.py index 3a2ed434091..0a8087a20d5 100644 --- a/src/sage/interfaces/gap.py +++ b/src/sage/interfaces/gap.py @@ -1428,6 +1428,15 @@ def _object_class(self): """ return GapElement + def _an_element_(self): + """ + EXAMPLES:: + + sage: gap._an_element_() + 0 + """ + return self(0) + def _function_element_class(self): """ Returns the GapFunctionElement class. diff --git a/src/sage/interfaces/gp.py b/src/sage/interfaces/gp.py index 4cff85207e2..456007de9e3 100644 --- a/src/sage/interfaces/gp.py +++ b/src/sage/interfaces/gp.py @@ -1,4 +1,3 @@ -# sage_setup: distribution = sagemath-pari # sage.doctest: needs sage.libs.pari r""" Interface to the GP calculator of PARI/GP @@ -142,14 +141,18 @@ ########################################################################## import os +import sage.interfaces.abc + from sage.env import DOT_SAGE -from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement -from sage.misc.verbose import verbose from sage.interfaces.tab_completion import ExtraTabCompletion from sage.libs.pari.all import pari -import sage.rings.complex_mpfr from sage.misc.instancedoc import instancedoc -import sage.interfaces.abc +from sage.misc.lazy_import import lazy_import +from sage.misc.verbose import verbose + +lazy_import('sage.rings.cc', 'CC') + +from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement class Gp(ExtraTabCompletion, Expect): @@ -987,7 +990,7 @@ def _complex_double_(self, CDF): """ # Retrieving values from another computer algebra system is # slow anyway, right? - cc_val = self._complex_mpfr_field_(sage.rings.complex_mpfr.ComplexField()) + cc_val = self._complex_mpfr_field_(CC) return CDF(cc_val) def __len__(self): diff --git a/src/sage/interfaces/jmoldata.py b/src/sage/interfaces/jmoldata.py index 3e83043d747..ea19dc9b862 100644 --- a/src/sage/interfaces/jmoldata.py +++ b/src/sage/interfaces/jmoldata.py @@ -10,14 +10,14 @@ - Jonathan Gutow (2012-03-21): initial version """ -#******************************************************************************* +# ****************************************************************************** # Copyright (C) 2012 Jonathan Gutow (gutow@uwosh.edu) # # Distributed under the terms of the GNU General Public License (GPL) # as published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. -# http://www.gnu.org/licenses/ -#******************************************************************************* +# https://www.gnu.org/licenses/ +# ****************************************************************************** from sage.structure.sage_object import SageObject @@ -72,12 +72,12 @@ def is_jvm_available(self): return java_version_number >= 7 def export_image(self, - targetfile, - datafile, #name (path) of data file Jmol can read or script file telling it what to read or load - datafile_cmd='script', #"script" or "load" - image_type='PNG', #PNG, JPG, GIF - figsize=5, - **kwds): + targetfile, + datafile, # name (path) of data file Jmol can read or script file telling it what to read or load + datafile_cmd='script', # "script" or "load" + image_type='PNG', # PNG, JPG, GIF + figsize=5, + **kwds): r""" This executes JmolData.jar to make an image file. @@ -170,7 +170,7 @@ def export_image(self, launchscript = launchscript + datafile imagescript = 'write {} {!r}\n'.format(image_type, target_native) - size_arg = "%sx%s" % (figsize*100,figsize*100) + size_arg = "%sx%s" % (figsize * 100, figsize * 100) # Scratch file for Jmol errors scratchout = tmp_filename(ext=".txt") with open(scratchout, 'w') as jout: @@ -179,9 +179,9 @@ def export_image(self, env['LC_ALL'] = 'C' env['LANG'] = 'C' subprocess.call(["java", "-Xmx512m", "-Djava.awt.headless=true", - "-jar", jmolpath, "-iox", "-g", size_arg, - "-J", launchscript, "-j", imagescript], - stdout=jout, stderr=jout, env=env) + "-jar", jmolpath, "-iox", "-g", size_arg, + "-J", launchscript, "-j", imagescript], + stdout=jout, stderr=jout, env=env) if not os.path.isfile(targetfile): raise RuntimeError(f"Jmol failed to create file {targetfile}: {Path(scratchout).read_text()}") os.unlink(scratchout) diff --git a/src/sage/interfaces/latte.py b/src/sage/interfaces/latte.py index 4c6d8e9f061..6923be55d53 100644 --- a/src/sage/interfaces/latte.py +++ b/src/sage/interfaces/latte.py @@ -1,15 +1,15 @@ r""" Interface to LattE integrale programs """ -#***************************************************************************** +# **************************************************************************** # Copyright (C) 2017 Vincent Delecroix # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. -# http://www.gnu.org/licenses/ -#***************************************************************************** +# https://www.gnu.org/licenses/ +# **************************************************************************** from sage.cpython.string import str_to_bytes, bytes_to_str @@ -134,15 +134,15 @@ def count(arg, ehrhart_polynomial=False, multivariate_generating_function=False, if 'redundancy_check' not in kwds: args.append('--redundancy-check=none') - for key,value in kwds.items(): + for key, value in kwds.items(): if value is None or value is False: continue - key = key.replace('_','-') + key = key.replace('_', '-') if value is True: - args.append('--{}'.format(key)) + args.append(f'--{key}') else: - args.append('--{}={}'.format(key, value)) + args.append(f'--{key}={value}') if multivariate_generating_function: from sage.misc.temporary_file import tmp_filename @@ -200,12 +200,12 @@ def count(arg, ehrhart_polynomial=False, multivariate_generating_function=False, else: raise NotImplementedError("there is no Sage object to handle multivariate series from LattE, use raw_output=True") else: - if ans: # Sometimes (when LattE's preproc does the work), no output appears on stdout. + if ans: # Sometimes (when LattE's preproc does the work), no output appears on stdout. ans = ans.splitlines()[-1] if not ans: # opening a file is slow (30e-6s), so we read the file # numOfLatticePoints only in case of a IndexError above - with open(tempd.name+'/numOfLatticePoints', 'r') as f: + with open(tempd.name + '/numOfLatticePoints', 'r') as f: ans = f.read() if raw_output: @@ -363,11 +363,11 @@ def integrate(arg, polynomial=None, algorithm='triangulate', raw_output=False, v if value is None or value is False: continue - key = key.replace('_','-') + key = key.replace('_', '-') if value is True: - args.append('--{}'.format(key)) + args.append(f'--{key}') else: - args.append('--{}={}'.format(key, value)) + args.append(f'--{key}={value}') if got_polynomial: if not isinstance(polynomial, str): diff --git a/src/sage/interfaces/lie.py b/src/sage/interfaces/lie.py index 2866dfbb828..65c35351863 100644 --- a/src/sage/interfaces/lie.py +++ b/src/sage/interfaces/lie.py @@ -536,11 +536,11 @@ def _tab_completion(self, type=None, verbose=False, use_disk_cache=True): else: return self._tab_completion_list - def _an_element_impl(self): + def _an_element_(self): """ EXAMPLES:: - sage: lie._an_element_impl() # optional - lie + sage: lie._an_element_() # optional - lie 0 """ return self(0) diff --git a/src/sage/interfaces/lisp.py b/src/sage/interfaces/lisp.py index 3d6e620c4d1..ed1cfd52aca 100644 --- a/src/sage/interfaces/lisp.py +++ b/src/sage/interfaces/lisp.py @@ -50,7 +50,7 @@ # https://www.gnu.org/licenses/ # ########################################################################## - +import os import random from .expect import Expect, ExpectElement, ExpectFunction, FunctionElement, gc_disabled @@ -124,10 +124,10 @@ def eval(self, code, strip=True, **kwds): self._synchronize() code = str(code) code = code.strip() - code = code.replace('\n',' ') + code = code.replace('\n', ' ') x = [] for L in code.split('\n'): - if L != '': + if L: try: s = self.__in_seq + 1 M = self._eval_line(L, wait_for_prompt=self._prompt) @@ -136,14 +136,14 @@ def eval(self, code, strip=True, **kwds): x.append(M.strip()) self.__in_seq = s except TypeError as s: - return 'error evaluating "%s":\n%s' % (code,s) + return 'error evaluating "%s":\n%s' % (code, s) return '\n'.join(x) - def _an_element_impl(self): + def _an_element_(self): """ EXAMPLES:: - sage: lisp._an_element_impl() + sage: lisp._an_element_() 0 """ return self(0) @@ -201,7 +201,7 @@ def _synchronize(self): self._start() E = self._expect r = random.randrange(2147483647) - s = str(r+1) + s = str(r + 1) cmd = "(+ 1 %s)" % r E.sendline(cmd) E.expect(s) @@ -354,7 +354,7 @@ def _equality_symbol(self): NotImplementedError: ... """ raise NotImplementedError("We should never reach here in the Lisp interface. " + - "Please report this as a bug.") + "Please report this as a bug.") def help(self, command): """ @@ -541,6 +541,7 @@ def is_LispElement(x): # An instance lisp = Lisp() + def reduce_load_Lisp(): """ EXAMPLES:: @@ -552,7 +553,6 @@ def reduce_load_Lisp(): return lisp -import os def lisp_console(): """ Spawn a new Lisp command-line session. diff --git a/src/sage/interfaces/maxima_lib.py b/src/sage/interfaces/maxima_lib.py index 211018e52cc..ea40cf4ed8a 100644 --- a/src/sage/interfaces/maxima_lib.py +++ b/src/sage/interfaces/maxima_lib.py @@ -120,11 +120,18 @@ from sage.libs.ecl import EclObject, ecl_eval from .maxima_abstract import (MaximaAbstract, MaximaAbstractFunction, - MaximaAbstractElement, MaximaAbstractFunctionElement, - MaximaAbstractElementFunction) + MaximaAbstractElement, MaximaAbstractFunctionElement, + MaximaAbstractElementFunction) from sage.misc.instancedoc import instancedoc from sage.env import MAXIMA_FAS +import sage.rings.real_double +import sage.symbolic.expression +import sage.symbolic.integration.integral + +from sage.rings.number_field.number_field_element_base import NumberFieldElement_base +from sage.symbolic.operators import FDerivativeOperator, add_vararg, mul_vararg + # We begin here by initializing Maxima in library mode # i.e. loading it into ECL @@ -203,15 +210,15 @@ (make-concatenated-stream) (make-broadcast-stream)))""") ecl_eval("(setf original-standard-output *standard-output*)") ecl_eval("(setf *standard-output* *dev-null*)") -#ecl_eval("(setf *error-output* *dev-null*)") +# ecl_eval("(setf *error-output* *dev-null*)") # Default options set in Maxima # display2d -- no ascii art output # keepfloat -- don't automatically convert floats to rationals init_code = ['besselexpand : true', 'display2d : false', 'domain : complex', 'keepfloat : true', - 'load(to_poly_solve)', 'load(simplify_sum)', - 'load(diag)'] + 'load(to_poly_solve)', 'load(simplify_sum)', + 'load(diag)'] # Turn off the prompt labels, since computing them *very @@ -225,7 +232,7 @@ ecl_eval("#$%s$" % l) # To get more debug information uncomment the next line # should allow to do this through a method -#ecl_eval("(setf *standard-output* original-standard-output)") +# ecl_eval("(setf *standard-output* original-standard-output)") # This is the main function (ECL object) used for evaluation # This returns an EclObject @@ -239,7 +246,7 @@ # Here we define several useful ECL/Maxima objects # The Maxima string function can change the structure of its input -#maxprint=EclObject("$STRING") +# maxprint=EclObject("$STRING") maxprint = EclObject(r"""(defun mstring-for-sage (form) (coerce (mstring form) 'string))""").eval() meval = EclObject("MEVAL") @@ -262,6 +269,7 @@ max_to_poly_solve = EclObject("$TO_POLY_SOLVE") max_at = EclObject("%AT") + def stdout_to_string(s): r""" Evaluate command ``s`` and catch Maxima stdout @@ -286,6 +294,7 @@ def stdout_to_string(s): return ecl_eval(r"""(with-output-to-string (*standard-output*) (maxima-eval #$%s$))""" % s).python()[1:-1] + def max_to_string(s): r""" Return the Maxima string corresponding to this ECL object. @@ -311,6 +320,7 @@ def max_to_string(s): (caddr (mread (make-string-input-stream cmd)))) """) + def parse_max_string(s): r""" Evaluate string in Maxima without *any* further simplification. @@ -329,6 +339,7 @@ def parse_max_string(s): """ return my_mread('"%s;"' % s) + class MaximaLib(MaximaAbstract): """ Interface to Maxima as a Library. @@ -377,7 +388,7 @@ def __init__(self): global init_code self.__init_code = init_code - MaximaAbstract.__init__(self,"maxima_lib") + MaximaAbstract.__init__(self, "maxima_lib") self.__seq = 0 def _coerce_from_special_method(self, x): @@ -398,9 +409,8 @@ def _coerce_from_special_method(self, x): """ if isinstance(x, EclObject): - return MaximaLibElement(self,self._create(x)) - else: - return MaximaAbstract._coerce_from_special_method(self,x) + return MaximaLibElement(self, self._create(x)) + return MaximaAbstract._coerce_from_special_method(self, x) def __reduce__(self): r""" @@ -466,12 +476,12 @@ def _eval_line(self, line, locals=None, reformat=True, **kwds): line = '' else: statement = line[:ind_semi] - line = line[ind_semi+1:] + line = line[ind_semi + 1:] if statement: result = ((result + '\n') if result else '') + max_to_string(maxima_eval("#$%s$" % statement)) else: statement = line[:ind_dollar] - line = line[ind_dollar+1:] + line = line[ind_dollar + 1:] if statement: maxima_eval("#$%s$" % statement) if not reformat: @@ -616,13 +626,13 @@ def _create(self, value, name=None): """ name = self._next_var_name() if name is None else name try: - if isinstance(value,EclObject): - maxima_eval([[msetq],cadadr("#$%s$#$" % name),value]) + if isinstance(value, EclObject): + maxima_eval([[msetq], cadadr("#$%s$#$" % name), value]) else: self.set(name, value) except RuntimeError as error: s = str(error) - if "Is" in s: # Maxima asked for a condition + if "Is" in s: # Maxima asked for a condition self._missing_assumption(s) else: raise @@ -697,7 +707,7 @@ def _object_function_class(self): # and return something that is hopefully coercible into the symbolic # ring again. - def sr_integral(self,*args): + def sr_integral(self, *args): """ Helper function to wrap calculus use of Maxima's integration. @@ -804,19 +814,21 @@ def sr_integral(self,*args): """ try: - return max_to_sr(maxima_eval(([max_integrate],[sr_to_max(SR(a)) for a in args]))) + return max_to_sr(maxima_eval(([max_integrate], + [sr_to_max(SR(a)) for a in args]))) except RuntimeError as error: s = str(error) if "Divergent" in s or "divergent" in s: -# in pexpect interface, one looks for this - e.g. integrate(1/x^3,x,-1,3) gives a principal value -# if "divergent" in s or 'Principal Value' in s: + # in pexpect interface, one looks for this + # - e.g. integrate(1/x^3,x,-1,3) gives a principal value + # if "divergent" in s or 'Principal Value' in s: raise ValueError("Integral is divergent.") - elif "Is" in s: # Maxima asked for a condition + elif "Is" in s: # Maxima asked for a condition self._missing_assumption(s) else: raise - def sr_sum(self,*args): + def sr_sum(self, *args): """ Helper function to wrap calculus use of Maxima's summation. @@ -889,20 +901,23 @@ def sr_sum(self,*args): RuntimeError: ECL says: Zero to negative power computed. """ try: - return max_to_sr(maxima_eval([[max_ratsimp],[[max_simplify_sum],([max_sum],[sr_to_max(SR(a)) for a in args])]])) + return max_to_sr(maxima_eval([[max_ratsimp], + [[max_simplify_sum], + ([max_sum], + [sr_to_max(SR(a)) for a in args])]])) except RuntimeError as error: s = str(error) if "divergent" in s: -# in pexpect interface, one looks for this; -# could not find an example where 'Pole encountered' occurred, though -# if "divergent" in s or 'Pole encountered' in s: + # in pexpect interface, one looks for this; + # could not find an example where 'Pole encountered' occurred, though + # if "divergent" in s or 'Pole encountered' in s: raise ValueError("Sum is divergent.") - elif "Is" in s: # Maxima asked for a condition + elif "Is" in s: # Maxima asked for a condition self._missing_assumption(s) else: raise - def sr_prod(self,*args): + def sr_prod(self, *args): """ Helper function to wrap calculus use of Maxima's product. @@ -917,7 +932,10 @@ def sr_prod(self,*args): """ try: - return max_to_sr(maxima_eval([[max_ratsimp],[[max_simplify_prod],([max_prod],[sr_to_max(SR(a)) for a in args])]])) + return max_to_sr(maxima_eval([[max_ratsimp], + [[max_simplify_prod], + ([max_prod], + [sr_to_max(SR(a)) for a in args])]])) except RuntimeError as error: s = str(error) if "divergent" in s: @@ -1007,7 +1025,7 @@ def sr_limit(self, expr, v, a, dir=None): return max_to_sr(maxima_eval(([max_limit], L))) except RuntimeError as error: s = str(error) - if "Is" in s: # Maxima asked for a condition + if "Is" in s: # Maxima asked for a condition self._missing_assumption(s) else: raise @@ -1029,7 +1047,7 @@ def sr_tlimit(self, expr, v, a, dir=None): L.append(max_minus) return max_to_sr(maxima_eval(([max_tlimit], L))) - def _missing_assumption(self,errstr): + def _missing_assumption(self, errstr): """ Helper function for unified handling of failed computation because an assumption was missing. @@ -1048,13 +1066,14 @@ def _missing_assumption(self,errstr): jj = 2 if errstr[3] == ' ': jj = 3 - k = errstr.find(' ',jj+1) + k = errstr.find(' ', jj + 1) outstr = "Computation failed since Maxima requested additional constraints; using the 'assume' command before evaluation *may* help (example of legal syntax is 'assume("\ - + errstr[jj+1:k] + ">0)', see `assume?` for more details)\n" + errstr - outstr = outstr.replace('_SAGE_VAR_','') + + errstr[jj + 1:k] + ">0)', see `assume?` for more details)\n" + errstr + outstr = outstr.replace('_SAGE_VAR_', '') raise ValueError(outstr) + def is_MaximaLibElement(x): r""" Return True if ``x`` is of type :class:`MaximaLibElement`. @@ -1113,7 +1132,7 @@ def ecl(self): self._ecl = maxima_eval("#$%s$" % self._name) return self._ecl - def to_poly_solve(self,vars,options=""): + def to_poly_solve(self, vars, options=""): r""" Use Maxima's to_poly_solver package. @@ -1137,7 +1156,7 @@ def to_poly_solve(self,vars,options=""): """ if options.find("use_grobner=true") != -1: cmd = EclObject([[max_to_poly_solve], self.ecl(), sr_to_max(vars), - [[mequal],max_use_grobner,True]]) + [[mequal], max_use_grobner, True]]) else: cmd = EclObject([[max_to_poly_solve], self.ecl(), sr_to_max(vars)]) return self.parent()(maxima_eval(cmd)) @@ -1167,7 +1186,7 @@ def display2d(self, onscreen=True): P = self.parent() P._eval_line('display2d : true$') s = stdout_to_string('disp(%s)' % self.name()) - #s = P._eval_line('disp(%s)$'%self.name()) + # s = P._eval_line('disp(%s)$'%self.name()) P._eval_line('display2d : false$') s = s.strip('\r\n') @@ -1182,6 +1201,7 @@ def display2d(self, onscreen=True): MaximaLibFunctionElement = MaximaAbstractFunctionElement MaximaLibFunction = MaximaAbstractFunction + @instancedoc class MaximaLibElementFunction(MaximaLibElement, MaximaAbstractElementFunction): pass @@ -1209,13 +1229,6 @@ def reduce_load_MaximaLib(): # Smart translations between SR and Maxima ############################################# -import sage.rings.real_double -import sage.symbolic.expression -import sage.symbolic.integration.integral - -from sage.rings.number_field.number_field_element_base import NumberFieldElement_base -from sage.symbolic.operators import FDerivativeOperator, add_vararg, mul_vararg - car = EclObject("car") cdr = EclObject("cdr") caar = EclObject("caar") @@ -1230,36 +1243,36 @@ def reduce_load_MaximaLib(): # Dictionaries for standard operators sage_op_dict = { - sage.functions.other.abs : "MABS", - add_vararg : "MPLUS", - sage.symbolic.expression.operator.truediv : "MQUOTIENT", - sage.symbolic.expression.operator.eq : "MEQUAL", - sage.symbolic.expression.operator.ge : "MGEQP", - sage.symbolic.expression.operator.gt : "MGREATERP", - sage.symbolic.expression.operator.le : "MLEQP", - sage.symbolic.expression.operator.lt : "MLESSP", - mul_vararg : "MTIMES", - sage.symbolic.expression.operator.ne : "MNOTEQUAL", - sage.symbolic.expression.operator.neg : "MMINUS", - sage.symbolic.expression.operator.pow : "MEXPT", - sage.symbolic.expression.operator.or_ : "MOR", - sage.symbolic.expression.operator.and_ : "MAND", - sage.functions.log.ln : "%LOG", - sage.functions.log.log : "%LOG", - sage.functions.log.lambert_w : "%LAMBERT_W", - sage.functions.other.factorial : "MFACTORIAL", - sage.functions.error.erf : "%ERF", - sage.functions.gamma.gamma_inc : "%GAMMA_INCOMPLETE", - sage.functions.other.conjugate : "$CONJUGATE", + sage.functions.other.abs: "MABS", + add_vararg: "MPLUS", + sage.symbolic.expression.operator.truediv: "MQUOTIENT", + sage.symbolic.expression.operator.eq: "MEQUAL", + sage.symbolic.expression.operator.ge: "MGEQP", + sage.symbolic.expression.operator.gt: "MGREATERP", + sage.symbolic.expression.operator.le: "MLEQP", + sage.symbolic.expression.operator.lt: "MLESSP", + mul_vararg: "MTIMES", + sage.symbolic.expression.operator.ne: "MNOTEQUAL", + sage.symbolic.expression.operator.neg: "MMINUS", + sage.symbolic.expression.operator.pow: "MEXPT", + sage.symbolic.expression.operator.or_: "MOR", + sage.symbolic.expression.operator.and_: "MAND", + sage.functions.log.ln: "%LOG", + sage.functions.log.log: "%LOG", + sage.functions.log.lambert_w: "%LAMBERT_W", + sage.functions.other.factorial: "MFACTORIAL", + sage.functions.error.erf: "%ERF", + sage.functions.gamma.gamma_inc: "%GAMMA_INCOMPLETE", + sage.functions.other.conjugate: "$CONJUGATE", } -#we compile the dictionary -sage_op_dict = dict([(k,EclObject(sage_op_dict[k])) for k in sage_op_dict]) -max_op_dict = dict([(sage_op_dict[k],k) for k in sage_op_dict]) +# we compile the dictionary +sage_op_dict = dict([(k, EclObject(sage_op_dict[k])) for k in sage_op_dict]) +max_op_dict = dict([(sage_op_dict[k], k) for k in sage_op_dict]) # Here we correct the dictionaries for some simple operators -def sage_rat(x,y): +def sage_rat(x, y): r""" Return quotient x/y. @@ -1277,7 +1290,7 @@ def sage_rat(x,y): sage: sage_rat(1,7) 1/7 """ - return x/y + return x / y mplus = EclObject("MPLUS") @@ -1331,7 +1344,8 @@ def mrat_to_sage(expr): sage: mrat_to_sage(c.ecl()) (x^6*z^8 + y*z^9 + y^3 + x*y)/(x^6*y) """ - return max_to_sr(meval(EclObject([[ratdisrep],expr]))) + return max_to_sr(meval(EclObject([[ratdisrep], expr]))) + def mqapply_to_sage(expr): r""" @@ -1370,6 +1384,7 @@ def mqapply_to_sage(expr): args = [max_to_sr(a) for a in max_args] return op(*args) + def mdiff_to_sage(expr): r""" Special conversion rule for %DERIVATIVE expressions. @@ -1391,6 +1406,7 @@ def mdiff_to_sage(expr): """ return max_to_sr(expr.cadr()).diff(*[max_to_sr(e) for e in expr.cddr()]) + def mlist_to_sage(expr): r""" Special conversion rule for MLIST expressions. @@ -1412,6 +1428,7 @@ def mlist_to_sage(expr): """ return [max_to_sr(x) for x in expr.cdr()] + def max_at_to_sage(expr): r""" Special conversion rule for AT expressions. @@ -1439,12 +1456,13 @@ def max_at_to_sage(expr): arg = max_to_sr(expr.cadr()) subsarg = caddr(expr) if caar(subsarg) == mlist: - subsvalues = dict( (v.lhs(),v.rhs()) for v in max_to_sr(subsarg)) + subsvalues = {v.lhs(): v.rhs() for v in max_to_sr(subsarg)} else: v = max_to_sr(subsarg) - subsvalues = dict([(v.lhs(),v.rhs())]) + subsvalues = dict([(v.lhs(), v.rhs())]) return SR(arg).subs(subsvalues) + def dummy_integrate(expr): r""" We would like to simply tie Maxima's integrate to @@ -1477,11 +1495,11 @@ def dummy_integrate(expr): args = [max_to_sr(a) for a in cdr(expr)] if len(args) == 4: return sage.symbolic.integration.integral.definite_integral(*args, - hold=True) - else: - return sage.symbolic.integration.integral.indefinite_integral(*args, + hold=True) + return sage.symbolic.integration.integral.indefinite_integral(*args, hold=True) + def max_harmonic_to_sage(expr): """ EXAMPLES:: @@ -1527,12 +1545,12 @@ def max_pochhammer_to_sage(expr): } special_sage_to_max = { - sage.functions.log.polylog : lambda N,X : [[mqapply],[[max_li, max_array],N],X], - sage.functions.gamma.psi1 : lambda X : [[mqapply],[[max_psi, max_array],0],X], - sage.functions.gamma.psi2 : lambda N,X : [[mqapply],[[max_psi, max_array],N],X], - sage.functions.log.lambert_w : lambda N,X : [[max_lambert_w], X] if N == EclObject(0) else [[mqapply],[[max_lambert_w, max_array],N],X], - sage.functions.log.harmonic_number : lambda N,X : [[max_harmo],X,N], - sage.functions.hypergeometric.hypergeometric : lambda A, B, X : [[mqapply],[[max_hyper, max_array],lisp_length(A.cdr()),lisp_length(B.cdr())],A,B,X] + sage.functions.log.polylog: lambda N, X: [[mqapply], [[max_li, max_array], N], X], + sage.functions.gamma.psi1: lambda X: [[mqapply], [[max_psi, max_array], 0], X], + sage.functions.gamma.psi2: lambda N, X: [[mqapply], [[max_psi, max_array], N], X], + sage.functions.log.lambert_w: lambda N, X: [[max_lambert_w], X] if N == EclObject(0) else [[mqapply], [[max_lambert_w, max_array], N], X], + sage.functions.log.harmonic_number: lambda N, X: [[max_harmo], X, N], + sage.functions.hypergeometric.hypergeometric: lambda A, B, X: [[mqapply], [[max_hyper, max_array], lisp_length(A.cdr()), lisp_length(B.cdr())], A, B, X] } @@ -1544,6 +1562,8 @@ def max_pochhammer_to_sage(expr): # Generic conversion functions max_i = EclObject("$%I") + + def pyobject_to_max(obj): r""" Convert a (simple) Python object into a Maxima object. @@ -1572,15 +1592,16 @@ def pyobject_to_max(obj): ... TypeError: Unimplemented type for python_to_ecl """ - if isinstance(obj,sage.rings.rational.Rational): - return EclObject(obj) if (obj.denom().is_one()) else EclObject([[rat], obj.numer(),obj.denom()]) + if isinstance(obj, sage.rings.rational.Rational): + return EclObject(obj) if (obj.denom().is_one()) else EclObject([[rat], obj.numer(), obj.denom()]) elif isinstance(obj, NumberFieldElement_base): from sage.rings.number_field.number_field_element_quadratic import NumberFieldElement_quadratic - if isinstance(obj, NumberFieldElement_quadratic) and obj.parent().defining_polynomial().list() == [1,0,1]: + if isinstance(obj, NumberFieldElement_quadratic) and obj.parent().defining_polynomial().list() == [1, 0, 1]: re, im = obj.list() return EclObject([[mplus], pyobject_to_max(re), [[mtimes], pyobject_to_max(im), max_i]]) return EclObject(obj) + # This goes from SR to EclObject def sr_to_max(expr): r""" @@ -1615,12 +1636,11 @@ def sr_to_max(expr): sage: f_prime = f(x).diff(x) sage: max_to_sr(sr_to_max(f_prime(x = 1))) D[0](f)(1) - """ global sage_op_dict, max_op_dict global sage_sym_dict, max_sym_dict if isinstance(expr, (list, tuple)): - return EclObject(([mlist],[sr_to_max(e) for e in expr])) + return EclObject(([mlist], [sr_to_max(e) for e in expr])) op = expr.operator() if op: # Stolen from sage.symbolic.expression_conversion @@ -1629,8 +1649,8 @@ def sr_to_max(expr): # (we need to have access to op, not only to expr.operands() if isinstance(op, FDerivativeOperator): args = expr.operands() - if (not all(isinstance(v, Expression) and v.is_symbol() for v in args) or - len(args) != len(set(args))): + if (not all(isinstance(v, Expression) and v.is_symbol() for v in args) + or len(args) != len(set(args))): # An evaluated derivative of the form f'(1) is not a # symbolic variable, yet we would like to treat it # like one. So, we replace the argument `1` with a @@ -1642,37 +1662,37 @@ def sr_to_max(expr): temp_args = [SR.symbol("_symbol%s" % i) for i in range(len(args))] f = sr_to_max(op.function()(*temp_args)) params = op.parameter_set() - deriv_max = [[mdiff],f] + deriv_max = [[mdiff], f] for i in set(params): deriv_max.extend([sr_to_max(temp_args[i]), EclObject(params.count(i))]) at_eval = sr_to_max([temp_args[i] == args[i] for i in range(len(args))]) - return EclObject([[max_at],deriv_max,at_eval]) + return EclObject([[max_at], deriv_max, at_eval]) f = sr_to_max(op.function()(*args)) params = op.parameter_set() deriv_max = [] [deriv_max.extend([sr_to_max(args[i]), EclObject(params.count(i))]) for i in set(params)] - l = [[mdiff],f] + l = [[mdiff], f] l.extend(deriv_max) return EclObject(l) elif (op in special_sage_to_max): return EclObject(special_sage_to_max[op](*[sr_to_max(o) for o in expr.operands()])) elif op == tuple: - return EclObject( ([mlist],list(sr_to_max(op) for op in expr.operands())) ) + return EclObject(([mlist], list(sr_to_max(op) for op in expr.operands()))) elif not (op in sage_op_dict): # Maxima does some simplifications automatically by default # so calling maxima(expr) can change the structure of expr - #op_max=caar(maxima(expr).ecl()) + # op_max=caar(maxima(expr).ecl()) # This should be safe if we treated all special operators above - #furthermore, this should already use any _maxima_ methods on op, so use any - #conversion methods that are registered in pynac. + # furthermore, this should already use any _maxima_ methods on op, so use any + # conversion methods that are registered in pynac. op_max = maxima(op).ecl() if op_max in max_op_dict: raise RuntimeError("Encountered operator mismatch in sr-to-maxima translation") sage_op_dict[op] = op_max max_op_dict[op_max] = op return EclObject(([sage_op_dict[op]], - [sr_to_max(o) for o in expr.operands()])) + [sr_to_max(o) for o in expr.operands()])) elif expr.is_symbol() or expr._is_registered_constant_(): if expr not in sage_sym_dict: sym_max = maxima(expr).ecl() diff --git a/src/sage/interfaces/psage.py b/src/sage/interfaces/psage.py index b64a0b15c5f..246ce1abcf7 100644 --- a/src/sage/interfaces/psage.py +++ b/src/sage/interfaces/psage.py @@ -50,7 +50,7 @@ class PSage(Sage): - def __init__(self, **kwds): + def __init__(self, **kwds): if 'server' in kwds: raise NotImplementedError("PSage doesn't work on remote server yet.") Sage.__init__(self, **kwds) @@ -136,7 +136,7 @@ def eval(self, x, strip=True, **kwds): return "<>" if self._locked: self._locked = False - #self._expect.expect('__unlocked__') + # self._expect.expect('__unlocked__') self.expect().send('\n') self.expect().expect(self._prompt) self.expect().expect(self._prompt) @@ -158,7 +158,7 @@ def set(self, var, value): """ Set the variable var to the given value. """ - cmd = '%s=%s' % (var,value) + cmd = '%s=%s' % (var, value) self._send_nowait(cmd) time.sleep(0.02) @@ -182,6 +182,7 @@ def _send_nowait(self, x): def _object_class(self): return PSageElement + class PSageElement(SageElement): def is_locked(self): return self.parent().is_locked() diff --git a/src/sage/interfaces/r.py b/src/sage/interfaces/r.py index bdf50dbfed9..80a6ea27c74 100644 --- a/src/sage/interfaces/r.py +++ b/src/sage/interfaces/r.py @@ -1085,7 +1085,7 @@ def call(self, function_name, *args, **kwds): """ return self.function_call(function_name, args=args, kwds=kwds) - def _an_element_impl(self): + def _an_element_(self): """ Returns an element belonging to the R interpreter. This is used behind the scenes when doing things like comparisons, etc. @@ -1094,7 +1094,7 @@ def _an_element_impl(self): EXAMPLES:: - sage: r._an_element_impl() # optional - rpy2 + sage: r._an_element_() # optional - rpy2 [1] 0 sage: type(_) # optional - rpy2 diff --git a/src/sage/interfaces/scilab.py b/src/sage/interfaces/scilab.py index b1fd5c1d983..3229fd3d82c 100644 --- a/src/sage/interfaces/scilab.py +++ b/src/sage/interfaces/scilab.py @@ -217,7 +217,7 @@ class Scilab(Expect): 505. """ def __init__(self, maxread=None, script_subdirectory=None, - logfile=None, server=None,server_tmpdir=None, + logfile=None, server=None, server_tmpdir=None, seed=None): """ Initializes the Scilab class. @@ -324,8 +324,8 @@ def eval(self, command, *args, **kwds): sage: scilab.eval("d=44") # optional - scilab 'd =\n \n 44.' """ - s = Expect.eval(self, command, **kwds).replace("\x1b[?1l\x1b>","").strip() - return s + s = Expect.eval(self, command, **kwds) + return s.replace("\x1b[?1l\x1b>", "").strip() def whos(self, name=None, typ=None): """ @@ -358,14 +358,14 @@ def set(self, var, value): sage: scilab.get('a') # optional - scilab '\n \n 123.' """ - cmd = '%s=%s;' % (var,value) + cmd = '%s=%s;' % (var, value) out = self.eval(cmd) if out.find("error") != -1: raise TypeError("Error executing code in Scilab\nCODE:\n\t%s\nScilab ERROR:\n\t%s" % (cmd, out)) def get(self, var): """ - Get the value of the variable var. + Get the value of the variable ``var``. EXAMPLES:: @@ -374,7 +374,7 @@ def get(self, var): sage: scilab.get('b') # optional - scilab '\n \n 124.' """ - s = self.eval('%s' % var) + s = self.eval(f'{var}') i = s.find('=') return s[i+1:] @@ -416,9 +416,9 @@ def sage2scilab_matrix_string(self, A): sage: A = M33([1,2,3,4,5,6,7,8,0]) # optional - scilab sage: scilab.sage2scilab_matrix_string(A) # optional - scilab '[1, 2, 3; 4, 5, 6; 7, 8, 0]' - """ - return str(A.rows()).replace('), (', '; ').replace('(', '').replace(')','') + s = str(A.rows()) + return s.replace('), (', '; ').replace('(', '').replace(')', '') def _object_class(self): """ diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py index c380731f8b7..ffecf1eddbd 100644 --- a/src/sage/interfaces/sympy.py +++ b/src/sage/interfaces/sympy.py @@ -52,8 +52,10 @@ ################################################################ # Distributed under GNU GPL3, see www.gnu.org ################################################################ +from sage.misc.misc import run_once + -################# numbers and constants ############## +# ################ numbers and constants ############## def _sympysage_float(self): """ @@ -66,6 +68,7 @@ def _sympysage_float(self): from sage.rings.real_mpfr import create_RealNumber return create_RealNumber(str(self)) + def _sympysage_integer_ring(self): r""" EXAMPLES:: @@ -77,6 +80,7 @@ def _sympysage_integer_ring(self): from sage.rings.integer_ring import ZZ return ZZ + def _sympysage_integer(self): """ EXAMPLES:: @@ -90,6 +94,7 @@ def _sympysage_integer(self): from sage.rings.integer import Integer return Integer(self.p) + def _sympysage_rational(self): """ EXAMPLES:: @@ -102,6 +107,7 @@ def _sympysage_rational(self): from sage.rings.rational import Rational return Rational((Integer(self.p), Integer(self.q))) + def _sympysage_rational_field(self): r""" EXAMPLES:: @@ -113,6 +119,7 @@ def _sympysage_rational_field(self): from sage.rings.rational_field import QQ return QQ + def _sympysage_real_interval(self): r""" EXAMPLES:: @@ -139,6 +146,7 @@ def _sympysage_real_interval(self): domain = self.dom._sage_().fraction_field() return RIF(domain(self.a)).union(RIF(domain(self.b))) + def _sympysage_complex_interval(self): r""" EXAMPLES:: @@ -165,6 +173,7 @@ def _sympysage_complex_interval(self): domain = self.dom._sage_().fraction_field() return CIF(domain(self.ax), domain(self.ay)).union(CIF(domain(self.bx), domain(self.by))) + def _sympysage_polynomial_ring(self): r""" EXAMPLES:: @@ -185,6 +194,7 @@ def _sympysage_polynomial_ring(self): variables = ','.join(map(str, self.gens)) return base_ring[variables] + def _sympysage_polynomial(self): r""" EXAMPLES:: @@ -217,6 +227,7 @@ def _sympysage_polynomial(self): R = base_ring[variables] return R.sum(base_ring(coeff) * R.monomial(*exp) for exp, coeff in self.rep.terms(order=None)) + def _sympysage_pinfty(self): """ EXAMPLES:: @@ -228,6 +239,7 @@ def _sympysage_pinfty(self): from sage.rings.infinity import PlusInfinity return PlusInfinity() + def _sympysage_ninfty(self): """ EXAMPLES:: @@ -239,6 +251,7 @@ def _sympysage_ninfty(self): from sage.rings.infinity import MinusInfinity return MinusInfinity() + def _sympysage_uinfty(self): """ EXAMPLES:: @@ -250,6 +263,7 @@ def _sympysage_uinfty(self): from sage.rings.infinity import unsigned_infinity return unsigned_infinity + def _sympysage_nan(self): """ EXAMPLES:: @@ -261,6 +275,7 @@ def _sympysage_nan(self): from sage.symbolic.constants import NaN return NaN + def _sympysage_e(self): """ EXAMPLES:: @@ -272,6 +287,7 @@ def _sympysage_e(self): from sage.symbolic.constants import e return e + def _sympysage_pi(self): """ EXAMPLES:: @@ -283,6 +299,7 @@ def _sympysage_pi(self): from sage.symbolic.constants import pi return pi + def _sympysage_golden_ratio(self): """ EXAMPLES:: @@ -294,6 +311,7 @@ def _sympysage_golden_ratio(self): from sage.symbolic.constants import golden_ratio return golden_ratio + def _sympysage_eulerg(self): """ EXAMPLES:: @@ -305,6 +323,7 @@ def _sympysage_eulerg(self): from sage.symbolic.constants import euler_gamma return euler_gamma + def _sympysage_catalan(self): """ EXAMPLES:: @@ -316,6 +335,7 @@ def _sympysage_catalan(self): from sage.symbolic.constants import catalan return catalan + def _sympysage_i(self): """ EXAMPLES:: @@ -327,7 +347,8 @@ def _sympysage_i(self): from sage.symbolic.constants import I return I -################## basic operators ############## + +# ################# basic operators ############## def _sympysage_add(self): """ @@ -343,6 +364,7 @@ def _sympysage_add(self): s += x._sage_() return s + def _sympysage_mul(self): """ EXAMPLES:: @@ -357,6 +379,7 @@ def _sympysage_mul(self): s *= x._sage_() return s + def _sympysage_pow(self): """ EXAMPLES:: @@ -368,6 +391,7 @@ def _sympysage_pow(self): """ return self.args[0]._sage_()**self.args[1]._sage_() + def _sympysage_symbol(self): """ EXAMPLES:: @@ -399,7 +423,7 @@ def _sympysage_Subs(self): return args[0]._sage_().subs(substi) -############## functions ############### +# ############# functions ############### def _sympysage_function_by_name(fname): """ @@ -432,6 +456,7 @@ def _sympysage_function_by_name(fname): raise AttributeError return func + # the convoluted class structure with metaclasses and stuff sympy uses # to implement undefined functions makes things a bit harder for us # here @@ -452,7 +477,8 @@ def __get__(self, ins, typ): return lambda: _sympysage_function_by_name(typ.__name__) else: args = [arg._sage_() for arg in ins.args] - return lambda : _sympysage_function_by_name(ins.__class__.__name__)(*args) + return lambda: _sympysage_function_by_name(ins.__class__.__name__)(*args) + def _sympysage_function(self): """ @@ -485,6 +511,7 @@ def _sympysage_function(self): return func(*args) + def _sympysage_integral(self): """ EXAMPLES:: @@ -510,6 +537,7 @@ def _sympysage_integral(self): f = integral(f, (x._sage_(), a._sage_(), b._sage_()), hold=True) return f + def _sympysage_derivative(self): """ EXAMPLES:: @@ -547,6 +575,7 @@ def _sympysage_derivative(self): for a in (arg if isinstance(arg, (tuple, Tuple)) else [arg])] return derivative(f, *args) + def _sympysage_order(self): """ EXAMPLES:: @@ -559,6 +588,7 @@ def _sympysage_order(self): from sage.functions.other import Order return Order(self.args[0])._sage_() + def _sympysage_lambertw(self): """ EXAMPLES:: @@ -570,6 +600,7 @@ def _sympysage_lambertw(self): from sage.functions.log import lambert_w return lambert_w(self.args[0]._sage_()) + def _sympysage_rf(self): """ EXAMPLES:: @@ -583,6 +614,7 @@ def _sympysage_rf(self): from sage.arith.misc import rising_factorial return rising_factorial(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_ff(self): """ EXAMPLES:: @@ -596,6 +628,7 @@ def _sympysage_ff(self): from sage.arith.misc import falling_factorial return falling_factorial(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_lgamma(self): """ EXAMPLES:: @@ -607,6 +640,7 @@ def _sympysage_lgamma(self): from sage.functions.gamma import log_gamma return log_gamma(self.args[0]._sage_()) + def _sympysage_polygamma(self): """ EXAMPLES:: @@ -622,7 +656,8 @@ def _sympysage_polygamma(self): integrate(psi(x), x) """ from sage.functions.gamma import psi - return psi(self.args[0]._sage_(),self.args[1]._sage_()) + return psi(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_dirac_delta(self): """ @@ -635,6 +670,7 @@ def _sympysage_dirac_delta(self): from sage.functions.generalized import dirac_delta return dirac_delta(self.args[0]._sage_()) + def _sympysage_heaviside(self): """ EXAMPLES:: @@ -646,6 +682,7 @@ def _sympysage_heaviside(self): from sage.functions.generalized import heaviside return heaviside(self.args[0]._sage_()) + def _sympysage_expint(self): """ EXAMPLES:: @@ -659,6 +696,7 @@ def _sympysage_expint(self): from sage.functions.exp_integral import exp_integral_e return exp_integral_e(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_hyp(self): """ EXAMPLES:: @@ -674,6 +712,7 @@ def _sympysage_hyp(self): bq = [arg._sage_() for arg in self.args[1]] return hypergeometric(ap, bq, self.argument._sage_()) + def _sympysage_elliptic_k(self): """ EXAMPLES:: @@ -685,6 +724,7 @@ def _sympysage_elliptic_k(self): from sage.functions.special import elliptic_kc return elliptic_kc(self.args[0]._sage_()) + def _sympysage_kronecker_delta(self): """ EXAMPLES:: @@ -698,6 +738,7 @@ def _sympysage_kronecker_delta(self): from sage.functions.generalized import kronecker_delta return kronecker_delta(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_ceiling(self): """ EXAMPLES:: @@ -711,6 +752,7 @@ def _sympysage_ceiling(self): from sage.functions.other import ceil return ceil(self.args[0]._sage_()) + def _sympysage_piecewise(self): """ EXAMPLES:: @@ -727,7 +769,8 @@ def _sympysage_piecewise(self): -y*z + cases(((log(x) != 0, x^y/log(x)), (1, y))) """ from sage.functions.other import cases - return cases([(p.cond._sage_(),p.expr._sage_()) for p in self.args]) + return cases([(p.cond._sage_(), p.expr._sage_()) for p in self.args]) + def _sympysage_fresnels(self): """ @@ -743,6 +786,7 @@ def _sympysage_fresnels(self): from sage.functions.error import fresnel_sin return fresnel_sin(self.args[0]._sage_()) + def _sympysage_fresnelc(self): """ EXAMPLES:: @@ -757,6 +801,7 @@ def _sympysage_fresnelc(self): from sage.functions.error import fresnel_cos return fresnel_cos(self.args[0]._sage_()) + def _sympysage_besselj(self): """ EXAMPLES:: @@ -770,6 +815,7 @@ def _sympysage_besselj(self): from sage.functions.bessel import bessel_J return bessel_J(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_bessely(self): """ EXAMPLES:: @@ -783,6 +829,7 @@ def _sympysage_bessely(self): from sage.functions.bessel import bessel_Y return bessel_Y(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_besseli(self): """ EXAMPLES:: @@ -796,6 +843,7 @@ def _sympysage_besseli(self): from sage.functions.bessel import bessel_I return bessel_I(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_besselk(self): """ EXAMPLES:: @@ -809,6 +857,7 @@ def _sympysage_besselk(self): from sage.functions.bessel import bessel_K return bessel_K(self.args[0]._sage_(), self.args[1]._sage_()) + def _sympysage_ynm(self): """ EXAMPLES:: @@ -825,6 +874,7 @@ def _sympysage_ynm(self): self.args[2]._sage_(), self.args[3]._sage_()) + def _sympysage_re(self): """ EXAMPLES:: @@ -836,6 +886,7 @@ def _sympysage_re(self): from sage.functions.other import real_part return real_part(self.args[0]._sage_()) + def _sympysage_im(self): """ EXAMPLES:: @@ -847,6 +898,7 @@ def _sympysage_im(self): from sage.functions.other import imag_part return imag_part(self.args[0]._sage_()) + def _sympysage_abs(self): """ EXAMPLES:: @@ -858,6 +910,7 @@ def _sympysage_abs(self): from sage.functions.other import abs_symbolic return abs_symbolic(self.args[0]._sage_()) + def _sympysage_crootof(self): """ EXAMPLES:: @@ -876,6 +929,7 @@ def _sympysage_crootof(self): from sage.symbolic.ring import SR return complex_root_of(self.args[0]._sage_(), SR(self.args[1])) + def _sympysage_matrix(self): """ Convert SymPy matrix ``self`` to Sage. @@ -940,7 +994,6 @@ def _sympysage_matrix(self): [x - 1 1] sage: M == MutatedM False - """ try: return self._sage_object @@ -960,7 +1013,7 @@ def _sympysage_matrix(self): coercion_model = get_coercion_model() try: base_ring = coercion_model.common_parent(*d.values()) - except TypeError: # no common canonical parent + except TypeError: # no common canonical parent base_ring = SR result = matrix(base_ring, rows, cols, d, sparse=isinstance(self, SparseMatrix), @@ -969,6 +1022,7 @@ def _sympysage_matrix(self): self._sage_object = result return result + def _sympysage_relational(self): """ EXAMPLES:: @@ -990,9 +1044,10 @@ def _sympysage_relational(self): """ from operator import eq, ne, gt, lt, ge, le from sympy import Eq, Ne, Gt, Ge, Lt, Le - ops = {Eq : eq, Ne : ne, Gt : gt, Lt : lt, Ge : ge, Le : le} + ops = {Eq: eq, Ne: ne, Gt: gt, Lt: lt, Ge: ge, Le: le} return ops.get(self.func)(self.lhs._sage_(), self.rhs._sage_()) + def _sympysage_false(self): """ EXAMPLES:: @@ -1004,6 +1059,7 @@ def _sympysage_false(self): from sage.symbolic.ring import SR return SR(False) + def _sympysage_true(self): """ EXAMPLES:: @@ -1016,8 +1072,8 @@ def _sympysage_true(self): return SR(True) -#------------------------------------------------------------------ -from sage.misc.misc import run_once +# ------------------------------------------------------------------ + @run_once def sympy_init(): @@ -1044,12 +1100,13 @@ def sympy_init(): from sympy import Mul, Pow, Symbol, Subs from sympy.core.function import (Function, AppliedUndef, Derivative) from sympy.core.numbers import (Float, Integer, Rational, Infinity, - NegativeInfinity, ComplexInfinity, Exp1, Pi, GoldenRatio, - EulerGamma, Catalan, ImaginaryUnit) + NegativeInfinity, ComplexInfinity, + Exp1, Pi, GoldenRatio, + EulerGamma, Catalan, ImaginaryUnit) from sympy.core.numbers import NaN as sympy_nan from sympy.core.relational import Relational from sympy.functions.combinatorial.factorials import (RisingFactorial, - FallingFactorial) + FallingFactorial) from sympy.functions.elementary.complexes import (re, im, Abs) from sympy.functions.elementary.exponential import LambertW from sympy.functions.elementary.integers import ceiling @@ -1137,6 +1194,7 @@ def sympy_init(): BooleanTrue._sage_ = _sympysage_true ceiling._sage_ = _sympysage_ceiling + def check_expression(expr, var_symbols, only_from_sympy=False): """ Does ``eval(expr)`` both in Sage and SymPy and does other checks. @@ -1178,6 +1236,7 @@ def check_expression(expr, var_symbols, only_from_sympy=False): assert S(e_sage) == e_sympy assert e_sage == SR(e_sympy) + def test_all(): """ Call some tests that were originally in SymPy. @@ -1242,14 +1301,14 @@ def test_issue_4023(): from sage.symbolic.ring import SR from sage.functions.all import log from sympy import integrate, simplify - a,x = SR.var("a x") - i = integrate(log(x)/a, (x, a, a + 1)) + a, x = SR.var("a x") + i = integrate(log(x) / a, (x, a, a + 1)) i2 = simplify(i) s = SR(i2) - assert s == (a*log(1 + a) - a*log(a) + log(1 + a) - 1)/a + assert s == (a * log(1 + a) - a * log(a) + log(1 + a) - 1) / a def test_integral(): - #test Sympy-->Sage + # test Sympy-->Sage check_expression("Integral(x, (x,))", "x", only_from_sympy=True) check_expression("Integral(x, (x, 0, 1))", "x", only_from_sympy=True) check_expression("Integral(x*y, (x,), (y, ))", "x,y", only_from_sympy=True) @@ -1270,13 +1329,13 @@ def test_undefined_function(): from sympy import Symbol, Function f = function('f') sf = Function('f') - x,y = SR.var('x y') + x, y = SR.var('x y') sx = Symbol('x') sy = Symbol('y') assert f(x)._sympy_() == sf(sx) assert f(x) == sf(sx)._sage_() - assert f(x,y)._sympy_() == sf(sx, sy) - assert f(x,y) == sf(sx, sy)._sage_() + assert f(x, y)._sympy_() == sf(sx, sy) + assert f(x, y) == sf(sx, sy)._sage_() assert f._sympy_() == sf assert f == sf._sage_() @@ -1288,7 +1347,7 @@ def test_undefined_function(): test_functions() test_issue_4023() test_integral() - #test_integral_failing() + # test_integral_failing() test_undefined_function() @@ -1308,7 +1367,7 @@ def sympy_set_to_list(set, vars): if isinstance(set, (And, Or, Relational)): if isinstance(set, And): return [[item for rel in set._args[0] - for item in sympy_set_to_list(rel, vars) ]] + for item in sympy_set_to_list(rel, vars)]] elif isinstance(set, Or): return [sympy_set_to_list(iv, vars) for iv in set._args[0]] elif isinstance(set, Relational): diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py index 6053d2519e4..253253620bd 100644 --- a/src/sage/interfaces/tachyon.py +++ b/src/sage/interfaces/tachyon.py @@ -673,14 +673,14 @@ properly. """ -#***************************************************************************** +# **************************************************************************** # Copyright (C) 2006 John E. Stone # # Distributed under the terms of the GNU General Public License (GPL) # as published by the Free Software Foundation; either version 2 of # the License, or (at your option) any later version. -# http://www.gnu.org/licenses/ -#***************************************************************************** +# https://www.gnu.org/licenses/ +# **************************************************************************** import os import re @@ -804,8 +804,8 @@ def __call__(self, model, outfile='sage.png', verbose=1, extra_opts=''): if self.version() >= '0.99.2': # this keyword was changed in 0.99.2 model = model.replace( - " focallength ", - " focaldist ") + " focallength ", + " focaldist ") modelfile = tmp_filename(ext='.dat') with open(modelfile, 'w') as file: file.write(model) diff --git a/src/sage/libs/coxeter3/coxeter_group.py b/src/sage/libs/coxeter3/coxeter_group.py index f0d29fec436..bb5a3bc024a 100644 --- a/src/sage/libs/coxeter3/coxeter_group.py +++ b/src/sage/libs/coxeter3/coxeter_group.py @@ -321,7 +321,7 @@ def kazhdan_lusztig_polynomial(self, u, v, constant_term_one=True): basis to the `(T_w)_{w\in W}` of the Hecke algebra of `W` with parameters `q` and `q^{-1}`: - .. MATH:: C_w = \sum_u P_{u,w} T_w + .. MATH:: C_w = \sum_u P_{u,w} T_u. In particular, `P_{u,u}=1`:: diff --git a/src/sage/libs/pari/__init__.py b/src/sage/libs/pari/__init__.py index 95b93560892..44d159ef3c1 100644 --- a/src/sage/libs/pari/__init__.py +++ b/src/sage/libs/pari/__init__.py @@ -1,3 +1,4 @@ +# sage.doctest: needs sage.rings.real_mpfr """ Interface between Sage and PARI @@ -51,6 +52,7 @@ functions). For instance, if we want to use the PARI library to compute ``sqrt(pi)`` with a precision of 100 bits:: + sage: # needs sage.symbolic sage: R = RealField(100) sage: s = R(pi); s 3.1415926535897932384626433833 diff --git a/src/sage/libs/pari/convert_gmp.pyx b/src/sage/libs/pari/convert_gmp.pyx index 4a38bd5f527..8be1dad5cb9 100644 --- a/src/sage/libs/pari/convert_gmp.pyx +++ b/src/sage/libs/pari/convert_gmp.pyx @@ -172,7 +172,7 @@ cdef Gen rational_matrix(mpq_t** B, long nr, long nc) noexcept: EXAMPLES:: - sage: matrix(QQ,2,[1..6]).__pari__() # indirect doctest + sage: matrix(QQ,2,[1..6]).__pari__() # indirect doctest # needs sage.modules [1, 2, 3; 4, 5, 6] """ sig_on() diff --git a/src/sage/libs/pari/convert_sage.pyx b/src/sage/libs/pari/convert_sage.pyx index 7ee32b27b28..3f21ae46ab4 100644 --- a/src/sage/libs/pari/convert_sage.pyx +++ b/src/sage/libs/pari/convert_sage.pyx @@ -27,16 +27,30 @@ from sage.libs.pari.convert_gmp cimport INT_to_mpz, new_gen_from_mpz_t, new_gen_ from sage.ext.stdsage cimport PY_NEW from sage.libs.gmp.mpz cimport mpz_fits_slong_p, mpz_sgn, mpz_get_ui, mpz_set, mpz_set_si, mpz_set_ui from sage.libs.gmp.mpq cimport mpq_denref, mpq_numref +from sage.misc.lazy_import import LazyImport from sage.rings.integer cimport smallInteger -from sage.rings.real_mpfr import RealField -from sage.rings.complex_mpfr import ComplexField -from sage.rings.number_field.number_field import QuadraticField -from sage.matrix.args cimport (MatrixArgs, MA_ENTRIES_SEQ_SEQ, - MA_ENTRIES_SEQ_FLAT, MA_ENTRIES_CALLABLE, - MA_ENTRIES_UNKNOWN, MA_ENTRIES_SCALAR) -from sage.rings.padics.factory import Qp from sage.rings.infinity import Infinity +try: + from sage.rings.real_mpfr import RealField + from sage.rings.complex_mpfr import ComplexField +except ImportError: + pass + +try: + from sage.rings.number_field.number_field import QuadraticField +except ImportError: + pass +else: + QQi = QuadraticField(-1, 'i') + +try: + from sage.rings.padics.factory import Qp +except ImportError: + pass + +pari_typ_to_entries_type = LazyImport('sage.libs.pari.convert_sage_matrix', 'pari_typ_to_entries_type') + cpdef gen_to_sage(Gen z, locals=None) noexcept: """ @@ -117,15 +131,15 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: 15 sage: z = pari('1.234'); z 1.234000000000000000000000000000000000000000000000000000000000000000000 - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.real_mpfr 1.234000000000000000000000000000000000000000000000000000000000000000000000000 - sage: a.parent() + sage: a.parent() # needs sage.rings.real_mpfr Real Field with 256 bits of precision sage: pari.set_real_precision(15) 70 - sage: a = gen_to_sage(pari('1.234')); a + sage: a = gen_to_sage(pari('1.234')); a # needs sage.rings.real_mpfr 1.23400000000000000 - sage: a.parent() + sage: a.parent() # needs sage.rings.real_mpfr Real Field with 64 bits of precision For complex numbers, the parent depends on the PARI type:: @@ -134,37 +148,37 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: 3 + I sage: z.type() 't_COMPLEX' - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.number_field i + 3 - sage: a.parent() + sage: a.parent() # needs sage.rings.number_field Number Field in i with defining polynomial x^2 + 1 with i = 1*I sage: z = pari('(3+I)/2'); z 3/2 + 1/2*I - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.number_field 1/2*i + 3/2 - sage: a.parent() + sage: a.parent() # needs sage.rings.number_field Number Field in i with defining polynomial x^2 + 1 with i = 1*I sage: z = pari('1.0 + 2.0*I'); z 1.00000000000000 + 2.00000000000000*I - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.real_mpfr 1.00000000000000000 + 2.00000000000000000*I - sage: a.parent() + sage: a.parent() # needs sage.rings.real_mpfr Complex Field with 64 bits of precision sage: z = pari('1 + 1.0*I'); z 1 + 1.00000000000000*I - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.real_mpfr 1.00000000000000000 + 1.00000000000000000*I - sage: a.parent() + sage: a.parent() # needs sage.rings.real_mpfr Complex Field with 64 bits of precision sage: z = pari('1.0 + 1*I'); z 1.00000000000000 + I - sage: a = gen_to_sage(z); a + sage: a = gen_to_sage(z); a # needs sage.rings.real_mpfr 1.00000000000000000 + 1.00000000000000000*I - sage: a.parent() + sage: a.parent() # needs sage.rings.real_mpfr Complex Field with 64 bits of precision Converting polynomials:: @@ -179,6 +193,7 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: sage: parent(gen_to_sage(f, {'x': x, 'y': y})) Multivariate Polynomial Ring in x, y over Rational Field + sage: # needs sage.symbolic sage: x,y = SR.var('x,y') sage: gen_to_sage(f, {'x': x, 'y': y}) 2/3*x^3 + x + y - 5/7 @@ -192,6 +207,7 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: Converting vectors:: + sage: # needs sage.rings.number_field sage.rings.real_mpfr sage: z1 = pari('[-3, 2.1, 1+I]'); z1 [-3, 2.10000000000000, 1 + I] sage: z2 = pari('[1.0*I, [1,2]]~'); z2 @@ -224,6 +240,8 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: sage: z = pari('[1,2;3,4]') sage: z.type() 't_MAT' + + sage: # needs sage.modules sage: a = gen_to_sage(z); a [1 2] [3 4] @@ -232,6 +250,7 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: Conversion of p-adics:: + sage: # needs sage.rings.padics sage: z = pari('569 + O(7^8)'); z 2 + 4*7 + 4*7^2 + 7^3 + O(7^8) sage: a = gen_to_sage(z); a @@ -294,20 +313,14 @@ cpdef gen_to_sage(Gen z, locals=None) noexcept: C = ComplexField(sage_prec) return C(R(real), R(imag)) else: - K = QuadraticField(-1, 'i') - return K([gen_to_sage(real), gen_to_sage(imag)]) + return QQi([gen_to_sage(real), gen_to_sage(imag)]) elif t == t_VEC or t == t_COL: return [gen_to_sage(x, locals) for x in z.python_list()] elif t == t_VECSMALL: return z.python_list_small() elif t == t_MAT: - nc = lg(g) - 1 - nr = 0 if nc == 0 else lg(gel(g,1)) - 1 - ma = MatrixArgs.__new__(MatrixArgs) - ma.nrows = nr - ma.ncols = nc - ma.entries = [gen_to_sage(z[i,j], locals) for i in range(nr) for j in range(nc)] - return ma.matrix() + from .convert_sage_matrix import gen_to_sage_matrix + return gen_to_sage_matrix(z, locals) elif t == t_PADIC: p = z.padicprime() K = Qp(Integer(p), precp(g)) @@ -330,7 +343,7 @@ cpdef set_integer_from_gen(Integer self, Gen x) noexcept: r""" EXAMPLES:: - sage: [Integer(pari(x)) for x in [1, 2^60, 2., GF(3)(1), GF(9,'a')(2)]] + sage: [Integer(pari(x)) for x in [1, 2^60, 2., GF(3)(1), GF(9,'a')(2)]] # needs sage.rings.finite_rings [1, 1152921504606846976, 2, 1, 2] sage: Integer(pari(2.1)) # indirect doctest Traceback (most recent call last): @@ -390,7 +403,7 @@ cpdef set_rational_from_gen(Rational self, Gen x) noexcept: r""" EXAMPLES:: - sage: [Rational(pari(x)) for x in [1, 1/2, 2^60, 2., GF(3)(1), GF(9,'a')(2)]] + sage: [Rational(pari(x)) for x in [1, 1/2, 2^60, 2., GF(3)(1), GF(9,'a')(2)]] # needs sage.rings.finite_rings [1, 1/2, 1152921504606846976, 2, 1, 2] sage: Rational(pari(2.1)) # indirect doctest Traceback (most recent call last): @@ -576,83 +589,3 @@ cpdef list pari_prime_range(long c_start, long c_stop, bint py_ints=False) noexc res.append(z) NEXT_PRIME_VIADIFF(p, pari_prime_ptr) return res - - -def pari_typ_to_entries_type(MatrixArgs self): - """ - Determine the ``entries_type`` of a :class:`sage.matrix.args.MatrixArgs` - with PARI entries. - - This will modify the entries. - - TESTS: - - ``MA_ENTRIES_SEQ_SEQ``:: - - sage: from sage.libs.pari.convert_sage import pari_typ_to_entries_type - sage: from sage.matrix.args import MatrixArgs - sage: ma = MatrixArgs(QQ, entries=pari("[1,2;3,4]")) - sage: 0x10_03 == pari_typ_to_entries_type(ma) - True - - ``MA_ENTRIES_SEQ_FLAT``:: - - sage: ma = MatrixArgs(QQ, entries=pari("[1,2]")) - sage: 0x10_04 == pari_typ_to_entries_type(ma) - True - sage: ma = MatrixArgs(QQ, entries=pari(vector([1,2]))) - sage: 0x10_04 == pari_typ_to_entries_type(ma) - True - sage: ma = MatrixArgs(QQ, entries=pari(matrix(2, range(4))[0])) - sage: 0x10_04 == pari_typ_to_entries_type(ma) - True - - ``MA_ENTRIES_CALLABLE``:: - - sage: ma = MatrixArgs(QQ, entries=pari(lambda x: x)) - sage: 0x13_06 == pari_typ_to_entries_type(ma) - True - - ``MA_ENTRIES_SCALAR``:: - - sage: ma = MatrixArgs(QQ, entries=pari(1/2)) - sage: 0x17_02 == pari_typ_to_entries_type(ma) - True - - ``MA_ENTRIES_UNKNOWN``:: - - sage: ma = MatrixArgs(QQ, entries=pari('"2"')) - sage: 0 == pari_typ_to_entries_type(ma) - True - - A second call gives an error:: - - sage: ma = MatrixArgs(QQ, entries=pari("[1,2]")) - sage: 0x10_04 == pari_typ_to_entries_type(ma) - True - sage: 0x10_04 == pari_typ_to_entries_type(ma) - Traceback (most recent call last): - ... - ValueError: entries are not a PARI generator - """ - if not isinstance(self.entries, Gen): - raise ValueError("entries are not a PARI generator") - cdef long t = typ((self.entries).g) - if t == t_MAT: - R = self.base - if R is None: - self.entries = self.entries.Col().sage() - else: - self.entries = [[R(x) for x in v] - for v in self.entries.mattranspose()] - return MA_ENTRIES_SEQ_SEQ - elif t in [t_VEC, t_COL, t_VECSMALL, t_LIST]: - self.entries = self.entries.sage() - return MA_ENTRIES_SEQ_FLAT - elif t == t_CLOSURE: - return MA_ENTRIES_CALLABLE - elif t == t_STR: - return MA_ENTRIES_UNKNOWN - else: - self.entries = self.entries.sage() - return MA_ENTRIES_SCALAR diff --git a/src/sage/libs/pari/convert_sage_complex_double.pyx b/src/sage/libs/pari/convert_sage_complex_double.pyx index d4022c62a0f..b97c3831c75 100644 --- a/src/sage/libs/pari/convert_sage_complex_double.pyx +++ b/src/sage/libs/pari/convert_sage_complex_double.pyx @@ -1,3 +1,5 @@ +# sage.doctest: needs sage.rings.complex_double + from cysignals.signals cimport sig_on, sig_off from sage.libs.gsl.complex cimport * @@ -25,7 +27,7 @@ cpdef ComplexDoubleElement pari_to_cdf(Gen g) noexcept: Traceback (most recent call last): ... PariError: overflow in t_REAL->double conversion - sage: CDF(pari(x^2 + 5)) + sage: CDF(pari(x^2 + 5)) # needs sage.symbolic Traceback (most recent call last): ... PariError: incorrect type in gtofp (t_POL) diff --git a/src/sage/libs/pari/convert_sage_matrix.pyx b/src/sage/libs/pari/convert_sage_matrix.pyx new file mode 100644 index 00000000000..dd14eb17abf --- /dev/null +++ b/src/sage/libs/pari/convert_sage_matrix.pyx @@ -0,0 +1,105 @@ +# sage_setup: distribution = sagemath-pari +# sage.doctest: needs sage.modules + +from cypari2.gen cimport Gen +from cypari2.types cimport (GEN, typ, t_INT, t_FRAC, t_REAL, t_COMPLEX, + t_INTMOD, t_PADIC, t_INFINITY, t_VEC, t_COL, + t_VECSMALL, t_MAT, t_STR, + lg, precp) +from cypari2.paridecl cimport * + +from sage.matrix.args cimport (MatrixArgs, MA_ENTRIES_SEQ_SEQ, + MA_ENTRIES_SEQ_FLAT, MA_ENTRIES_CALLABLE, + MA_ENTRIES_UNKNOWN, MA_ENTRIES_SCALAR) + +from .convert_sage cimport gen_to_sage + +def gen_to_sage_matrix(Gen z, locals=None): + cdef GEN g = z.g + nc = lg(g) - 1 + nr = 0 if nc == 0 else lg(gel(g,1)) - 1 + ma = MatrixArgs.__new__(MatrixArgs) + ma.nrows = nr + ma.ncols = nc + ma.entries = [gen_to_sage(z[i,j], locals) for i in range(nr) for j in range(nc)] + return ma.matrix() + + +def pari_typ_to_entries_type(MatrixArgs self): + """ + Determine the ``entries_type`` of a :class:`sage.matrix.args.MatrixArgs` + with PARI entries. + + This will modify the entries. + + TESTS: + + ``MA_ENTRIES_SEQ_SEQ``:: + + sage: from sage.libs.pari.convert_sage import pari_typ_to_entries_type + sage: from sage.matrix.args import MatrixArgs + sage: ma = MatrixArgs(QQ, entries=pari("[1,2;3,4]")) + sage: 0x10_03 == pari_typ_to_entries_type(ma) + True + + ``MA_ENTRIES_SEQ_FLAT``:: + + sage: ma = MatrixArgs(QQ, entries=pari("[1,2]")) + sage: 0x10_04 == pari_typ_to_entries_type(ma) + True + sage: ma = MatrixArgs(QQ, entries=pari(vector([1,2]))) + sage: 0x10_04 == pari_typ_to_entries_type(ma) + True + sage: ma = MatrixArgs(QQ, entries=pari(matrix(2, range(4))[0])) + sage: 0x10_04 == pari_typ_to_entries_type(ma) + True + + ``MA_ENTRIES_CALLABLE``:: + + sage: ma = MatrixArgs(QQ, entries=pari(lambda x: x)) + sage: 0x13_06 == pari_typ_to_entries_type(ma) + True + + ``MA_ENTRIES_SCALAR``:: + + sage: ma = MatrixArgs(QQ, entries=pari(1/2)) + sage: 0x17_02 == pari_typ_to_entries_type(ma) + True + + ``MA_ENTRIES_UNKNOWN``:: + + sage: ma = MatrixArgs(QQ, entries=pari('"2"')) + sage: 0 == pari_typ_to_entries_type(ma) + True + + A second call gives an error:: + + sage: ma = MatrixArgs(QQ, entries=pari("[1,2]")) + sage: 0x10_04 == pari_typ_to_entries_type(ma) + True + sage: 0x10_04 == pari_typ_to_entries_type(ma) + Traceback (most recent call last): + ... + ValueError: entries are not a PARI generator + """ + if not isinstance(self.entries, Gen): + raise ValueError("entries are not a PARI generator") + cdef long t = typ((self.entries).g) + if t == t_MAT: + R = self.base + if R is None: + self.entries = self.entries.Col().sage() + else: + self.entries = [[R(x) for x in v] + for v in self.entries.mattranspose()] + return MA_ENTRIES_SEQ_SEQ + elif t in [t_VEC, t_COL, t_VECSMALL, t_LIST]: + self.entries = self.entries.sage() + return MA_ENTRIES_SEQ_FLAT + elif t == t_CLOSURE: + return MA_ENTRIES_CALLABLE + elif t == t_STR: + return MA_ENTRIES_UNKNOWN + else: + self.entries = self.entries.sage() + return MA_ENTRIES_SCALAR diff --git a/src/sage/libs/pari/convert_sage_real_mpfr.pxd b/src/sage/libs/pari/convert_sage_real_mpfr.pxd new file mode 100644 index 00000000000..a7674309255 --- /dev/null +++ b/src/sage/libs/pari/convert_sage_real_mpfr.pxd @@ -0,0 +1,6 @@ +from cypari2.gen cimport Gen + +from sage.rings.real_mpfr cimport RealNumber + +cpdef Gen new_gen_from_real_mpfr_element(RealNumber self) +cpdef bint set_real_mpfr_element_from_gen(RealNumber self, Gen x) diff --git a/src/sage/libs/pari/convert_sage_real_mpfr.pyx b/src/sage/libs/pari/convert_sage_real_mpfr.pyx new file mode 100644 index 00000000000..119944a5209 --- /dev/null +++ b/src/sage/libs/pari/convert_sage_real_mpfr.pyx @@ -0,0 +1,107 @@ +# sage.doctest: needs sage.rings.real_mpfr + +from cypari2.stack cimport new_gen +from cypari2.paridecl cimport * +from cysignals.signals cimport sig_on, sig_off + +from sage.libs.gmp.mpz cimport * +from sage.libs.mpfr cimport * +from sage.libs.mpfr.types cimport mpfr_t, mpfr_prec_t +from sage.rings.real_mpfr cimport RealField_class, RealField + + +cpdef Gen new_gen_from_real_mpfr_element(RealNumber self): + + # This uses interfaces of MPFR and PARI which are documented + # (and not marked subject-to-change). It could be faster + # by using internal interfaces of MPFR, which are documented + # as subject-to-change. + + if mpfr_nan_p(self.value) or mpfr_inf_p(self.value): + raise ValueError('cannot convert NaN or infinity to Pari float') + + # wordsize for PARI + cdef unsigned long wordsize = sizeof(long)*8 + + cdef mpfr_prec_t prec + prec = (self._parent)._prec + + # We round up the precision to the nearest multiple of wordsize. + cdef int rounded_prec + rounded_prec = (self.prec() + wordsize - 1) & ~(wordsize - 1) + + # Yes, assigning to self works fine, even in Cython. + if rounded_prec > prec: + self = RealField(rounded_prec)(self) + + cdef mpz_t mantissa + cdef mp_exp_t exponent + cdef GEN pari_float + + sig_on() + if mpfr_zero_p(self.value): + pari_float = real_0_bit(-rounded_prec) + else: + # Now we can extract the mantissa, and it will be normalized + # (the most significant bit of the most significant word will be 1). + mpz_init(mantissa) + exponent = mpfr_get_z_exp(mantissa, self.value) + + # Create a PARI REAL + pari_float = cgetr(2 + rounded_prec / wordsize) + pari_float[1] = evalexpo(exponent + rounded_prec - 1) + evalsigne(mpfr_sgn(self.value)) + mpz_export(&pari_float[2], NULL, 1, wordsize // 8, 0, 0, mantissa) + mpz_clear(mantissa) + + return new_gen(pari_float) + + +cpdef bint set_real_mpfr_element_from_gen(RealNumber self, Gen x): + r""" + EXAMPLES:: + + sage: rt2 = sqrt(pari('2.0')) + sage: rt2 + 1.41421356237310 + sage: rt2.sage() + 1.41421356237309505 + sage: rt2.sage().prec() + 64 + sage: pari(rt2.sage()) == rt2 + True + sage: for i in range(100, 200): + ....: assert(sqrt(pari(i)) == pari(sqrt(pari(i)).sage())) + sage: (-3.1415).__pari__().sage() + -3.14150000000000000 + """ + cdef GEN g = x.g + + if typ((x).g) != t_REAL: + return False + + cdef int sgn + sgn = signe(g) + + if sgn == 0: + mpfr_set_ui(self.value, 0, MPFR_RNDN) + return True + + cdef int wordsize = 8 * sizeof(long) + + cdef mpz_t mantissa + mpz_init(mantissa) + mpz_import(mantissa, lg(g) - 2, 1, wordsize/8, 0, 0, &g[2]) + + cdef mp_exp_t exponent = expo(g) + + # Round to nearest for best results when setting a low-precision + # MPFR from a high-precision GEN + mpfr_set_z(self.value, mantissa, MPFR_RNDN) + mpfr_mul_2si(self.value, self.value, exponent - wordsize * (lg(g) - 2) + 1, MPFR_RNDN) + + if sgn < 0: + mpfr_neg(self.value, self.value, MPFR_RNDN) + + mpz_clear(mantissa) + + return True diff --git a/src/sage/libs/pari/tests.py b/src/sage/libs/pari/tests.py index 97d1ec95893..5605d232d9e 100644 --- a/src/sage/libs/pari/tests.py +++ b/src/sage/libs/pari/tests.py @@ -10,17 +10,17 @@ Creating PARI objects:: - sage: pari(Matrix(2,2,range(4))) + sage: pari(Matrix(2,2,range(4))) # needs sage.modules [0, 1; 2, 3] - sage: pari(x^2-3) + sage: pari(x^2-3) # needs sage.symbolic x^2 - 3 The following example caused Sage to crash before :trac:`20630`:: sage: R. = QQ[] - sage: K. = NumberField(theta^2 + 1) - sage: K.absolute_polynomial().galois_group(pari_group=True) + sage: K. = NumberField(theta^2 + 1) # needs sage.rings.number_field + sage: K.absolute_polynomial().galois_group(pari_group=True) # needs sage.groups sage.rings.number_field PARI group [2, -1, 1, "S2"] of degree 2 Before :trac:`15654`, this used to take a very long time. @@ -28,9 +28,9 @@ sage: pari.allocatemem(200000) PARI stack size set to 200000 bytes, maximum size set to ... - sage: x = polygen(ZpFM(3,10)) - sage: pol = ((x-1)^50 + x) - sage: pari(pol).poldisc() + sage: x = polygen(ZpFM(3,10)) # needs sage.rings.padics + sage: pol = ((x-1)^50 + x) # needs sage.rings.padics + sage: pari(pol).poldisc() # needs sage.rings.padics 2*3 + 3^4 + 2*3^6 + 3^7 + 2*3^8 + 2*3^9 + O(3^10) This used to give the wrong answer before :trac:`23259`:: @@ -59,21 +59,22 @@ Number fields:: + sage: # needs sage.rings.number_field sage: x = polygen(QQ) sage: K. = NumberField(x^4 - 4*x^2 + 1) sage: pari(K).nf_get_pol() y^4 - 4*y^2 + 1 sage: L. = K.extension(x^2 - 5) - sage: pari(L).nf_get_pol() # Absolute + sage: pari(L).nf_get_pol() # Absolute y^8 - 28*y^6 + 208*y^4 - 408*y^2 + 36 - sage: L.pari_rnf().nf_get_pol() # Relative + sage: L.pari_rnf().nf_get_pol() # Relative x^2 - 5 - sage: K.pari_nf().nf_get_pol() y^4 - 4*y^2 + 1 sage: K.pari_bnf().nf_get_pol() y^4 - 4*y^2 + 1 + sage: # needs sage.rings.number_field sage: K. = QuadraticField(-65) sage: G = K.pari_bnf().bnf_get_gen(); G [[3, 2; 0, 1], [2, 1; 0, 1]] @@ -82,23 +83,23 @@ Conversions:: + sage: # needs sage.rings.number_field sage: K. = QuadraticField(-1) sage: F = pari(K).idealfactor(K.ideal(5)); F [[5, [-2, 1]~, 1, 1, [2, -1; 1, 2]], 1; [5, [2, 1]~, 1, 1, [-2, -1; 1, -2]], 1] sage: F[0,0].pr_get_p() 5 - - sage: K. = QuadraticField(-1) sage: J = pari(K).idealstar(K.ideal(4*i + 2)) sage: J.bid_get_cyc() [4, 2] - sage: int(pari(RealField(63)(2^63-1))) + sage: int(pari(RealField(63)(2^63 - 1))) # needs sage.rings.real_mpfr 9223372036854775807 # 32-bit 9223372036854775807 # 64-bit - sage: int(pari(RealField(63)(2^63+2))) + sage: int(pari(RealField(63)(2^63 + 2))) # needs sage.rings.real_mpfr 9223372036854775810 + sage: # needs sage.rings.padics sage: K = Qp(11,5) sage: x = K(11^-10 + 5*11^-7 + 11^-6) sage: y = pari(x) @@ -107,8 +108,9 @@ sage: y.padicprime().type() 't_INT' + sage: # needs sage.rings.finite_rings sage: x = polygen(GF(3)) - sage: k. = GF(9, modulus=x^2+1) + sage: k. = GF(9, modulus=x^2 + 1) sage: b = pari(a).ffprimroot() sage: b # random a + 1 @@ -125,20 +127,21 @@ Conversion from matrices and vectors is supported:: - sage: a = pari(matrix(2,3,[1,2,3,4,5,6])); a, a.type() + sage: a = pari(matrix(2,3,[1,2,3,4,5,6])); a, a.type() # needs sage.modules ([1, 2, 3; 4, 5, 6], 't_MAT') - sage: v = vector([1.2, 3.4, 5.6]) - sage: pari(v) + sage: v = vector([1.2, 3.4, 5.6]) # needs sage.modules + sage: pari(v) # needs sage.modules [1.20000000000000, 3.40000000000000, 5.60000000000000] Some more exotic examples:: + sage: # needs sage.rings.number_field sage: K. = NumberField(polygen(QQ)^3 - 2) sage: pari(K) [y^3 - 2, [1, 1], -108, 1, [[1, 1.25992104989487, 1.58740105196820; 1, -0.629960524947437 + 1.09112363597172*I, -0.793700525984100 - 1.37472963699860*I], [1, 1.25992104989487, 1.58740105196820; 1, 0.461163111024285, -2.16843016298270; 1, -1.72108416091916, 0.581029111014503], [16, 20, 25; 16, 7, -35; 16, -28, 9], [3, 0, 0; 0, 0, 6; 0, 6, 0], [6, 0, 0; 0, 6, 0; 0, 0, 3], [2, 0, 0; 0, 0, 1; 0, 1, 0], [2, [0, 0, 2; 1, 0, 0; 0, 1, 0]], [2, 3]], [1.25992104989487, -0.629960524947437 + 1.09112363597172*I], [1, y, y^2], [1, 0, 0; 0, 1, 0; 0, 0, 1], [1, 0, 0, 0, 0, 2, 0, 2, 0; 0, 1, 0, 1, 0, 0, 0, 0, 2; 0, 0, 1, 0, 1, 0, 1, 0, 0]] - sage: E = EllipticCurve('37a1') - sage: pari(E) + sage: E = EllipticCurve('37a1') # needs sage.schemes + sage: pari(E) # needs sage.schemes [0, 0, 1, -1, 0, 0, -2, 1, -1, 48, -216, 37, 110592/37, Vecsmall([1]), [Vecsmall([64, 1])], [0, 0, 0, 0, 0, 0, 0, 0]] Deprecation checks:: @@ -405,6 +408,8 @@ -1 sage: pari(3/4).ceil() 1 + + sage: # needs sage.symbolic sage: x = SR.symbol('x') sage: pari(x).ceil() x @@ -493,6 +498,8 @@ [1, 2, 4] sage: pari([[1.1,2.2],[3.3,4.4]]).floor() [[1, 2], [3, 4]] + + sage: # needs sage.symbolic sage: x = SR.symbol('x') sage: pari(x).floor() x @@ -500,6 +507,7 @@ x + 1 sage: pari(x^2+5*x+2.5).floor() x^2 + 5*x + 2.50000000000000 + sage: pari('"hello world"').floor() Traceback (most recent call last): ... @@ -507,7 +515,7 @@ sage: pari(1.75).frac() 0.750000000000000 - sage: pari(sqrt(2)).frac() + sage: pari(sqrt(2)).frac() # needs sage.symbolic 0.414213562373095 sage: pari('sqrt(-2)').frac() Traceback (most recent call last): @@ -516,7 +524,7 @@ sage: pari('1+2*I').imag() 2 - sage: pari(sqrt(-2)).imag() + sage: pari(sqrt(-2)).imag() # needs sage.symbolic 1.41421356237310 sage: pari('x+I').imag() 1 @@ -536,13 +544,13 @@ sage: b.lift() -17*x^2 - 3*x - sage: pari(pi).sign() + sage: pari(pi).sign() # needs sage.symbolic 1 sage: pari(0).sign() 0 sage: pari(-1/2).sign() -1 - sage: pari(SR(I)).sign() + sage: pari(SR(I)).sign() # needs sage.symbolic Traceback (most recent call last): ... PariError: incorrect type in gsigne (t_COMPLEX) @@ -705,16 +713,16 @@ 1.04719755119660 sage: pari(1.1).acos() 0.443568254385115*I - sage: C. = ComplexField() - sage: pari(1.1+i).acos() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1.1+i).acos() # needs sage.rings.real_mpfr 0.849343054245252 - 1.09770986682533*I sage: pari(2).acosh() 1.31695789692482 sage: pari(0).acosh() 1.57079632679490*I - sage: C. = ComplexField() - sage: pari(i).acosh() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(i).acosh() # needs sage.rings.real_mpfr 0.881373587019543 + 1.57079632679490*I sage: pari(2).agm(2) @@ -723,12 +731,12 @@ 0 sage: pari(1).agm(2) 1.45679103104691 - sage: C. = ComplexField() - sage: pari(1+i).agm(-3) + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).agm(-3) # needs sage.rings.real_mpfr -0.964731722290876 + 1.15700282952632*I - sage: C. = ComplexField() - sage: pari(2+i).arg() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(2+i).arg() # needs sage.rings.real_mpfr 0.463647609000806 sage: pari(pari(0.5).sin()).asin() @@ -738,14 +746,14 @@ sage: pari(2).asinh() 1.44363547517881 - sage: C. = ComplexField() - sage: pari(2+i).asinh() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(2+i).asinh() # needs sage.rings.real_mpfr 1.52857091948100 + 0.427078586392476*I sage: pari(1).atan() 0.785398163397448 - sage: C. = ComplexField() - sage: pari(1.5+i).atan() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1.5+i).atan() # needs sage.rings.real_mpfr 1.10714871779409 + 0.255412811882995*I sage: pari(0).atanh() @@ -763,6 +771,8 @@ 0.412710032209716 sage: pari(2).besseli(3) 2.24521244092995 + + sage: # needs sage.rings.real_mpfr sage: C. = ComplexField() sage: pari(2).besseli(3+i) 1.12539407613913 + 2.08313822670661*I @@ -772,37 +782,37 @@ sage: pari(1.5).cos() 0.0707372016677029 - sage: C. = ComplexField() - sage: pari(1+i).cos() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).cos() # needs sage.rings.real_mpfr 0.833730025131149 - 0.988897705762865*I sage: pari('x+O(x^8)').cos() 1 - 1/2*x^2 + 1/24*x^4 - 1/720*x^6 + 1/40320*x^8 + O(x^9) sage: pari(1.5).cosh() 2.35240961524325 - sage: C. = ComplexField() - sage: pari(1+i).cosh() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).cosh() # needs sage.rings.real_mpfr 0.833730025131149 + 0.988897705762865*I sage: pari('x+O(x^8)').cosh() 1 + 1/2*x^2 + 1/24*x^4 + 1/720*x^6 + ...O(...) sage: pari(5).cotan() -0.295812915532746 - sage: x = RR(pi) + sage: x = RR(pi) # needs sage.symbolic sage: pari(x).cotan() # random -8.17674825 E15 sage: pari(1).dilog() 1.64493406684823 - sage: C. = ComplexField() - sage: pari(1+i).dilog() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).dilog() # needs sage.rings.real_mpfr 0.616850275068085 + 1.46036211675312*I sage: pari(1).erfc() 0.157299207050285 - sage: C. = ComplexField() - sage: pari(i).eta() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(i).eta() # needs sage.rings.real_mpfr 0.998129069925959 sage: pari(0).exp() @@ -816,8 +826,8 @@ 1.00000000000000 sage: pari(5).gamma() 24.0000000000000 - sage: C. = ComplexField() - sage: pari(1+i).gamma() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).gamma() # needs sage.rings.real_mpfr 0.498015668118356 - 0.154949828301811*I sage: pari(-1).gamma() Traceback (most recent call last): @@ -828,23 +838,23 @@ 1.32934038817914 sage: pari(5).gammah() 52.3427777845535 - sage: C. = ComplexField() - sage: pari(1+i).gammah() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).gammah() # needs sage.rings.real_mpfr 0.575315188063452 + 0.0882106775440939*I sage: pari(1).hyperu(2,3) 0.333333333333333 - sage: C. = ComplexField() - sage: pari(1+i).incgam(3-i) + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).incgam(3-i) # needs sage.rings.real_mpfr -0.0458297859919946 + 0.0433696818726677*I sage: pari(1).incgamc(2) 0.864664716763387 sage: pari(5).log() 1.60943791243410 - sage: C. = ComplexField() - sage: pari(i).log() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(i).log() # needs sage.rings.real_mpfr 0.E-19 + 1.57079632679490*I sage: pari(100).lngamma() @@ -857,14 +867,14 @@ sage: pari(1).sin() 0.841470984807897 - sage: C. = ComplexField() - sage: pari(1+i).sin() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).sin() # needs sage.rings.real_mpfr 1.29845758141598 + 0.634963914784736*I sage: pari(0).sinh() 0.E-19 - sage: C. = ComplexField() - sage: pari(1+i).sinh() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(1+i).sinh() # needs sage.rings.real_mpfr 0.634963914784736 + 1.29845758141598*I sage: pari(2).sqrt() @@ -877,14 +887,14 @@ sage: pari(2).tan() -2.18503986326152 - sage: C. = ComplexField() - sage: pari(i).tan() + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: pari(i).tan() # needs sage.rings.real_mpfr 0.761594155955765*I sage: pari(1).tanh() 0.761594155955765 - sage: C. = ComplexField() - sage: z = pari(i); z + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: z = pari(i); z # needs sage.rings.real_mpfr 1.00000000000000*I sage: result = z.tanh() sage: result.real() <= 1e-18 @@ -901,6 +911,7 @@ sage: pari(0.5).thetanullk(1) 0.548978532560341 + sage: # needs sage.rings.real_mpfr sage: C. = ComplexField() sage: pari(i).weber() 1.18920711500272 @@ -911,8 +922,8 @@ sage: pari(2).zeta() 1.64493406684823 - sage: x = RR(pi)^2/6 - sage: pari(x) + sage: x = RR(pi)^2/6 # needs sage.symbolic + sage: pari(x) # needs sage.symbolic 1.64493406684823 sage: pari(3).zeta() 1.20205690315959 @@ -966,6 +977,7 @@ sage: pari('[1,2,3; 4,5,6; 7,8,9]').mathnf() [6, 1; 3, 1; 0, 1] + sage: # needs sage.modules sage: M = matrix([[1,2,3],[4,5,6],[7,8,11]]) sage: d = M.det() sage: pari(M).mathnfmod(d) @@ -976,6 +988,7 @@ sage: pari(M).mathnfmod(12) [1, 0, 0; 0, 2, 0; 0, 0, 6] + sage: # needs sage.modules sage: M = matrix([[1,0,0],[0,2,0],[0,0,6]]) sage: pari(M).mathnfmodid(6) [1, 0, 0; 0, 2, 0; 0, 0, 6] @@ -1007,6 +1020,7 @@ Quadratic forms:: + sage: # needs sage.modules sage: A = Matrix(3,3,[1,2,3,2,5,5,3,5,11]) sage: A.is_positive_definite() True @@ -1029,6 +1043,7 @@ 10, 5.00000000000000000, [ 1 2 0 1 -1] ] + sage: # needs sage.modules sage: M = diagonal_matrix([1,1,-1]) sage: P = M.__pari__().qfparam([0,1,-1]); P [0, -2, 0; 1, 0, -1; -1, 0, -1] @@ -1042,6 +1057,7 @@ sage: 48^2 + 55^2 == 73^2 True + sage: # needs sage.modules sage: M = diagonal_matrix([1,2,3,4,-5]) sage: M.__pari__().qfsolve() [0, 1, -1, 0, -1]~ @@ -1087,6 +1103,7 @@ sage: pari(10).eulerphi() 4 + sage: # needs sage.symbolic sage: x = SR.symbol('x') sage: pari(10).gcd(15) 5 @@ -1153,6 +1170,7 @@ sage: pari(2003).ffinit(3) Mod(1, 2003)*x^3 + Mod(1, 2003)*x^2 + Mod(1993, 2003)*x + Mod(1995, 2003) + sage: # needs sage.rings.finite_rings sage: k. = GF(2^12) sage: g = pari(a).ffprimroot() sage: (g^1234).fflog(g) @@ -1167,6 +1185,7 @@ sage: (b^555).fflog(b, (ord, ord.factor()) ) 555 + sage: # needs sage.rings.finite_rings sage: k. = GF(5^80) sage: g = pari(a).ffprimroot() sage: g.fforder() @@ -1178,6 +1197,7 @@ p-adic functions:: + sage: # needs sage.rings.padics sage: K = Qp(11,5) sage: x = K(11^-10 + 5*11^-7 + 11^-6) sage: y = pari(x) @@ -1201,10 +1221,10 @@ [0, 1/2, 0, -3/4, 0, 2, -3/2, 0, -9/16, 40, -116, 117/4, 256000/117, Vecsmall([1]), [Vecsmall([64, 1])], [0, 0, 0, 0, 0, 0, 0, 0]] sage: pari([0,0.5,0,-0.75,0]).ellinit() [0, 0.500000000000000, 0, -0.750000000000000, 0, 2.00000000000000, -1.50000000000000, 0, -0.562500000000000, 40.0000000000000, -116.000000000000, 29.2500000000000, 2188.03418803419, Vecsmall([0]), [Vecsmall([64, 1])], [0, 0, 0, 0]] - sage: pari([0,SR(I),0,1,0]).ellinit() + sage: pari([0,SR(I),0,1,0]).ellinit() # needs sage.symbolic [0, I, 0, 1, 0, 4*I, 2, 0, -1, -64, 352*I, -80, 16384/5, Vecsmall([0]), [Vecsmall([64, 0])], [0, 0, 0, 0]] - sage: x = SR.symbol('x') - sage: pari([0,x,0,2*x,1]).ellinit() + sage: x = SR.symbol('x') # needs sage.symbolic + sage: pari([0,x,0,2*x,1]).ellinit() # needs sage.symbolic [0, x, 0, 2*x, 1, 4*x, 4*x, 4, -4*x^2 + 4*x, 16*x^2 - 96*x, -64*x^3 + 576*x^2 - 864, 64*x^4 - 576*x^3 + 576*x^2 - 432, (256*x^6 - 4608*x^5 + 27648*x^4 - 55296*x^3)/(4*x^4 - 36*x^3 + 36*x^2 - 27), Vecsmall([0]), [Vecsmall([64, 0])], [0, 0, 0, 0]] sage: e = pari([0,1,1,-2,0]).ellinit() @@ -1233,6 +1253,8 @@ sage: e = pari([0, 5, 2, -1, 1]).ellinit() sage: e.ellglobalred() [20144, [1, -2, 0, -1], 1, [2, 4; 1259, 1], [[4, 2, 0, 1], [1, 5, 0, 1]]] + + sage: # needs sage.schemes sage: e = pari(EllipticCurve('17a').a_invariants()).ellinit() sage: e.ellglobalred() [17, [1, 0, 0, 0], 4, Mat([17, 1]), [[1, 8, 0, 4]]] @@ -1251,8 +1273,9 @@ sage: e.ellak(0) 0 + sage: # needs sage.schemes sage: E = EllipticCurve('389a1') - sage: pari(E).ellanalyticrank() + sage: pari(E).ellanalyticrank() # needs sage.rings.number_field [2, 1.51863300057685] sage: e = pari([0, -1, 1, -10, -20]).ellinit() @@ -1291,6 +1314,7 @@ sage: om.elleisnum(100) 2.15314248576078 E50 + sage: # needs sage.schemes sage: e = pari([0,0,0,0,1]).ellinit() sage: e.elllocalred(7) [0, 1, [1, 0, 0, 0], 1] @@ -1331,6 +1355,7 @@ sage: e.elllocalred(3) [2, -10, [1, 0, 0, 0], 4] + sage: # needs sage.schemes sage: e = pari(EllipticCurve('65a1').a_invariants()).ellinit() sage: e.ellorder([0,0]) 2 @@ -1340,11 +1365,11 @@ sage: e = pari([0,1,1,-2,0]).ellinit() sage: e.ellordinate(0) [0, -1] - sage: e.ellordinate(SR(I)) + sage: e.ellordinate(SR(I)) # needs sage.symbolic [0.582203589721741 - 1.38606082464177*I, -1.58220358972174 + 1.38606082464177*I] - sage: e.ellordinate(SR(I), precision=128)[0].sage() + sage: e.ellordinate(SR(I), precision=128)[0].sage() # needs sage.symbolic 0.58220358972174117723338947874993600727 - 1.3860608246417697185311834209833653345*I - sage: e.ellordinate(1+3*5^1+O(5^3)) + sage: e.ellordinate(1+3*5^1+O(5^3)) # needs sage.rings.padics [4*5 + 5^2 + O(5^3), 4 + 3*5^2 + O(5^3)] sage: e.ellordinate('z+2*z^2+O(z^4)') [-2*z - 7*z^2 - 23*z^3 + O(z^4), -1 + 2*z + 7*z^2 + 23*z^3 + O(z^4)] @@ -1365,9 +1390,9 @@ [0] sage: e.ellmul(p, 2) [1/4, -7/8] - sage: q = e.ellmul(p, SR(1+I)); q + sage: q = e.ellmul(p, SR(1+I)); q # needs sage.symbolic [-2*I, 1 + I] - sage: e.ellmul(q, SR(1-I)) + sage: e.ellmul(q, SR(1-I)) # needs sage.symbolic [1/4, -7/8] sage: for D in [-7, -8, -11, -12, -16, -19, -27, -28]: # long time (1s) ....: hcpol = hilbert_class_polynomial(D) @@ -1397,6 +1422,7 @@ sage: e.ellrootno(1009) 1 + sage: # needs sage.rings.real_mpfr sage: e = pari([0,0,0,1,0]).ellinit() sage: C. = ComplexField() sage: e.ellsigma(2+i) @@ -1409,26 +1435,26 @@ sage: e = pari([0,0,0,1,0]).ellinit() sage: e.ellzeta(1) 1.06479841295883 - sage: C. = ComplexField() - sage: e.ellzeta(i-1) + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: e.ellzeta(i-1) # needs sage.rings.real_mpfr -0.350122658523049 - 0.350122658523049*I sage: e = pari([0,0,0,1,0]).ellinit() - sage: C. = ComplexField() - sage: e.ellztopoint(1+i) + sage: C. = ComplexField() # needs sage.rings.real_mpfr + sage: e.ellztopoint(1+i) # needs sage.rings.real_mpfr [0.E-... - 1.02152286795670*I, -0.149072813701096 - 0.149072813701096*I] sage: e.ellztopoint(0) [0] - sage: pari(SR(I)).ellj() + sage: pari(SR(I)).ellj() # needs sage.symbolic 1728.00000000000 - sage: pari(SR(3*I)).ellj() + sage: pari(SR(3*I)).ellj() # needs sage.symbolic 153553679.396729 sage: pari('quadgen(-3)').ellj() 0.E-54 sage: pari('quadgen(-7)').ellj(precision=256).sage() -3375.000000000000000000000000000000000000000000000000000000000000000000000000 - sage: pari(SR(-I)).ellj() + sage: pari(SR(-I)).ellj() # needs sage.symbolic Traceback (most recent call last): ... PariError: domain error in modular function: Im(argument) <= 0 @@ -1497,16 +1523,17 @@ General number fields:: sage: x = polygen(QQ) - sage: K. = NumberField(x^2 - 1/8) - sage: pari(x^2 - 2).factornf(K.pari_polynomial("a")) + sage: K. = NumberField(x^2 - 1/8) # needs sage.rings.number_field + sage: pari(x^2 - 2).factornf(K.pari_polynomial("a")) # needs sage.rings.number_field doctest:...: DeprecationWarning: the PARI/GP function factornf is obsolete (2016-08-08) [x + Mod(-a, a^2 - 2), 1; x + Mod(a, a^2 - 2), 1] - sage: K. = QuadraticField(-23) - sage: p = K.primes_above(3)[0] - sage: K.pari_bnf().bnrclassno(p._pari_bid_()) + sage: K. = QuadraticField(-23) # needs sage.rings.number_field + sage: p = K.primes_above(3)[0] # needs sage.rings.number_field + sage: K.pari_bnf().bnrclassno(p._pari_bid_()) # needs sage.rings.number_field 3 + sage: # needs sage.symbolic sage: x = SR.symbol('x') sage: P = pari(x^6 + 108) sage: G = P.galoisinit() @@ -1515,6 +1542,7 @@ sage: len(G[5]) == prod(G[7]) True + sage: # needs sage.symbolic sage: G = pari(x^6 + 108).galoisinit() sage: G.galoispermtopol(G[5]) [x, 1/12*x^4 - 1/2*x, -1/12*x^4 - 1/2*x, 1/12*x^4 + 1/2*x, -1/12*x^4 + 1/2*x, -x] @@ -1523,6 +1551,7 @@ sage: G.galoispermtopol(G[5][1:4]) [1/12*x^4 - 1/2*x, -1/12*x^4 - 1/2*x, 1/12*x^4 + 1/2*x] + sage: # needs sage.symbolic sage: G = pari(x^4 + 1).galoisinit() sage: G.galoisfixedfield(G[5][1], flag=2) [y^2 - 2, Mod(-x^3 + x, x^4 + 1), [x^2 - y*x + 1, x^2 + y*x + 1]] @@ -1537,6 +1566,7 @@ sage: list(L[0][1]) [3, 2] + sage: # needs sage.symbolic sage: G = pari(x^6 + 108).galoisinit() sage: G.galoisisabelian() 0 @@ -1546,6 +1576,7 @@ sage: H.galoisisabelian(flag=1) 1 + sage: # needs sage.symbolic sage: G = pari(x^6 + 108).galoisinit() sage: L = G.galoissubgroups() sage: G.galoisisnormal(L[0]) @@ -1553,18 +1584,20 @@ sage: G.galoisisnormal(L[2]) 0 + sage: # needs sage.rings.number_field sage: F = QuadraticField(5, 'alpha') sage: nf = F.__pari__() sage: P = F.ideal(F.gen()) sage: Q = F.ideal(2) - sage: moduli = pari.matrix(2,2,[P.pari_prime(),4,Q.pari_prime(),4]) + sage: moduli = pari.matrix(2,2,[P.pari_prime(),4,Q.pari_prime(),4]) # needs sage.symbolic sage: residues = pari.vector(2,[0,1]) - sage: b = F(nf.idealchinese(moduli,residues)) - sage: b.valuation(P) >= 4 + sage: b = F(nf.idealchinese(moduli,residues)) # needs sage.symbolic + sage: b.valuation(P) >= 4 # needs sage.symbolic True sage: (b-1).valuation(Q) >= 2 True + sage: # needs sage.symbolic sage: F = NumberField(x^3-2, 'alpha') sage: nf = F.__pari__() sage: x = pari('[1, -1, 2]~') @@ -1573,17 +1606,19 @@ 1 sage: y = pari('[2, -2, 4]~') - sage: nf.idealcoprime(x, y) + sage: nf.idealcoprime(x, y) # needs sage.rings.number_field [5/43, 9/43, -1/43]~ + sage: # needs sage.rings.number_field sage: R. = PolynomialRing(QQ) sage: K. = NumberField(x^2 + 1) sage: L = K.pari_nf().ideallist(100) - sage: L[0] # One ideal of norm 1. + sage: L[0] # One ideal of norm 1. # needs sage.symbolic [[1, 0; 0, 1]] - sage: L[64] # 4 ideals of norm 65. + sage: L[64] # 4 ideals of norm 65. # needs sage.symbolic [[65, 8; 0, 1], [65, 47; 0, 1], [65, 18; 0, 1], [65, 57; 0, 1]] + sage: # needs sage.rings.number_field sage: F = NumberField(x^3-2, 'alpha') sage: nf = F.__pari__() sage: I = pari('[1, -1, 2]~') @@ -1591,12 +1626,14 @@ sage: nf.ideallog(5, bid) [25]~ + sage: # needs sage.rings.number_field sage: K. = QuadraticField(-1) sage: F = pari(K).idealprimedec(5); F [[5, [-2, 1]~, 1, 1, [2, -1; 1, 2]], [5, [2, 1]~, 1, 1, [-2, -1; 1, -2]]] sage: F[0].pr_get_p() 5 + sage: # needs sage.rings.number_field sage: x = polygen(ZZ) sage: F = NumberField(x^3 - 2, 'alpha') sage: nf = F.__pari__() @@ -1604,6 +1641,7 @@ sage: nf.idealstar(I) [[[43, 9, 5; 0, 1, 0; 0, 0, 1], [0]], [42, [42]], [Mat([[43, [9, 1, 0]~, 1, 1, [-5, 2, -18; -9, -5, 2; 1, -9, -5]], 1]), Mat([[43, [9, 1, 0]~, 1, 1, [-5, 2, -18; -9, -5, 2; 1, -9, -5]], 1])], [[[[42], [3], [43, 9, 5; 0, 1, 0; 0, 0, 1], [[[-14, -8, 20]~, [1, 34, 38], [43, [9, 1, 0]~, 1, 1, [-5, 2, -18; -9, -5, 2; 1, -9, -5]]]~, 3, [42, [2, 1; 3, 1; 7, 1]]]]], [[], Vecsmall([])]], [Mat(1)]] + sage: # needs sage.rings.number_field sage: x = polygen(QQ) sage: K. = NumberField(x^3 - 17) sage: Kpari = K.pari_nf() @@ -1616,12 +1654,14 @@ sage: Kpari.getattr('zk') * pari("[3/2, -5, 0]~") -5/3*y^2 + 5/3*y - 1/6 + sage: # needs sage.rings.number_field sage: k. = NumberField(x^2 + 5) sage: x = 10 sage: y = a + 1 sage: pari(k).nfeltdiveuc(x, y) [2, -2]~ + sage: # needs sage.rings.number_field sage: x = polygen(ZZ) sage: k. = NumberField(x^2 + 5) sage: I = k.ideal(a) @@ -1641,6 +1681,7 @@ sage: nf.nfgaloisconj() [-x, x]~ + sage: # needs sage.rings.number_field sage: x = polygen(QQ) sage: K. = NumberField(x^3 - x + 1) sage: pari(K).nfhilbert(t, t + 2) @@ -1652,6 +1693,7 @@ sage: pari(K).nfhilbert(t, t + 2, P.pari_prime()) 1 + sage: # needs sage.rings.number_field sage: F. = NumberField(x^2-x-1) sage: Fp = pari(F) sage: A = matrix(F,[[1,2,a,3],[3,0,a+2,0],[0,0,a,2],[3+a,a,0,1]]) @@ -1684,6 +1726,7 @@ ... PariError: incorrect type in checknf [please apply nfinit()] (t_REAL) + sage: # needs sage.rings.number_field sage: F = NumberField(x^3-2,'alpha') sage: G = NumberField(x^3-2,'beta') sage: F.__pari__().nfisisom(G.__pari__()) @@ -1743,6 +1786,7 @@ ... PariError: domain error in quadray: isfundamental(D) = 0 + sage: # needs sage.rings.number_field sage.symbolic sage: x = SR.symbol('x') sage: F = NumberField(x^3-2,'alpha') sage: F.__pari__()[0].nfdisc() @@ -1771,6 +1815,7 @@ sage: from cypari2 import Pari sage: pari = Pari() + sage: # needs sage.symbolic sage: f = pari('(2/3)*x^3 + x - 5/7 + y'); f 2/3*x^3 + x + (y - 5/7) sage: var('x,y') diff --git a/src/sage/matrix/args.pyx b/src/sage/matrix/args.pyx index c389feb1bc2..b69db0fb5a6 100644 --- a/src/sage/matrix/args.pyx +++ b/src/sage/matrix/args.pyx @@ -1305,7 +1305,7 @@ cdef class MatrixArgs: return MA_ENTRIES_NDARRAY return MA_ENTRIES_SCALAR if isinstance(self.entries, Gen): # PARI object - from sage.libs.pari.convert_sage import pari_typ_to_entries_type + from sage.libs.pari.convert_sage_matrix import pari_typ_to_entries_type return pari_typ_to_entries_type(self) if isinstance(self.entries, MatrixArgs): # Prevent recursion diff --git a/src/sage/misc/c3_controlled.pyx b/src/sage/misc/c3_controlled.pyx index 4a4c51cbfe7..b32d493659f 100644 --- a/src/sage/misc/c3_controlled.pyx +++ b/src/sage/misc/c3_controlled.pyx @@ -346,8 +346,8 @@ doctest:: [Category of affine Weyl groups, Category of fields, Category of finite Weyl groups, + Category of finite dimensional Hopf algebras with basis over Rational Field, Category of finite dimensional algebras with basis over Rational Field, - Category of finite dimensional hopf algebras with basis over Rational Field, Category of finite enumerated permutation groups, Category of number fields] diff --git a/src/sage/misc/cachefunc.pxd b/src/sage/misc/cachefunc.pxd index 747e9b60df0..5590c41f4d3 100644 --- a/src/sage/misc/cachefunc.pxd +++ b/src/sage/misc/cachefunc.pxd @@ -1,4 +1,4 @@ -from .function_mangling cimport ArgumentFixer +from sage.misc.function_mangling cimport ArgumentFixer cpdef dict_key(o) noexcept cpdef cache_key(o) noexcept diff --git a/src/sage/misc/latex.py b/src/sage/misc/latex.py index 602a24f404a..df469ca8189 100644 --- a/src/sage/misc/latex.py +++ b/src/sage/misc/latex.py @@ -651,6 +651,7 @@ def latex_extra_preamble(): \newcommand{\SL}{\mathrm{SL}} \newcommand{\PSL}{\mathrm{PSL}} \newcommand{\lcm}{\mathop{\operatorname{lcm}}} + \newcommand{\dist}{\mathrm{dist}} \newcommand{\Bold}[1]{\mathbf{#1}} """ diff --git a/src/sage/misc/latex_macros.py b/src/sage/misc/latex_macros.py index 238bd02c0e3..93fb11fbf48 100644 --- a/src/sage/misc/latex_macros.py +++ b/src/sage/misc/latex_macros.py @@ -174,7 +174,8 @@ def convert_latex_macro_to_mathjax(macro): # Use this list to define additional latex macros for sage documentation latex_macros = [r"\newcommand{\SL}{\mathrm{SL}}", r"\newcommand{\PSL}{\mathrm{PSL}}", - r"\newcommand{\lcm}{\mathop{\operatorname{lcm}}}"] + r"\newcommand{\lcm}{\mathop{\operatorname{lcm}}}", + r"\newcommand{\dist}{\mathrm{dist}}"] # The following is to allow customization of typesetting of rings: # mathbf vs mathbb. See latex.py for more information. diff --git a/src/sage/misc/lazy_import.pyx b/src/sage/misc/lazy_import.pyx index 0ac9fb03d95..c9b09dc1ef5 100644 --- a/src/sage/misc/lazy_import.pyx +++ b/src/sage/misc/lazy_import.pyx @@ -66,7 +66,7 @@ import os import pickle from warnings import warn import inspect -from . import sageinspect +from sage.misc import sageinspect # LazyImport.__repr__ uses try... except FeatureNotPresentError. @@ -1137,7 +1137,7 @@ def save_cache_file(): sage: sage.misc.lazy_import.save_cache_file() """ from sage.misc.temporary_file import atomic_write - from .lazy_import_cache import get_cache_file + from sage.misc.lazy_import_cache import get_cache_file global star_imports if star_imports is None: @@ -1180,7 +1180,7 @@ def get_star_imports(module_name): """ global star_imports if star_imports is None: - from .lazy_import_cache import get_cache_file + from sage.misc.lazy_import_cache import get_cache_file star_imports = {} try: with open(get_cache_file(), "rb") as cache_file: diff --git a/src/sage/misc/persist.pyx b/src/sage/misc/persist.pyx index 670a9a6ac17..5bbc32a239a 100644 --- a/src/sage/misc/persist.pyx +++ b/src/sage/misc/persist.pyx @@ -42,7 +42,7 @@ import bz2 comp = zlib comp_other = bz2 -from .sage_unittest import TestSuite +from sage.misc.sage_unittest import TestSuite # We define two global dictionaries `already_pickled` and @@ -1237,7 +1237,7 @@ def db(name): The database directory is ``$HOME/.sage/db``. """ - from .misc import SAGE_DB + from sage.misc.misc import SAGE_DB return load('%s/%s'%(SAGE_DB,name)) @@ -1250,5 +1250,5 @@ def db_save(x, name=None): try: x.db(name) except AttributeError: - from .misc import SAGE_DB + from sage.misc.misc import SAGE_DB save(x, '%s/%s'%(SAGE_DB,name)) diff --git a/src/sage/misc/sage_timeit_class.pyx b/src/sage/misc/sage_timeit_class.pyx index 5537148e358..f568886574f 100644 --- a/src/sage/misc/sage_timeit_class.pyx +++ b/src/sage/misc/sage_timeit_class.pyx @@ -6,7 +6,7 @@ The ``timeit`` command This uses the function :func:`~sage.misc.sage_timeit.sage_timeit`. """ -from . import sage_timeit +from sage.misc import sage_timeit class SageTimeit: diff --git a/src/sage/modular/hecke/algebra.py b/src/sage/modular/hecke/algebra.py index 4ccc6d0b1bf..e0f539a507b 100644 --- a/src/sage/modular/hecke/algebra.py +++ b/src/sage/modular/hecke/algebra.py @@ -181,9 +181,11 @@ def __init__(self, M): self.__M = M CommutativeAlgebra.__init__(self, M.base_ring()) - def _an_element_impl(self): + def _an_element_(self): r""" - Return an element of this algebra. Used by the coercion machinery. + Return an element of this algebra. + + Used by the coercion machinery. EXAMPLES:: diff --git a/src/sage/modular/modform_hecketriangle/abstract_ring.py b/src/sage/modular/modform_hecketriangle/abstract_ring.py index f28917578af..3b68a6e505c 100644 --- a/src/sage/modular/modform_hecketriangle/abstract_ring.py +++ b/src/sage/modular/modform_hecketriangle/abstract_ring.py @@ -17,6 +17,7 @@ # **************************************************************************** from sage.algebras.free_algebra import FreeAlgebra + from sage.misc.cachefunc import cached_method from sage.rings.fraction_field import FractionField from sage.rings.infinity import infinity @@ -30,7 +31,6 @@ from .series_constructor import MFSeriesConstructor -# Maybe replace Parent by just SageObject? class FormsRing_abstract(Parent): r""" Abstract (Hecke) forms ring. @@ -80,20 +80,20 @@ def __init__(self, group, base_ring, red_hom, n): """ # from graded_ring import canonical_parameters - # (group, base_ring, red_hom, n) = canonical_parameters(group, base_ring, red_hom, n) + # group, base_ring, red_hom, n = canonical_parameters(group, base_ring, red_hom, n) - # if (not group.is_arithmetic() and base_ring.characteristic()>0): + # if not group.is_arithmetic() and base_ring.characteristic()>0: # raise NotImplementedError - # if (base_ring.characteristic().divides(2*group.n()*(group.n()-2))): + # if base_ring.characteristic().divides(2*group.n()*(group.n()-2)): # raise NotImplementedError - if (base_ring.characteristic() > 0): + if base_ring.characteristic() > 0: raise NotImplementedError("only characteristic 0 is supported") self._group = group self._red_hom = red_hom self._base_ring = base_ring - self._coeff_ring = FractionField(PolynomialRing(base_ring,'d')) - self._pol_ring = PolynomialRing(base_ring,'x,y,z,d') + self._coeff_ring = FractionField(PolynomialRing(base_ring, 'd')) + self._pol_ring = PolynomialRing(base_ring, 'x,y,z,d') self._rat_field = FractionField(self._pol_ring) # default values @@ -105,8 +105,6 @@ def __init__(self, group, base_ring, red_hom, n): self.disp_prec(5) self.default_num_prec(53) - # super().__init__(self.coeff_ring()) - def _repr_(self): r""" Return the string representation of ``self``. @@ -142,7 +140,7 @@ def _element_constructor_(self, el): sage: from sage.modular.modform_hecketriangle.graded_ring import ModularFormsRing sage: MR = ModularFormsRing() - sage: (x,y,z,d) = MR.pol_ring().gens() + sage: x,y,z,d = MR.pol_ring().gens() sage: MR(x^3) f_rho^3 @@ -167,14 +165,18 @@ def _element_constructor_(self, el): from .graded_ring_element import FormsRingElement if isinstance(el, FormsRingElement): - if (self.hecke_n() == infinity and el.hecke_n() == ZZ(3)): + if self.hecke_n() == infinity and el.hecke_n() == ZZ(3): el_f = el._reduce_d()._rat - (x,y,z,d) = self.pol_ring().gens() + x, y, z, d = self.pol_ring().gens() - num_sub = el_f.numerator().subs( x=(y**2 + 3*x)/ZZ(4), y=(9*x*y - y**3)/ZZ(8), z=(3*z - y)/ZZ(2)) - denom_sub = el_f.denominator().subs( x=(y**2 + 3*x)/ZZ(4), y=(9*x*y - y**3)/ZZ(8), z=(3*z - y)/ZZ(2)) - new_num = num_sub.numerator()*denom_sub.denominator() - new_denom = denom_sub.numerator()*num_sub.denominator() + num_sub = el_f.numerator().subs(x=(y**2 + 3*x)/ZZ(4), + y=(9*x*y - y**3)/ZZ(8), + z=(3*z - y)/ZZ(2)) + denom_sub = el_f.denominator().subs(x=(y**2 + 3*x)/ZZ(4), + y=(9*x*y - y**3)/ZZ(8), + z=(3*z - y)/ZZ(2)) + new_num = num_sub.numerator() * denom_sub.denominator() + new_denom = denom_sub.numerator() * num_sub.denominator() el = self._rat_field(new_num) / self._rat_field(new_denom) elif self.group() == el.group(): @@ -225,18 +227,16 @@ def _coerce_map_from_(self, S): from .space import FormsSpace_abstract from .functors import _common_subgroup if (isinstance(S, FormsRing_abstract) - and self._group == _common_subgroup(self._group, S._group) - and self._analytic_type >= S._analytic_type - and self.base_ring().has_coerce_map_from(S.base_ring())): - return True + and self._group == _common_subgroup(self._group, S._group) + and self._analytic_type >= S._analytic_type + and self.base_ring().has_coerce_map_from(S.base_ring())): + return True if isinstance(S, FormsRing_abstract): return False if isinstance(S, FormsSpace_abstract): raise RuntimeError("this case should not occur") # return self._coerce_map_from_(S.graded_ring()) - if (self.AT("holo") <= self._analytic_type) and (self.coeff_ring().has_coerce_map_from(S)): - return True - return False + return self.AT("holo") <= self._analytic_type and self.coeff_ring().has_coerce_map_from(S) def _an_element_(self): r""" @@ -289,8 +289,7 @@ def default_prec(self, prec=None): sage: MF.default_prec() 2 """ - - if (prec is not None): + if prec is not None: self._prec = ZZ(prec) else: return self._prec @@ -359,8 +358,7 @@ def default_num_prec(self, prec=None): sage: f_rho.q_expansion_fixed_d(prec=2)[1] 9.92593243510795915276017782... """ - - if (prec is not None): + if prec is not None: self._num_prec = ZZ(prec) else: return self._num_prec @@ -444,7 +442,7 @@ def extend_type(self, analytic_type=None, ring=False): else: analytic_type = self._analytic_type.extend_by(analytic_type) - if (ring or not self.is_homogeneous()): + if ring or not self.is_homogeneous(): return FormsRing(analytic_type, group=self.group(), base_ring=self.base_ring(), red_hom=self.has_reduce_hom()) else: return FormsSpace(analytic_type, group=self.group(), base_ring=self.base_ring(), k=self.weight(), ep=self.ep()) @@ -491,13 +489,13 @@ def reduce_type(self, analytic_type=None, degree=None): else: analytic_type = self._analytic_type.reduce_to(analytic_type) - if (degree is None and not self.is_homogeneous()): + if degree is None and not self.is_homogeneous(): return FormsRing(analytic_type, group=self.group(), base_ring=self.base_ring(), red_hom=self.has_reduce_hom()) - elif (degree is None): + elif degree is None: return FormsSpace(analytic_type, group=self.group(), base_ring=self.base_ring(), k=self.weight(), ep=self.ep()) else: - (weight, ep) = degree - if (self.is_homogeneous() and (weight != self.weight() or ep != self.ep())): + weight, ep = degree + if self.is_homogeneous() and (weight != self.weight() or ep != self.ep()): analytic_type = self._analytic_type.reduce_to([]) return FormsSpace(analytic_type, group=self.group(), base_ring=self.base_ring(), k=weight, ep=ep) @@ -696,19 +694,18 @@ def get_d(self, fix_d=False, d_num_prec=None): sage: ModularFormsRing(n=5).get_d(fix_d=1).parent() Integer Ring """ - if d_num_prec is None: d_num_prec = self.default_num_prec() else: d_num_prec = ZZ(d_num_prec) - if (fix_d is True): + if fix_d is True: d = self._group.dvalue() - if (self._group.is_arithmetic()): - d = 1 / self.base_ring()(1/d) + if self._group.is_arithmetic(): + d = ~self.base_ring()(~d) else: d = self.group().dvalue().n(d_num_prec) - elif (fix_d is False): + elif fix_d is False: d = FractionField(PolynomialRing(self.base_ring(), "d")).gen() else: d = fix_d @@ -760,9 +757,8 @@ def get_q(self, prec=None, fix_d=False, d_num_prec=None): sage: ModularFormsRing(n=5).get_q(fix_d=1).parent() Power Series Ring in q over Rational Field """ - d = self.get_d(fix_d, d_num_prec) - if (prec is None): + if prec is None: prec = self.default_prec() base_ring = d.parent() @@ -812,17 +808,15 @@ def _derivative_op(self): sage: ModularFormsRing(n=infinity)._derivative_op() -X*Y*dX + X*Z*dX + 1/2*Y*Z*dY + 1/4*Z^2*dZ - 1/2*X*dY - 1/4*X*dZ """ + X, Y, Z, dX, dY, dZ = self.diff_alg().gens() - (X,Y,Z,dX,dY,dZ) = self.diff_alg().gens() + if self.hecke_n() == infinity: + return (X*Z-X*Y) * dX + ZZ(1) / 2 * (Y*Z-X) * dY \ + + ZZ(1) / 4 * (Z**2-X) * dZ - if (self.hecke_n() == infinity): - return (X*Z-X*Y) * dX\ - + ZZ(1)/ZZ(2) * (Y*Z-X) * dY\ - + ZZ(1)/ZZ(4) * (Z**2-X) * dZ - else: - return 1/self._group.n() * (X*Z-Y) * dX\ - + ZZ(1)/ZZ(2) * (Y*Z-X**(self._group.n()-1)) * dY\ - + (self._group.n()-2) / (4*self._group.n()) * (Z**2-X**(self._group.n()-2)) * dZ + return 1/self._group.n() * (X*Z-Y) * dX \ + + ZZ(1) / 2 * (Y*Z-X**(self._group.n()-1)) * dY \ + + (self._group.n()-2) / (4*self._group.n()) * (Z**2-X**(self._group.n()-2)) * dZ @cached_method def _serre_derivative_op(self): @@ -839,17 +833,15 @@ def _serre_derivative_op(self): sage: ModularFormsRing(n=infinity)._serre_derivative_op() -X*Y*dX - 1/4*Z^2*dZ - 1/2*X*dY - 1/4*X*dZ """ + X, Y, Z, dX, dY, dZ = self.diff_alg().gens() - (X,Y,Z,dX,dY,dZ) = self.diff_alg().gens() + if self.hecke_n() == infinity: + return - X * Y * dX - ZZ(1) / 2 * X * dY \ + - ZZ(1) / 4 * (Z**2+X) * dZ - if (self.hecke_n() == infinity): - return - X * Y * dX\ - - ZZ(1)/ZZ(2) * X * dY\ - - ZZ(1)/ZZ(4) * (Z**2+X) * dZ - else: - return - 1/self._group.n() * Y*dX\ - - ZZ(1)/ZZ(2) * X**(self._group.n()-1) * dY\ - - (self._group.n()-2) / (4*self._group.n()) * (Z**2+X**(self._group.n()-2)) * dZ + return - 1/self._group.n() * Y*dX \ + - ZZ(1) / 2 * X**(self._group.n()-1) * dY \ + - (self._group.n()-2) / (4*self._group.n()) * (Z**2+X**(self._group.n()-2)) * dZ @cached_method def has_reduce_hom(self): @@ -1038,8 +1030,7 @@ def homogeneous_part(self, k, ep): sage: QuasiMeromorphicModularFormsRing(n=7).homogeneous_part(k=2, ep=-1) QuasiMeromorphicModularForms(n=7, k=2, ep=-1) over Integer Ring """ - - return self.reduce_type(degree=(k,ep)) + return self.reduce_type(degree=(k, ep)) @cached_method def J_inv(self): @@ -1098,10 +1089,9 @@ def J_inv(self): sage: WeakModularForms().J_inv() 1/1728*q^-1 + 31/72 + 1823/16*q + 335840/27*q^2 + 16005555/32*q^3 + 11716352*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("weak", ring=True)(x/(x-y**2)).reduce() else: return self.extend_type("weak", ring=True)(x**self._group.n()/(x**self._group.n()-y**2)).reduce() @@ -1150,13 +1140,11 @@ def j_inv(self): sage: WeakModularForms().j_inv() q^-1 + 744 + 196884*q + 21493760*q^2 + 864299970*q^3 + 20245856256*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("weak", ring=True)(1/d*x/(x-y**2)).reduce() - else: - return self.extend_type("weak", ring=True)(1/d*x**self._group.n()/(x**self._group.n()-y**2)).reduce() + return self.extend_type("weak", ring=True)(1/d*x**self._group.n()/(x**self._group.n()-y**2)).reduce() @cached_method def f_rho(self): @@ -1227,13 +1215,11 @@ def f_rho(self): sage: ModularForms(k=4).f_rho() 1 + 240*q + 2160*q^2 + 6720*q^3 + 17520*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("holo", ring=True)(1).reduce() - else: - return self.extend_type("holo", ring=True)(x).reduce() + return self.extend_type("holo", ring=True)(x).reduce() @cached_method def f_i(self): @@ -1295,8 +1281,7 @@ def f_i(self): sage: ModularForms(k=6).f_i() 1 - 504*q - 16632*q^2 - 122976*q^3 - 532728*q^4 + O(q^5) """ - - (x,y,z,d) = self._pol_ring.gens() + x, y, z, d = self._pol_ring.gens() return self.extend_type("holo", ring=True)(y).reduce() @@ -1365,13 +1350,11 @@ def f_inf(self): sage: CuspForms(k=12).f_inf() q - 24*q^2 + 252*q^3 - 1472*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("holo", ring=True)(d*(x-y**2)).reduce() - else: - return self.extend_type("cusp", ring=True)(d*(x**self._group.n()-y**2)).reduce() + return self.extend_type("cusp", ring=True)(d*(x**self._group.n()-y**2)).reduce() @cached_method def G_inv(self): @@ -1443,12 +1426,11 @@ def G_inv(self): ... ArithmeticError: G_inv doesn't exist for odd n(=9). """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: raise ArithmeticError("G_inv doesn't exist for n={} (it is not meromorphic at -1).".format(self._group.n())) - elif (ZZ(2).divides(self._group.n())): + elif ZZ(2).divides(self._group.n()): return self.extend_type("weak", ring=True)(d*y*x**(self._group.n()/ZZ(2))/(x**self._group.n()-y**2)).reduce() else: raise ArithmeticError("G_inv doesn't exist for odd n(={}).".format(self._group.n())) @@ -1516,11 +1498,10 @@ def g_inv(self): ... ArithmeticError: g_inv doesn't exist for odd n(=9). """ - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: raise ArithmeticError("g_inv doesn't exist for n={} (it is not meromorphic at -1).".format(self._group.n())) - if (ZZ(2).divides(self._group.n())): - (x,y,z,d) = self._pol_ring.gens() + if ZZ(2).divides(self._group.n()): + x, y, z, d = self._pol_ring.gens() return self.extend_type("weak", ring=True)(1/d*y*x**(self._group.n()/ZZ(2))/(x**self._group.n()-y**2)).reduce() else: raise ArithmeticError("g_inv doesn't exist for odd n(={}).".format(self._group.n())) @@ -1592,13 +1573,11 @@ def E4(self): sage: ModularForms(k=4).E4() 1 + 240*q + 2160*q^2 + 6720*q^3 + 17520*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("holo", ring=True)(x).reduce() - else: - return self.extend_type("holo", ring=True)(x**(self._group.n()-2)).reduce() + return self.extend_type("holo", ring=True)(x**(self._group.n()-2)).reduce() @cached_method def E6(self): @@ -1659,13 +1638,11 @@ def E6(self): sage: ModularForms(k=6).E6() 1 - 504*q - 16632*q^2 - 122976*q^3 - 532728*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("holo", ring=True)(x*y).reduce() - else: - return self.extend_type("holo", ring=True)(x**(self._group.n()-3)*y).reduce() + return self.extend_type("holo", ring=True)(x**(self._group.n()-3)*y).reduce() @cached_method def Delta(self): @@ -1732,13 +1709,11 @@ def Delta(self): sage: CuspForms(k=12).Delta() q - 24*q^2 + 252*q^3 - 1472*q^4 + O(q^5) """ + x, y, z, d = self._pol_ring.gens() - (x,y,z,d) = self._pol_ring.gens() - - if (self.hecke_n() == infinity): + if self.hecke_n() == infinity: return self.extend_type("cusp", ring=True)(d*x**2*(x-y**2)).reduce() - else: - return self.extend_type("cusp", ring=True)(d*x**(2*self._group.n()-6)*(x**self._group.n()-y**2)).reduce() + return self.extend_type("cusp", ring=True)(d*x**(2*self._group.n()-6)*(x**self._group.n()-y**2)).reduce() @cached_method def E2(self): @@ -1803,9 +1778,7 @@ def E2(self): sage: QuasiModularForms(k=2).E2() 1 - 24*q - 72*q^2 - 96*q^3 - 168*q^4 + O(q^5) """ - - (x,y,z,d) = self._pol_ring.gens() - + x, y, z, d = self._pol_ring.gens() return self.extend_type(["holo", "quasi"], ring=True)(z).reduce() @cached_method @@ -1946,8 +1919,8 @@ def EisensteinSeries(self, k=None): # reduced_self is a classical ModularForms space reduced_self = extended_self.reduce_type(["holo"], degree=(QQ(k), ep)) - if (n == infinity): - l2 = ZZ(0) + if n == infinity: + l2 = ZZ.zero() l1 = ZZ((k-(1-ep)) / ZZ(4)) else: num = ZZ((k-(1-ep)*n/(n-2)) * (n-2) / ZZ(4)) @@ -1961,7 +1934,7 @@ def EisensteinSeries(self, k=None): # The non-arithmetic remaining cases (incomplete, very hard in general) # TODO: the n = infinity case(s) (doable) # TODO: the n = 5 case (hard) - if (not self.group().is_arithmetic() or n == infinity): + if not self.group().is_arithmetic() or n == infinity: raise NotImplementedError("Eisenstein series are only supported in the finite arithmetic cases") # The arithmetic cases diff --git a/src/sage/modular/modform_hecketriangle/graded_ring.py b/src/sage/modular/modform_hecketriangle/graded_ring.py index 624341c8dc7..877f6562235 100644 --- a/src/sage/modular/modform_hecketriangle/graded_ring.py +++ b/src/sage/modular/modform_hecketriangle/graded_ring.py @@ -19,8 +19,8 @@ from sage.rings.integer_ring import ZZ from sage.rings.infinity import infinity -from sage.rings.ring import CommutativeAlgebra -from sage.categories.commutative_algebras import CommutativeAlgebras +from sage.structure.parent import Parent +from sage.categories.algebras import Algebras from sage.structure.unique_representation import UniqueRepresentation from .hecke_triangle_groups import HeckeTriangleGroup @@ -39,11 +39,10 @@ def canonical_parameters(group, base_ring, red_hom, n=None): sage: canonical_parameters(infinity, RR, 0) (Hecke triangle group for n = +Infinity, Real Field with 53 bits of precision, False, +Infinity) """ - - if not (n is None): + if n is not None: group = n - if (group == infinity): + if group == infinity: group = HeckeTriangleGroup(infinity) else: try: @@ -57,7 +56,7 @@ def canonical_parameters(group, base_ring, red_hom, n=None): return (group, base_ring, red_hom, n) -class QuasiMeromorphicModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class QuasiMeromorphicModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) quasi meromorphic modular forms for the given group and base ring. @@ -114,13 +113,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: QuasiMeromorphicModularFormsRing(n=infinity) QuasiMeromorphicModularFormsRing(n=+Infinity) over Integer Ring """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["quasi", "mero"]) -class QuasiWeakModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class QuasiWeakModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) quasi weakly holomorphic modular forms for the given group and base ring. @@ -174,13 +173,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["quasi", "weak"]) -class QuasiModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class QuasiModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) quasi modular forms for the given group and base ring @@ -234,13 +233,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["quasi", "holo"]) -class QuasiCuspFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class QuasiCuspFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) quasi cusp forms for the given group and base ring. @@ -294,13 +293,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["quasi", "cusp"]) -class MeromorphicModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class MeromorphicModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) meromorphic modular forms for the given group and base ring @@ -354,13 +353,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["mero"]) -class WeakModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class WeakModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) weakly holomorphic modular forms for the given group and base ring @@ -414,13 +413,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["weak"]) -class ModularFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class ModularFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) modular forms for the given group and base ring @@ -473,13 +472,13 @@ def __init__(self, group, base_ring, red_hom, n): sage: MR in MR.category() True """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["holo"]) -class CuspFormsRing(FormsRing_abstract, CommutativeAlgebra, UniqueRepresentation): +class CuspFormsRing(FormsRing_abstract, UniqueRepresentation): r""" Graded ring of (Hecke) cusp forms for the given group and base ring @@ -536,7 +535,7 @@ def __init__(self, group, base_ring, red_hom, n): sage: CuspFormsRing(n=infinity, base_ring=CC, red_hom=True) CuspFormsRing(n=+Infinity) over Complex Field with 53 bits of precision """ - FormsRing_abstract.__init__(self, group=group, base_ring=base_ring, red_hom=red_hom, n=n) - CommutativeAlgebra.__init__(self, base_ring=base_ring, category=CommutativeAlgebras(base_ring)) + cat = Algebras(base_ring).Commutative() + Parent.__init__(self, category=cat) self._analytic_type = self.AT(["cusp"]) diff --git a/src/sage/modular/modsym/heilbronn.pyx b/src/sage/modular/modsym/heilbronn.pyx index ba42d70aa9e..7fc8ed28055 100644 --- a/src/sage/modular/modsym/heilbronn.pyx +++ b/src/sage/modular/modsym/heilbronn.pyx @@ -34,11 +34,11 @@ cdef extern from "": float roundf(float x) cimport sage.modular.modsym.p1list as p1list -from . import p1list +from sage.modular.modsym import p1list cdef p1list.export export export = p1list.export() -from .apply cimport Apply +from sage.modular.modsym.apply cimport Apply cdef Apply PolyApply= Apply() from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense diff --git a/src/sage/modular/pollack_stevens/dist.pyx b/src/sage/modular/pollack_stevens/dist.pyx index fe1f5583cd5..3f67bbf8ecb 100644 --- a/src/sage/modular/pollack_stevens/dist.pyx +++ b/src/sage/modular/pollack_stevens/dist.pyx @@ -44,7 +44,7 @@ from sage.rings.infinity import Infinity #from sage.libs.flint.ulong_extras cimport * -from .sigma0 import Sigma0 +from sage.modular.pollack_stevens.sigma0 import Sigma0 cdef long overflow = 1 << (4 * sizeof(long) - 1) cdef long underflow = -overflow diff --git a/src/sage/modules/with_basis/cell_module.py b/src/sage/modules/with_basis/cell_module.py index 66d72f648f8..25e6509dde7 100644 --- a/src/sage/modules/with_basis/cell_module.py +++ b/src/sage/modules/with_basis/cell_module.py @@ -334,9 +334,9 @@ def _acted_upon_(self, scalar, self_on_left=False): sage: elt = W.an_element(); elt 2*W[[1, 2], [3]] + 2*W[[1, 3], [2]] sage: sc = C.an_element(); sc - 3*C([2, 1], [[1, 3], [2]], [[1, 2], [3]]) + 2*C([1, 1, 1], [[1], [2], [3]], [[1], [2], [3]]) + + 3*C([2, 1], [[1, 3], [2]], [[1, 2], [3]]) + 2*C([2, 1], [[1, 3], [2]], [[1, 3], [2]]) - + 2*C([3], [[1, 2, 3]], [[1, 2, 3]]) sage: sc * elt 10*W[[1, 3], [2]] @@ -448,9 +448,9 @@ def _acted_upon_(self, scalar, self_on_left=False): sage: elt = L.an_element(); elt 2*L[[1, 2], [3]] + 2*L[[1, 3], [2]] sage: sc = C.an_element(); sc - 3*C([2, 1], [[1, 3], [2]], [[1, 2], [3]]) + 2*C([1, 1, 1], [[1], [2], [3]], [[1], [2], [3]]) + + 3*C([2, 1], [[1, 3], [2]], [[1, 2], [3]]) + 2*C([2, 1], [[1, 3], [2]], [[1, 3], [2]]) - + 2*C([3], [[1, 2, 3]], [[1, 2, 3]]) sage: sc * elt 10*L[[1, 3], [2]] diff --git a/src/sage/parallel/map_reduce.py b/src/sage/parallel/map_reduce.py index a7b610b10e1..66fea7f394f 100644 --- a/src/sage/parallel/map_reduce.py +++ b/src/sage/parallel/map_reduce.py @@ -548,17 +548,17 @@ # https://www.gnu.org/licenses/ # **************************************************************************** import copy -import sys -import random -import queue import ctypes import logging import multiprocessing as mp +import queue +import random +import sys from collections import deque from threading import Thread -from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet # _generic from sage.misc.lazy_attribute import lazy_attribute +from sage.sets.recursively_enumerated_set import RecursivelyEnumeratedSet # _generic logger = logging.getLogger(__name__) logger.__doc__ = (""" @@ -1895,8 +1895,8 @@ def __init__(self, maxl=9): """ RESetMapReduce.__init__(self) - from sage.rings.polynomial.polynomial_ring import polygen from sage.rings.integer_ring import ZZ + from sage.rings.polynomial.polynomial_ring import polygen self.x = polygen(ZZ, 'x') self.maxl = maxl diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py index 081599b3452..0adeab04bcd 100644 --- a/src/sage/repl/ipython_kernel/install.py +++ b/src/sage/repl/ipython_kernel/install.py @@ -14,12 +14,14 @@ """ -import os import errno +import os import warnings from sage.env import ( - SAGE_DOC, SAGE_VENV, SAGE_EXTCODE, + SAGE_DOC, + SAGE_EXTCODE, + SAGE_VENV, SAGE_VERSION, THREEJS_DIR, ) @@ -257,7 +259,7 @@ def check(cls): sage: from sage.repl.ipython_kernel.install import SageKernelSpec sage: SageKernelSpec.check() # random """ - from jupyter_client.kernelspec import get_kernel_spec, NoSuchKernel + from jupyter_client.kernelspec import NoSuchKernel, get_kernel_spec ident = cls.identifier() try: spec = get_kernel_spec(ident) diff --git a/src/sage/rings/complex_double.pyx b/src/sage/rings/complex_double.pyx index 944bcc5aa27..096f96c693d 100644 --- a/src/sage/rings/complex_double.pyx +++ b/src/sage/rings/complex_double.pyx @@ -81,10 +81,10 @@ cdef extern from "": import sage.rings.abc cimport sage.rings.ring cimport sage.rings.integer +from sage.rings.ring import Ring from sage.structure.element cimport Element, FieldElement from sage.structure.parent cimport Parent -from sage.structure.parent_gens import ParentWithGens from sage.structure.richcmp cimport rich_to_bool from sage.categories.morphism cimport Morphism from sage.structure.coerce cimport is_numpy_type @@ -149,7 +149,7 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): (-1.0, -1.0 + 1.2246...e-16*I, False) """ from sage.categories.fields import Fields - ParentWithGens.__init__(self, self, ('I',), normalize=False, category=Fields().Infinite().Metric().Complete()) + Ring.__init__(self, self, ('I',), normalize=False, category=Fields().Infinite().Metric().Complete()) self._populate_coercion_lists_() def __reduce__(self): @@ -213,7 +213,7 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): sage: CDF.characteristic() 0 """ - from .integer import Integer + from sage.rings.integer import Integer return Integer(0) def random_element(self, double xmin=-1, double xmax=1, double ymin=-1, double ymax=1): @@ -351,7 +351,7 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): sage: CDF((1,2)) # indirect doctest 1.0 + 2.0*I """ - from . import complex_mpfr + from sage.rings import complex_mpfr if isinstance(x, ComplexDoubleElement): return x elif isinstance(x, tuple): @@ -417,10 +417,10 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): """ if S is int or S is float: return FloatToCDF(S) - from .rational_field import QQ - from .real_lazy import RLF - from .real_mpfr import RR - from .cc import CC + from sage.rings.rational_field import QQ + from sage.rings.real_lazy import RLF + from sage.rings.real_mpfr import RR + from sage.rings.cc import CC if S is ZZ or S is QQ or S is RDF or S is RLF: return FloatToCDF(S) @@ -502,7 +502,7 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): if prec == 53: return self else: - from .complex_mpfr import ComplexField + from sage.rings.complex_mpfr import ComplexField return ComplexField(prec) @@ -621,7 +621,7 @@ cdef class ComplexDoubleField_class(sage.rings.abc.ComplexDoubleField): ... ValueError: n must be a positive integer """ - from .integer import Integer + from sage.rings.integer import Integer try: n = Integer(n) except TypeError: @@ -968,7 +968,7 @@ cdef class ComplexDoubleElement(FieldElement): True """ # Sending to another computer algebra system is slow anyway, right? - from .complex_mpfr import ComplexField + from sage.rings.complex_mpfr import ComplexField return ComplexField()(self)._interface_init_(I) def _mathematica_init_(self): @@ -980,7 +980,7 @@ cdef class ComplexDoubleElement(FieldElement): sage: mathematica(CDF(1e-25, 1e25)) # optional - mathematica 1.*^-25 + 1.*^25*I """ - from .complex_mpfr import ComplexField + from sage.rings.complex_mpfr import ComplexField return ComplexField()(self)._mathematica_init_() def _maxima_init_(self, I=None): @@ -995,7 +995,7 @@ cdef class ComplexDoubleElement(FieldElement): sage: CDF(.5 + I)._maxima_init_() # needs sage.symbolic '0.50000000000000000 + 1.0000000000000000*%i' """ - from .complex_mpfr import ComplexField + from sage.rings.complex_mpfr import ComplexField return ComplexField()(self)._maxima_init_(I) def _sympy_(self): @@ -1097,7 +1097,7 @@ cdef class ComplexDoubleElement(FieldElement): sage: format(CDF(0, 0), '+#.4') '+0.000' """ - from .complex_mpfr import _format_complex_number + from sage.rings.complex_mpfr import _format_complex_number return _format_complex_number(GSL_REAL(self._complex), GSL_IMAG(self._complex), format_spec) @@ -2382,12 +2382,12 @@ cdef class ComplexDoubleElement(FieldElement): """ if not GSL_IMAG(self._complex): if GSL_REAL(self._complex) == 0: - from .infinity import unsigned_infinity + from sage.rings.infinity import unsigned_infinity return unsigned_infinity try: - from .integer import Integer + from sage.rings.integer import Integer if Integer(GSL_REAL(self._complex)) < 0: - from .cc import CC + from sage.rings.cc import CC return CC(self).gamma() except TypeError: pass @@ -2429,7 +2429,7 @@ cdef class ComplexDoubleElement(FieldElement): Infinity """ if GSL_REAL(self._complex) == 1 and GSL_IMAG(self._complex) == 0: - from .infinity import unsigned_infinity + from sage.rings.infinity import unsigned_infinity return unsigned_infinity global complex_double_element_zeta diff --git a/src/sage/rings/complex_interval.pyx b/src/sage/rings/complex_interval.pyx index 5b7a04fef10..e804964f501 100644 --- a/src/sage/rings/complex_interval.pyx +++ b/src/sage/rings/complex_interval.pyx @@ -1914,7 +1914,7 @@ cdef class ComplexIntervalFieldElement(FieldElement): 0.500000000000000? + 3.39927010637040?*I """ if not self: - from .real_mpfi import RIF + from sage.rings.real_mpfi import RIF return RIF(0).log() re = abs(self).log() im = self.argument() @@ -2291,6 +2291,6 @@ def create_ComplexIntervalFieldElement(s_real, s_imag=None, int pad=0, min_prec= #else: # bits = max(int(math.log(base,2)*len(s_imag)),int(math.log(base,2)*len(s_imag))) - from .complex_interval_field import ComplexIntervalField + from sage.rings.complex_interval_field import ComplexIntervalField C = ComplexIntervalField(prec=max(bits+pad, min_prec)) return ComplexIntervalFieldElement(C, s_real, s_imag) diff --git a/src/sage/rings/complex_mpc.pyx b/src/sage/rings/complex_mpc.pyx index 7a9ab37e268..c71142a76ab 100644 --- a/src/sage/rings/complex_mpc.pyx +++ b/src/sage/rings/complex_mpc.pyx @@ -68,11 +68,11 @@ from sage.cpython.string cimport str_to_bytes from sage.libs.mpfr cimport * from sage.libs.mpc cimport * from sage.structure.parent cimport Parent -from sage.structure.parent_gens cimport ParentWithGens from sage.structure.element cimport Element from sage.structure.richcmp cimport rich_to_bool from sage.categories.map cimport Map from sage.libs.pari.all import pari +from sage.rings.ring import Ring from sage.rings.integer cimport Integer from sage.rings.complex_mpfr cimport ComplexNumber @@ -105,8 +105,8 @@ def late_import(): import sage.rings.qqbar AA = sage.rings.qqbar.AA QQbar = sage.rings.qqbar.QQbar - from .real_lazy import CLF, RLF - from .complex_double import CDF + from sage.rings.real_lazy import CLF, RLF + from sage.rings.complex_double import CDF _mpfr_rounding_modes = ['RNDN', 'RNDZ', 'RNDU', 'RNDD'] @@ -319,7 +319,7 @@ cdef class MPComplexField_class(sage.rings.ring.Field): self.__real_field = real_mpfr.RealField(prec, rnd=_mpfr_rounding_modes[rnd_re(n)]) self.__imag_field = real_mpfr.RealField(prec, rnd=_mpfr_rounding_modes[rnd_im(n)]) - ParentWithGens.__init__(self, self._real_field(), ('I',), False, category=Fields().Infinite()) + Ring.__init__(self, self._real_field(), ('I',), False, category=Fields().Infinite()) self._populate_coercion_lists_(coerce_list=[MPFRtoMPC(self._real_field(), self)]) cdef MPComplexNumber _new(self) noexcept: diff --git a/src/sage/rings/complex_mpfr.pyx b/src/sage/rings/complex_mpfr.pyx index c8a27ac7aec..25c4d6519e4 100644 --- a/src/sage/rings/complex_mpfr.pyx +++ b/src/sage/rings/complex_mpfr.pyx @@ -40,7 +40,7 @@ from sage.structure.element cimport RingElement, Element from sage.structure.richcmp cimport rich_to_bool from sage.categories.map cimport Map from sage.structure.parent import Parent -from sage.structure.parent_gens import ParentWithGens +from sage.rings.ring import Ring from sage.misc.sage_eval import sage_eval @@ -59,7 +59,12 @@ from sage.rings.integer_ring import ZZ cimport gmpy2 gmpy2.import_gmpy2() -# Some objects that are note imported at startup in order to break +try: + from sage.libs.pari.all import pari_gen +except ImportError: + pari_gen = () + +# Some objects that are not imported at startup in order to break # circular imports NumberFieldElement_quadratic = None AlgebraicNumber_base = None @@ -97,8 +102,8 @@ def late_import(): QQbar = sage.rings.qqbar.QQbar import sage.symbolic.ring SR = sage.symbolic.ring.SR - from .real_lazy import CLF, RLF - from .complex_double import CDF + from sage.rings.real_lazy import CLF, RLF + from sage.rings.complex_double import CDF cdef object numpy_complex_interface = {'typestr': '=c16'} cdef object numpy_object_interface = {'typestr': '|O'} @@ -277,7 +282,7 @@ class ComplexField_class(sage.rings.abc.ComplexField): """ self._prec = int(prec) from sage.categories.fields import Fields - ParentWithGens.__init__(self, self._real_field(), ('I',), False, category=Fields().Infinite().Metric().Complete()) + Ring.__init__(self, self._real_field(), ('I',), False, category=Fields().Infinite().Metric().Complete()) self._populate_coercion_lists_(coerce_list=[RRtoCC(self._real_field(), self)], convert_method_name='_complex_mpfr_') @@ -367,7 +372,7 @@ class ComplexField_class(sage.rings.abc.ComplexField): try: return self.__real_field except AttributeError: - from .real_mpfr import RealField + from sage.rings.real_mpfr import RealField self.__real_field = RealField(self._prec) return self.__real_field @@ -929,7 +934,7 @@ cdef class ComplexNumber(sage.structure.element.FieldElement): if isinstance(real, ComplexNumber): real, imag = (real).real(), (real).imag() - elif isinstance(real, sage.libs.pari.all.pari_gen): + elif isinstance(real, pari_gen): real, imag = real.real(), real.imag() elif isinstance(real, (list, tuple)): re, imag = real @@ -2926,7 +2931,7 @@ cdef class ComplexNumber(sage.structure.element.FieldElement): if base is None: return ComplexNumber(self._parent, rho.log(), theta) else: - from .real_mpfr import RealField + from sage.rings.real_mpfr import RealField return ComplexNumber(self._parent, rho.log()/RealNumber(RealField(self.prec()),base).log(), theta/RealNumber(RealField(self.prec()),base).log()) def additive_order(self): diff --git a/src/sage/rings/derivation.py b/src/sage/rings/derivation.py index 44182627cfc..2cd1bc1b1aa 100644 --- a/src/sage/rings/derivation.py +++ b/src/sage/rings/derivation.py @@ -78,7 +78,7 @@ sage: M.category() Join of - Category of lie algebras with basis over Rational Field and + Category of Lie algebras with basis over Rational Field and Category of modules with basis over Multivariate Polynomial Ring in x, y, z over Rational Field diff --git a/src/sage/rings/finite_rings/finite_field_base.pyx b/src/sage/rings/finite_rings/finite_field_base.pyx index cc2d1b65dd0..dd79b0d90b9 100644 --- a/src/sage/rings/finite_rings/finite_field_base.pyx +++ b/src/sage/rings/finite_rings/finite_field_base.pyx @@ -1045,7 +1045,7 @@ cdef class FiniteField(Field): pass from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing - from .finite_field_constructor import GF + from sage.rings.finite_rings.finite_field_constructor import GF R = PolynomialRing(GF(self.characteristic()), 'x') self._modulus = R((-1,1)) # Polynomial x - 1 return self._modulus @@ -1288,7 +1288,7 @@ cdef class FiniteField(Field): inclusion_map = self.coerce_map_from(base) from sage.matrix.constructor import matrix - from .maps_finite_field import ( + from sage.rings.finite_rings.maps_finite_field import ( MorphismVectorSpaceToFiniteField, MorphismFiniteFieldToVectorSpace) E = self @@ -1379,7 +1379,7 @@ cdef class FiniteField(Field): if isinstance(R, FiniteField): if R is self: return True - from .residue_field import ResidueField_generic + from sage.rings.finite_rings.residue_field import ResidueField_generic if isinstance(R, ResidueField_generic): return False if R.characteristic() == self.characteristic(): @@ -1543,7 +1543,7 @@ cdef class FiniteField(Field): sage: L(u).minpoly() == u.minpoly() True """ - from .finite_field_constructor import GF + from sage.rings.finite_rings.finite_field_constructor import GF from sage.rings.polynomial.polynomial_element import Polynomial from sage.rings.integer import Integer if name is None and names is not None: @@ -1719,7 +1719,7 @@ cdef class FiniteField(Field): sage: GF(3^8, 'a').subfield(4) Finite Field in a4 of size 3^4 """ - from .finite_field_constructor import GF + from sage.rings.finite_rings.finite_field_constructor import GF p = self.characteristic() n = self.degree() if not n % degree == 0: @@ -1926,7 +1926,7 @@ cdef class FiniteField(Field): sage: GF(next_prime(2^16, 2), 'a').is_conway() False """ - from .conway_polynomials import conway_polynomial, exists_conway_polynomial + from sage.rings.finite_rings.conway_polynomials import conway_polynomial, exists_conway_polynomial p = self.characteristic() n = self.degree() return (exists_conway_polynomial(p, n) diff --git a/src/sage/rings/finite_rings/hom_finite_field.pyx b/src/sage/rings/finite_rings/hom_finite_field.pyx index 5f54c04dd36..85dadd6fb2c 100644 --- a/src/sage/rings/finite_rings/hom_finite_field.pyx +++ b/src/sage/rings/finite_rings/hom_finite_field.pyx @@ -763,7 +763,7 @@ cdef class FrobeniusEndomorphism_finite_field(FrobeniusEndomorphism_generic): """ if self._degree_fixed == 1: k = FiniteField(self.domain().characteristic()) - from .hom_prime_finite_field import FiniteFieldHomomorphism_prime + from sage.rings.finite_rings.hom_prime_finite_field import FiniteFieldHomomorphism_prime f = FiniteFieldHomomorphism_prime(Hom(k, self.domain())) else: k = FiniteField(self.domain().characteristic()**self._degree_fixed, diff --git a/src/sage/rings/finite_rings/hom_prime_finite_field.pyx b/src/sage/rings/finite_rings/hom_prime_finite_field.pyx index 2ff550aa1b1..4fc2c832f90 100644 --- a/src/sage/rings/finite_rings/hom_prime_finite_field.pyx +++ b/src/sage/rings/finite_rings/hom_prime_finite_field.pyx @@ -37,7 +37,7 @@ from sage.rings.finite_rings.finite_field_base import FiniteField cdef class SectionFiniteFieldHomomorphism_prime(SectionFiniteFieldHomomorphism_generic): cpdef Element _call_(self, x) noexcept: try: - return self._codomain._element_constructor(x) + return self._codomain._element_constructor_(x) except TypeError: raise ValueError("%s is not in the image of %s" % (x, self._inverse)) @@ -89,7 +89,7 @@ cdef class FiniteFieldHomomorphism_prime(FiniteFieldHomomorphism_generic): sage: a.parent() Finite Field in t of size 3^5 """ - return self._codomain._element_constructor(x) + return self._codomain._element_constructor_(x) cdef class FrobeniusEndomorphism_prime(FrobeniusEndomorphism_finite_field): diff --git a/src/sage/rings/finite_rings/integer_mod.pyx b/src/sage/rings/finite_rings/integer_mod.pyx index d715cec1493..d687c4bf50c 100644 --- a/src/sage/rings/finite_rings/integer_mod.pyx +++ b/src/sage/rings/finite_rings/integer_mod.pyx @@ -153,7 +153,7 @@ def Mod(n, m, parent=None): # m is non-zero, so return n mod m if parent is None: - from .integer_mod_ring import IntegerModRing + from sage.rings.finite_rings.integer_mod_ring import IntegerModRing parent = IntegerModRing(m) return IntegerMod(parent, n) @@ -493,7 +493,7 @@ cdef class IntegerMod_abstract(FiniteRingElement): if not isinstance(self, IntegerMod_abstract): # something % Mod(x,y) makes no sense return NotImplemented - from .integer_mod_ring import IntegerModRing + from sage.rings.finite_rings.integer_mod_ring import IntegerModRing R = IntegerModRing(modulus) if (self)._parent._IntegerModRing_generic__order % R.order(): raise ArithmeticError(f"reduction modulo {modulus!r} not defined") @@ -1227,7 +1227,7 @@ cdef class IntegerMod_abstract(FiniteRingElement): R = self.parent()['x'] modulus = R.gen()**2 - R(self) if self._parent.is_field(): - from .finite_field_constructor import FiniteField + from sage.rings.finite_rings.finite_field_constructor import FiniteField Q = FiniteField(self._modulus.sageInteger**2, y, modulus) else: R = self.parent()['x'] @@ -1437,7 +1437,7 @@ cdef class IntegerMod_abstract(FiniteRingElement): ....: if (y^41).nth_root(41*r)**(41*r) != y^41: raise RuntimeError ....: if (y^307).nth_root(307*r)**(307*r) != y^307: raise RuntimeError - sage: for t in range(200): # needs sage.libs.pari + sage: for t in range(200): # needs sage.libs.pari sage.rings.padics ....: n = randint(1,2^63) ....: K = Integers(n) ....: b = K.random_element() @@ -2137,7 +2137,7 @@ cdef class IntegerMod_gmp(IntegerMod_abstract): modulus = self._modulus.sageInteger other_modulus = other._modulus.sageInteger - from .integer_mod_ring import IntegerModRing + from sage.rings.finite_rings.integer_mod_ring import IntegerModRing lift = IntegerMod_gmp(IntegerModRing(modulus*other_modulus)) try: if mpz_cmp(self.value, other.value) > 0: @@ -2541,7 +2541,7 @@ cdef class IntegerMod_int(IntegerMod_abstract): cdef IntegerMod_int lift cdef int_fast32_t x - from .integer_mod_ring import IntegerModRing + from sage.rings.finite_rings.integer_mod_ring import IntegerModRing lift = IntegerMod_int(IntegerModRing(self._modulus.int32 * other._modulus.int32)) try: @@ -3377,7 +3377,7 @@ cdef class IntegerMod_int64(IntegerMod_abstract): cdef IntegerMod_int64 lift cdef int_fast64_t x - from .integer_mod_ring import IntegerModRing + from sage.rings.finite_rings.integer_mod_ring import IntegerModRing lift = IntegerMod_int64(IntegerModRing(self._modulus.int64 * other._modulus.int64)) try: diff --git a/src/sage/rings/finite_rings/residue_field.pyx b/src/sage/rings/finite_rings/residue_field.pyx index 9845266870a..e84b303769a 100644 --- a/src/sage/rings/finite_rings/residue_field.pyx +++ b/src/sage/rings/finite_rings/residue_field.pyx @@ -386,7 +386,7 @@ class ResidueFieldFactory(UniqueFactory): q = characteristic**(f.degree()) if q < zech_log_bound and (impl is None or impl == 'givaro'): try: - from .residue_field_givaro import ResidueFiniteField_givaro + from sage.rings.finite_rings.residue_field_givaro import ResidueFiniteField_givaro except ImportError: if impl is not None: raise @@ -394,7 +394,7 @@ class ResidueFieldFactory(UniqueFactory): return ResidueFiniteField_givaro(p, q, names, f, None, None, None) if q % 2 == 0 and (impl is None or impl == 'ntl'): try: - from .residue_field_ntl_gf2e import ResidueFiniteField_ntl_gf2e + from sage.rings.finite_rings.residue_field_ntl_gf2e import ResidueFiniteField_ntl_gf2e except ImportError: if impl is not None: raise @@ -402,7 +402,7 @@ class ResidueFieldFactory(UniqueFactory): return ResidueFiniteField_ntl_gf2e(q, names, f, "poly", p, None, None, None) if impl is None or impl == 'pari': try: - from .residue_field_pari_ffelt import ResidueFiniteField_pari_ffelt + from sage.rings.finite_rings.residue_field_pari_ffelt import ResidueFiniteField_pari_ffelt except ImportError: if impl is not None: raise @@ -462,7 +462,7 @@ class ResidueFieldFactory(UniqueFactory): q = characteristic**(f.degree()) if q < zech_log_bound and (impl is None or impl == 'givaro'): try: - from .residue_field_givaro import ResidueFiniteField_givaro + from sage.rings.finite_rings.residue_field_givaro import ResidueFiniteField_givaro except ImportError: if impl is not None: raise @@ -470,7 +470,7 @@ class ResidueFieldFactory(UniqueFactory): return ResidueFiniteField_givaro(p, q, names, f, to_vs, to_order, PB) elif q % 2 == 0 and (impl is None or impl == 'ntl'): try: - from .residue_field_ntl_gf2e import ResidueFiniteField_ntl_gf2e + from sage.rings.finite_rings.residue_field_ntl_gf2e import ResidueFiniteField_ntl_gf2e except ImportError: if impl is not None: raise @@ -478,7 +478,7 @@ class ResidueFieldFactory(UniqueFactory): return ResidueFiniteField_ntl_gf2e(q, names, f, "poly", p, to_vs, to_order, PB) if impl is None or impl == 'pari': try: - from .residue_field_pari_ffelt import ResidueFiniteField_pari_ffelt + from sage.rings.finite_rings.residue_field_pari_ffelt import ResidueFiniteField_pari_ffelt except ImportError: if impl is not None: raise diff --git a/src/sage/rings/function_field/element.pyx b/src/sage/rings/function_field/element.pyx index dceaa85fd2e..93a0333a14c 100644 --- a/src/sage/rings/function_field/element.pyx +++ b/src/sage/rings/function_field/element.pyx @@ -83,7 +83,7 @@ def is_FunctionFieldElement(x): """ if isinstance(x, FunctionFieldElement): return True - from .function_field import is_FunctionField + from sage.rings.function_field.function_field import is_FunctionField return is_FunctionField(x.parent()) def make_FunctionFieldElement(parent, element_class, representing_element): diff --git a/src/sage/rings/function_field/element_polymod.pyx b/src/sage/rings/function_field/element_polymod.pyx index 5e748b22a6f..c6fdea83b09 100644 --- a/src/sage/rings/function_field/element_polymod.pyx +++ b/src/sage/rings/function_field/element_polymod.pyx @@ -385,7 +385,7 @@ cdef class FunctionFieldElement_polymod(FunctionFieldElement): if deg == 1: return self._parent(self._x[0].nth_root(self._parent.characteristic())) - from .function_field_rational import RationalFunctionField + from sage.rings.function_field.function_field_rational import RationalFunctionField if not isinstance(self.base_ring(), RationalFunctionField): raise NotImplementedError("only implemented for simple extensions of function fields") # compute a representation of the generator y of the field in terms of powers of y^p diff --git a/src/sage/rings/function_field/element_rational.pyx b/src/sage/rings/function_field/element_rational.pyx index 0b36c50f5f7..986a46300b8 100644 --- a/src/sage/rings/function_field/element_rational.pyx +++ b/src/sage/rings/function_field/element_rational.pyx @@ -302,7 +302,7 @@ cdef class FunctionFieldElement_rational(FunctionFieldElement): sage: (1/x^2).valuation(p) # needs sage.libs.pari -2 """ - from .place import FunctionFieldPlace + from sage.rings.function_field.place import FunctionFieldPlace if not isinstance(place, FunctionFieldPlace): # place is an irreducible polynomial diff --git a/src/sage/rings/integer.pyx b/src/sage/rings/integer.pyx index bd31ccbb31d..c990c200e57 100644 --- a/src/sage/rings/integer.pyx +++ b/src/sage/rings/integer.pyx @@ -2536,7 +2536,7 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement): cdef int pow_2 cdef size_t upper,lower,middle - from .real_mpfi import RIF as R + from sage.rings.real_mpfi import RIF as R rif_self = R(self) @@ -2722,7 +2722,7 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement): # (suggested by David Harvey and Carl Witty) # "for randomly distributed integers, the chance of this # interval-based comparison failing is absurdly low" - from .real_mpfi import RIF + from sage.rings.real_mpfi import RIF approx_compare = RIF(m)**guess if self > approx_compare: guess_filled = 1 diff --git a/src/sage/rings/morphism.pyx b/src/sage/rings/morphism.pyx index f8e32bd8c62..a9cb8eda29e 100644 --- a/src/sage/rings/morphism.pyx +++ b/src/sage/rings/morphism.pyx @@ -650,7 +650,7 @@ cdef class RingHomomorphism(RingMap): True """ - from .homset import RingHomset_generic + from sage.rings.homset import RingHomset_generic if not isinstance(parent, RingHomset_generic): raise TypeError("parent must be a ring homset") RingMap.__init__(self, parent) @@ -1038,10 +1038,10 @@ cdef class RingHomomorphism(RingMap): sage: f.kernel() # needs sage.libs.singular Ideal (0) of Multivariate Polynomial Ring in t, u over Rational Field """ - from .polynomial.polynomial_quotient_ring import is_PolynomialQuotientRing - from .quotient_ring import is_QuotientRing - from .polynomial.multi_polynomial_ring import is_MPolynomialRing - from .polynomial.polynomial_ring import is_PolynomialRing + from sage.rings.polynomial.polynomial_quotient_ring import is_PolynomialQuotientRing + from sage.rings.quotient_ring import is_QuotientRing + from sage.rings.polynomial.multi_polynomial_ring import is_MPolynomialRing + from sage.rings.polynomial.polynomial_ring import is_PolynomialRing B = self.codomain() graph, from_B, to_A = self._graph_ideal() Q = graph.ring() @@ -1287,8 +1287,8 @@ cdef class RingHomomorphism(RingMap): ... NotImplementedError: rings are not commutative """ - from .quotient_ring import is_QuotientRing - from .ideal import Ideal_generic + from sage.rings.quotient_ring import is_QuotientRing + from sage.rings.ideal import Ideal_generic A = self.domain() B = self.codomain() if not (A.is_commutative() and B.is_commutative()): @@ -2882,7 +2882,7 @@ cdef class FrobeniusEndomorphism_generic(RingHomomorphism): Frobenius endomorphism x |--> x^(5^2) of Power Series Ring in u over Finite Field of size 5 """ - from .ring import CommutativeRing + from sage.rings.ring import CommutativeRing from sage.categories.homset import Hom if not isinstance(domain, CommutativeRing): raise TypeError("The base ring must be a commutative ring") @@ -3135,14 +3135,14 @@ def _tensor_product_ring(B, A): ... ValueError: term ordering must be global """ - from .finite_rings.finite_field_base import FiniteField - from .number_field.number_field_base import NumberField - from .polynomial.multi_polynomial_ring import is_MPolynomialRing - from .polynomial.polynomial_quotient_ring import is_PolynomialQuotientRing - from .polynomial.polynomial_ring import is_PolynomialRing - from .polynomial.polynomial_ring_constructor import PolynomialRing - from .polynomial.term_order import TermOrder - from .quotient_ring import is_QuotientRing + from sage.rings.finite_rings.finite_field_base import FiniteField + from sage.rings.number_field.number_field_base import NumberField + from sage.rings.polynomial.multi_polynomial_ring import is_MPolynomialRing + from sage.rings.polynomial.polynomial_quotient_ring import is_PolynomialQuotientRing + from sage.rings.polynomial.polynomial_ring import is_PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.term_order import TermOrder + from sage.rings.quotient_ring import is_QuotientRing if set(B.variable_names()).isdisjoint(A.variable_names()): names = B.variable_names() + A.variable_names() diff --git a/src/sage/rings/number_field/number_field_element.pyx b/src/sage/rings/number_field/number_field_element.pyx index a0553fc31d9..a21d22e43a4 100644 --- a/src/sage/rings/number_field/number_field_element.pyx +++ b/src/sage/rings/number_field/number_field_element.pyx @@ -353,7 +353,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): quadratic field elements) """ if check: - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if not isinstance(self.number_field(), NumberField_cyclotomic) \ or not isinstance(new_parent, NumberField_cyclotomic): raise TypeError("The field and the new parent field must both be cyclotomic fields.") @@ -523,7 +523,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): return str(self) p = self.polynomial() P = self.parent() - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if isinstance(P, NumberField_cyclotomic): n = P._n() if n != 2 and n % 4 == 2: @@ -564,7 +564,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): ....: t = K.random_element() ....: assert K(libgap(t)) == t, "n = {} t = {}".format(n,t) """ - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic P = self.parent() if not isinstance(P, NumberField_cyclotomic): raise NotImplementedError("libgap conversion is only implemented for cyclotomic fields") @@ -1991,7 +1991,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): raise ArithmeticError("factorization of 0 is not defined") K = self.parent() - from .order import is_NumberFieldOrder + from sage.rings.number_field.order import is_NumberFieldOrder if is_NumberFieldOrder(K): K = K.number_field() fac = K.ideal(self).factor() @@ -2097,7 +2097,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): if R.is_field(): return R.one() - from .order import is_NumberFieldOrder + from sage.rings.number_field.order import is_NumberFieldOrder if not is_NumberFieldOrder(R) or not R.is_maximal(): raise NotImplementedError("gcd() for %r is not implemented" % R) @@ -2886,7 +2886,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): raise ValueError("need a real or complex embedding to convert " "a non rational element of a number field " "into an algebraic number") - from .number_field import refine_embedding + from sage.rings.number_field.number_field import refine_embedding emb = refine_embedding(emb, infinity) return parent(emb(self)) @@ -2999,7 +2999,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): if embedding is None: raise TypeError("an embedding into RR or CC must be specified") - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if isinstance(K, NumberField_cyclotomic): # solution by radicals may be difficult, but we have a closed form from sage.functions.log import exp @@ -3011,7 +3011,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): gen_image = exp(k*two_pi_i/K._n()) return self.polynomial()(gen_image) else: - from .number_field import refine_embedding + from sage.rings.number_field.number_field import refine_embedding # Convert the embedding to an embedding into AA or QQbar embedding = refine_embedding(embedding, infinity) a = embedding(self).radical_expression() @@ -3365,7 +3365,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): True """ if self.__multiplicative_order is None: - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if self.is_rational(): if self.is_one(): self.__multiplicative_order = ZZ.one() @@ -3923,7 +3923,7 @@ cdef class NumberFieldElement(NumberFieldElement_base): ... ValueError: P must be prime """ - from .number_field_ideal import is_NumberFieldIdeal + from sage.rings.number_field.number_field_ideal import is_NumberFieldIdeal if not is_NumberFieldIdeal(P): if isinstance(P, NumberFieldElement): P = self.number_field().fractional_ideal(P) diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pyx b/src/sage/rings/number_field/number_field_element_quadratic.pyx index 3cdaabb3140..88118848cc8 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pyx +++ b/src/sage/rings/number_field/number_field_element_quadratic.pyx @@ -520,7 +520,7 @@ cdef class NumberFieldElement_quadratic(NumberFieldElement_absolute): - Craig Citro (reworked for quadratic elements) """ if check: - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if not isinstance(self.number_field(), NumberField_cyclotomic) \ or not isinstance(new_parent, NumberField_cyclotomic): raise TypeError("The field and the new parent field must both be cyclotomic fields.") @@ -1918,10 +1918,10 @@ cdef class NumberFieldElement_quadratic(NumberFieldElement_absolute): else: # avoid circular import if self._parent._embedding is None: - from .number_field import NumberField + from sage.rings.number_field.number_field import NumberField K = NumberField(QQ['x'].gen()**2 - negD, 'sqrt%s' % negD) else: - from .number_field import QuadraticField + from sage.rings.number_field.number_field import QuadraticField K = QuadraticField(negD, 'sqrt%s' % negD) q = ( K._zero_element)._new() mpz_set(q.denom, self.denom) diff --git a/src/sage/rings/number_field/number_field_morphisms.pyx b/src/sage/rings/number_field/number_field_morphisms.pyx index 1f6e12ce2c5..38a8dfd3726 100644 --- a/src/sage/rings/number_field/number_field_morphisms.pyx +++ b/src/sage/rings/number_field/number_field_morphisms.pyx @@ -616,7 +616,7 @@ cdef class CyclotomicFieldEmbedding(NumberFieldEmbedding): -1 """ Morphism.__init__(self, K, L) - from .number_field import NumberField_cyclotomic + from sage.rings.number_field.number_field import NumberField_cyclotomic if not isinstance(K, NumberField_cyclotomic) or not isinstance(L, NumberField_cyclotomic): raise TypeError("CyclotomicFieldEmbedding only valid for cyclotomic fields.") Kn = K._n() diff --git a/src/sage/rings/number_field/totallyreal_data.pyx b/src/sage/rings/number_field/totallyreal_data.pyx index e504fb6b45f..9bce936b362 100644 --- a/src/sage/rings/number_field/totallyreal_data.pyx +++ b/src/sage/rings/number_field/totallyreal_data.pyx @@ -440,7 +440,7 @@ def easy_is_irreducible_py(f): cdef double eps_global eps_global = 10.**(-4) -from .totallyreal_phc import __lagrange_bounds_phc +from sage.rings.number_field.totallyreal_phc import __lagrange_bounds_phc cdef class tr_data: r""" diff --git a/src/sage/rings/padics/morphism.pyx b/src/sage/rings/padics/morphism.pyx index 3dbae06bc51..a50c92a06f9 100644 --- a/src/sage/rings/padics/morphism.pyx +++ b/src/sage/rings/padics/morphism.pyx @@ -21,7 +21,7 @@ from sage.structure.richcmp cimport (richcmp, rich_to_bool, richcmp_not_equal) from sage.rings.morphism cimport RingHomomorphism -from .padic_generic import pAdicGeneric +from sage.rings.padics.padic_generic import pAdicGeneric cdef class FrobeniusEndomorphism_padics(RingHomomorphism): diff --git a/src/sage/rings/padics/padic_printing.pyx b/src/sage/rings/padics/padic_printing.pyx index caf19c7bdf9..f92afb51529 100644 --- a/src/sage/rings/padics/padic_printing.pyx +++ b/src/sage/rings/padics/padic_printing.pyx @@ -464,7 +464,7 @@ cdef class pAdicPrinter_class(SageObject): raise ValueError("max_terse_terms must be positive and fit in a long") else: self.max_terse_terms = _printer_defaults._max_terse_terms - from .factory import _canonicalize_show_prec + from sage.rings.padics.factory import _canonicalize_show_prec self.show_prec = _canonicalize_show_prec(self.ring._prec_type(), mode, show_prec) # Incompatibilities diff --git a/src/sage/rings/padics/pow_computer.pyx b/src/sage/rings/padics/pow_computer.pyx index 83aa163d36b..942b2a6323e 100644 --- a/src/sage/rings/padics/pow_computer.pyx +++ b/src/sage/rings/padics/pow_computer.pyx @@ -624,13 +624,13 @@ cdef PowComputer_base PowComputer_c(Integer m, Integer cache_limit, Integer prec if PC is not None: return PC if prec_type == 'capped-rel': - from .padic_capped_relative_element import PowComputer_ as PC_class + from sage.rings.padics.padic_capped_relative_element import PowComputer_ as PC_class elif prec_type == 'capped-abs': - from .padic_capped_absolute_element import PowComputer_ as PC_class + from sage.rings.padics.padic_capped_absolute_element import PowComputer_ as PC_class elif prec_type == 'fixed-mod': - from .padic_fixed_mod_element import PowComputer_ as PC_class + from sage.rings.padics.padic_fixed_mod_element import PowComputer_ as PC_class elif prec_type == 'floating-point': - from .padic_floating_point_element import PowComputer_ as PC_class + from sage.rings.padics.padic_floating_point_element import PowComputer_ as PC_class else: PC_class = PowComputer_base PC = PC_class(m, mpz_get_ui(cache_limit.value), mpz_get_ui(prec_cap.value), mpz_get_ui(prec_cap.value), in_field) diff --git a/src/sage/rings/padics/pow_computer_flint.pyx b/src/sage/rings/padics/pow_computer_flint.pyx index 6d0837f7ee5..2ef7ff9e879 100644 --- a/src/sage/rings/padics/pow_computer_flint.pyx +++ b/src/sage/rings/padics/pow_computer_flint.pyx @@ -641,13 +641,13 @@ def PowComputer_flint_maker(prime, cache_limit, prec_cap, ram_prec_cap, in_field """ if prec_type == 'capped-rel': - from .qadic_flint_CR import PowComputer_ + from sage.rings.padics.qadic_flint_CR import PowComputer_ elif prec_type == 'capped-abs': - from .qadic_flint_CA import PowComputer_ + from sage.rings.padics.qadic_flint_CA import PowComputer_ elif prec_type == 'fixed-mod': - from .qadic_flint_FM import PowComputer_ + from sage.rings.padics.qadic_flint_FM import PowComputer_ elif prec_type == 'floating-point': - from .qadic_flint_FP import PowComputer_ + from sage.rings.padics.qadic_flint_FP import PowComputer_ else: raise ValueError("unknown prec_type `%s`" % prec_type) return PowComputer_(prime, cache_limit, prec_cap, ram_prec_cap, in_field, poly) diff --git a/src/sage/rings/polynomial/evaluation.pxd b/src/sage/rings/polynomial/evaluation.pxd index 4978e83a831..bbd1ba97b4b 100644 --- a/src/sage/rings/polynomial/evaluation.pxd +++ b/src/sage/rings/polynomial/evaluation.pxd @@ -1,2 +1,2 @@ -from .evaluation_flint cimport * -from .evaluation_ntl cimport * +from sage.rings.polynomial.evaluation_flint cimport * +from sage.rings.polynomial.evaluation_ntl cimport * diff --git a/src/sage/rings/polynomial/laurent_polynomial.pyx b/src/sage/rings/polynomial/laurent_polynomial.pyx index 8e5bd127993..03de4a1179f 100644 --- a/src/sage/rings/polynomial/laurent_polynomial.pyx +++ b/src/sage/rings/polynomial/laurent_polynomial.pyx @@ -321,6 +321,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): William Stein, David Joyner, and Robert Bradshaw - Travis Scrimshaw (09-2013): Cleaned-up and added a few extra methods """ + def __init__(self, parent, f, n=0): r""" Create the Laurent polynomial `t^n \cdot f`. @@ -352,15 +353,15 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): CommutativeAlgebraElement.__init__(self, parent) if isinstance(f, LaurentPolynomial_univariate): - n += (f).__n - if (f).__u._parent is parent._R: - f = (f).__u + n += (< LaurentPolynomial_univariate > f).__n + if (< LaurentPolynomial_univariate > f).__u._parent is parent._R: + f = (< LaurentPolynomial_univariate > f).__u else: - f = parent._R((f).__u) + f = parent._R((< LaurentPolynomial_univariate > f).__u) elif (not isinstance(f, Polynomial)) or (parent is not f.parent()): if isinstance(f, dict): v = min(f) if f else 0 - f = {i-v: c for i,c in f.items()} + f = {i-v: c for i, c in f.items()} n += v f = parent._R(f) @@ -556,7 +557,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): self.__n = 0 return # we already caught the infinity and zero cases - cdef long v = self.__u.valuation() + cdef long v = self.__u.valuation() self.__n += v self.__u = self.__u >> v @@ -593,11 +594,11 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): elif e == 0: var = "" else: - var = "*{}^{}".format(X,e) - s += "{}{}".format(x,var) + var = "*{}^{}".format(X, e) + s += "{}{}".format(x, var) first = False s = s.replace(" + -", " - ") - s = s.replace(" 1*"," ") + s = s.replace(" 1*", " ") s = s.replace(" -1*", " -") return s[1:] @@ -654,19 +655,19 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): elif e == 0: var = "" elif e > 0: - var = "|{}^{{{}}}".format(X,e) + var = "|{}^{{{}}}".format(X, e) if e >= 0: - s += "{}{}".format(x,var) - else: # negative e + s += "{}{}".format(x, var) + else: # negative e if e == -1: s += "\\frac{{{}}}{{{}}}".format(x, X) else: - s += "\\frac{{{}}}{{{}^{{{}}}}}".format(x, X,-e) + s += "\\frac{{{}}}{{{}^{{{}}}}}".format(x, X, -e) first = False s = s.replace(" + -", " - ") - s = s.replace(" 1|"," ") + s = s.replace(" 1|", " ") s = s.replace(" -1|", " -") - s = s.replace("|","") + s = s.replace("|", "") return s[1:] @@ -702,7 +703,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): # degrees cdef long result = 0 cdef long result_mon - cdef int i,j + cdef int i, j cdef long var_hash_name = hash(self.__u._parent._names[0]) for i in range(self.__u.degree()+1): result_mon = hash(self.__u[i]) @@ -761,7 +762,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): self.__u[start:stop:step] # error out, see issue #18940 stop = stop - self.__n if stop is not None else self.__u.degree() + 1 f = self.__u[:stop] - ret = self._new_c() + ret = self._new_c() ret.__u = f ret.__n = self.__n ret._normalize() @@ -914,11 +915,11 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): j = i - self.__n if j >= 0: self.__u._unsafe_mutate(j, value) - else: # off to the left + else: # off to the left if value != 0: self.__n = self.__n + j R = self._parent.base_ring() - coeffs = [value] + [R.zero() for _ in range(1,-j)] + self.__u.list() + coeffs = [value] + [R.zero() for _ in range(1, -j)] + self.__u.list() self.__u = self.__u._parent(coeffs) self._normalize() @@ -946,7 +947,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): ALGORITHM: Shift the unit parts to align them, then add. """ - cdef LaurentPolynomial_univariate right = right_m + cdef LaurentPolynomial_univariate right = right_m cdef long m cdef LaurentPolynomial_univariate ret @@ -970,8 +971,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): f1 = self.__u f2 = right.__u # 3. Add - ret = self._new_c() - ret.__u = (f1 + f2) + ret = self._new_c() + ret.__u = (f1 + f2) ret.__n = m ret._normalize() return ret @@ -990,7 +991,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): ALGORITHM: Shift the unit parts to align them, then subtract. """ - cdef LaurentPolynomial_univariate right = right_m + cdef LaurentPolynomial_univariate right = right_m cdef long m cdef LaurentPolynomial_univariate ret @@ -1010,8 +1011,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): f1 = self.__u << self.__n - m f2 = right.__u # 3. Subtract - ret = self._new_c() - ret.__u = (f1 - f2) + ret = self._new_c() + ret.__u = (f1 - f2) ret.__n = m ret._normalize() return ret @@ -1043,8 +1044,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): -1 - t^5 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = -self.__u + ret = self._new_c() + ret.__u = -self.__u ret.__n = self.__n # No need to normalize return ret @@ -1059,10 +1060,10 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: f*g x^-3 + x^-2 + x^-1 + x^8 """ - cdef LaurentPolynomial_univariate right = right_r + cdef LaurentPolynomial_univariate right = right_r cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = (self.__u * right.__u) + ret = self._new_c() + ret.__u = (self.__u * right.__u) ret.__n = self.__n + right.__n ret._normalize() return ret @@ -1077,8 +1078,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): 3*x^-3 + 3*x + 3*x^2 + 9*x^4 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = self.__u._rmul_(c) + ret = self._new_c() + ret.__u = self.__u._rmul_(c) ret.__n = self.__n ret._normalize() return ret @@ -1093,8 +1094,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): 3*x^-3 + 3*x + 3*x^2 + 9*x^4 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = self.__u._lmul_(c) + ret = self._new_c() + ret.__u = self.__u._lmul_(c) ret.__n = self.__n ret._normalize() return ret @@ -1171,10 +1172,10 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: 1 // f 0 """ - cdef LaurentPolynomial_univariate right = rhs + cdef LaurentPolynomial_univariate right = rhs cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = (self.__u // right.__u) + ret = self._new_c() + ret.__u = (self.__u // right.__u) ret.__n = self.__n - right.__n ret._normalize() return ret @@ -1197,7 +1198,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): 1 + 4*t^2 + 6*t^4 + 4*t^6 + t^8 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() + ret = self._new_c() ret.__u = self.__u ret.__n = self.__n + k # No need to normalize @@ -1216,7 +1217,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): 1 + 4*t^2 + 6*t^4 + 4*t^6 + t^8 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() + ret = self._new_c() ret.__u = self.__u ret.__n = self.__n + k # No need to normalize @@ -1235,7 +1236,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): t^-14 + 4*t^-12 + 6*t^-10 + 4*t^-8 + t^-6 """ cdef LaurentPolynomial_univariate ret - ret = self._new_c() + ret = self._new_c() ret.__u = self.__u ret.__n = self.__n - k # No need to normalize @@ -1257,7 +1258,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: (x^-2 + x)*(x^-2 + 1) / ((x^-5 + x^-8)*(x + 2)) (x^6 + x^4)/(x + 2) """ - cdef LaurentPolynomial_univariate right = rhs + cdef LaurentPolynomial_univariate right = rhs if right.__u.is_zero(): raise ZeroDivisionError return self * ~right @@ -1283,8 +1284,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): Fraction Field of Univariate Polynomial Ring in t over Rational Field """ cdef LaurentPolynomial_univariate ret - if self.__u.is_constant(): # this has a single term c*x^n - ret = self._new_c() + if self.__u.is_constant(): # this has a single term c*x^n + ret = self._new_c() if self.__u.is_unit(): ret.__u = self.__u.inverse_of_unit() ret.__n = -self.__n @@ -1415,9 +1416,9 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: gcd((t^-2 + t)*(t + t^-1), (t^5 + t^8)*(1 + t^-2)) t^-3 + t^-1 + 1 + t^2 """ - b = self._parent(right) + b = self._parent(right) cdef LaurentPolynomial_univariate ret - ret = self._new_c() + ret = self._new_c() ret.__u = self.__u.gcd(b.__u) ret.__n = min(self.__n, b.__n) ret._normalize() @@ -1460,15 +1461,15 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: num == q * den + r True """ - cdef LaurentPolynomial_univariate right = other + cdef LaurentPolynomial_univariate right = other q, r = self.__u.quo_rem(right.__u) cdef LaurentPolynomial_univariate ql, qr - ql = self._new_c() - ql.__u = q + ql = self._new_c() + ql.__u = q ql.__n = self.__n - right.__n ql._normalize() - qr = self._new_c() - qr.__u = r + qr = self._new_c() + qr.__u = r qr.__n = self.__n qr._normalize() return ql, qr @@ -1513,7 +1514,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): sage: f > g True """ - cdef LaurentPolynomial_univariate right = right_r + cdef LaurentPolynomial_univariate right = right_r zero = self._parent.base_ring().zero() @@ -1574,8 +1575,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): if n <= self.valuation(): return self._parent.zero() cdef LaurentPolynomial_univariate ret - ret = self._new_c() - ret.__u = self.__u.truncate(n - self.__n) + ret = self._new_c() + ret.__u = self.__u.truncate(n - self.__n) ret.__n = self.__n ret._normalize() return ret @@ -1676,7 +1677,6 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): """ return self.__n == 0 and self.__u.is_constant() - def is_square(self, root=False): r""" Return whether this Laurent polynomial is a square. @@ -1758,7 +1758,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): """ from copy import copy cdef LaurentPolynomial_univariate ret - ret = self._new_c() + ret = self._new_c() ret.__u = copy(self.__u) ret.__n = self.__n # No need to normalize @@ -1851,8 +1851,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): try: # call _derivative() recursively on coefficients u = [coeff._derivative(var) for coeff in self.__u.list(copy=False)] - ret = self._new_c() - ret.__u = self._parent._R(u) + ret = self._new_c() + ret.__u = self._parent._R(u) ret.__n = self.__n ret._normalize() return ret @@ -1866,8 +1866,8 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): cdef list a = self.__u.list(copy=True) for m in range(len(a)): a[m] *= n + m - ret = self._new_c() - ret.__u = self._parent._R(a) + ret = self._new_c() + ret.__u = self._parent._R(a) ret.__n = self.__n - 1 ret._normalize() return ret @@ -1923,16 +1923,16 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): cdef list a = self.__u.list(copy=False) if n < 0: - v = [a[i]/(n+i+1) for i in range(min(-1-n,len(a)))] + [0] + v = [a[i]/(n+i+1) for i in range(min(-1-n, len(a)))] + [0] else: v = [] - v += [a[i]/(n+i+1) for i in range(max(-n,0), len(a))] + v += [a[i]/(n+i+1) for i in range(max(-n, 0), len(a))] try: u = self._parent._R(v) except TypeError: raise ArithmeticError("coefficients of integral cannot be coerced into the base ring") - ret = self._new_c() - ret.__u = u + ret = self._new_c() + ret.__u = u ret.__n = n + 1 ret._normalize() return ret @@ -1965,7 +1965,7 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): """ if kwds: f = self.subs(**kwds) - if x: # If there are non-keyword arguments + if x: # If there are non-keyword arguments return f(*x) else: return f @@ -1993,14 +1993,14 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): """ cdef LaurentPolynomial_univariate u, d pf = self.__u.factor() - u = self._new_c() + u = self._new_c() u.__u = pf.unit() u.__n = self.__n u._normalize() f = [] for t in pf: - d = self._new_c() + d = self._new_c() d.__u = t[0] d.__n = 0 d._normalize() @@ -2047,6 +2047,29 @@ cdef class LaurentPolynomial_univariate(LaurentPolynomial): """ return self.__u[-self.__n] + def _as_extended_polynomial(self): + """ + This Laurent polynomial seen as a polynomial in twice as many variables, + where half of the variables are the inverses of the other half. + + EXAMPLES:: + + sage: L. = LaurentPolynomialRing(QQ) + sage: f = t-t^-2 + sage: f._as_extended_polynomial() + -tinv^2 + t + sage: _.parent() + Multivariate Polynomial Ring in t, tinv over Rational Field + + """ + dres = {} + for (e, c) in self.dict().items(): + if e > 0: + dres[(e, 0)] = c + else: + dres[(0, -e)] = c + return self.parent()._extended_ring(dres) + @coerce_binop def divides(self, other): r""" diff --git a/src/sage/rings/polynomial/laurent_polynomial_mpair.pyx b/src/sage/rings/polynomial/laurent_polynomial_mpair.pyx index c0fd659591f..7832488a2ef 100644 --- a/src/sage/rings/polynomial/laurent_polynomial_mpair.pyx +++ b/src/sage/rings/polynomial/laurent_polynomial_mpair.pyx @@ -22,6 +22,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ Multivariate Laurent polynomials. """ + def __init__(self, parent, x, mon=None, reduce=True): """ Currently, one can only create LaurentPolynomials out of dictionaries @@ -120,8 +121,8 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): x = {k.esub(self._mon): x_k for k, x_k in x.iteritems()} elif (isinstance(x, LaurentPolynomial_mpair) and parent.variable_names() == x.parent().variable_names()): - self._mon = (x)._mon - x = (x)._poly + self._mon = ( < LaurentPolynomial_mpair > x)._mon + x = ( < LaurentPolynomial_mpair > x)._poly else: # since x should coerce into parent, _mon should be (0,...,0) self._mon = ETuple({}, int(parent.ngens())) self._poly = parent._R(x) @@ -279,26 +280,26 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): # self._parent.variable_names(), # self._parent.base_ring() # ) - cdef dict D = self._poly.dict() + cdef dict D = self._poly.dict() cdef ETuple e if i is None: e = None for k in D: if e is None: - e = k + e = k else: e = e.emin(k) if not e.is_constant(): - self._poly = (self._poly // self._poly._parent({e: 1})) + self._poly = (self._poly // self._poly._parent({e: 1})) self._mon = self._mon.eadd(e) else: e = None for k in D: if e is None or k[i] < e: - e = k[i] + e = k[i] if e > 0: - self._poly = (self._poly // self._poly._parent.gen(i)) + self._poly = (self._poly // self._poly._parent.gen(i)) self._mon = self._mon.eadd_p(e, i) cdef _compute_polydict(self) noexcept: @@ -312,7 +313,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ # cdef dict D = self._poly._mpoly_dict_recursive(self._parent.variable_names(), # self._parent.base_ring()) - cdef dict D = self._poly.dict() + cdef dict D = self._poly.dict() cdef dict DD if self._mon.is_constant(): self._prod = PolyDict(D) @@ -555,6 +556,34 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): for exp, coeff in self._poly.iterator_exp_coeff(): yield (coeff, P.element_class(P, one, exp.eadd(self._mon))) + def _as_extended_polynomial(self): + """ + This Laurent polynomial seen as a polynomial in twice as many variables, + where half of the variables are the inverses of the other half. + + EXAMPLES:: + + sage: L. = LaurentPolynomialRing(QQ) + sage: f = t1-t2^-2 + sage: f + t1 - t2^-2 + sage: f._as_extended_polynomial() + -t2inv^2 + t1 + sage: _.parent() + Multivariate Polynomial Ring in t1, t1inv, t2, t2inv over Rational Field + + """ + dres = {} + for (e, c) in self.dict().items(): + exps = [] + for t in e: + if t > 0: + exps += [t, 0] + else: + exps += [0, -t] + dres[tuple(exps)] = c + return self.parent()._extended_ring(dres) + def iterator_exp_coeff(self): """ Iterate over ``self`` as pairs of (ETuple, coefficient). @@ -621,7 +650,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ if parent(mon) != self._parent: raise TypeError("input must have the same parent") - cdef LaurentPolynomial_mpair m = mon + cdef LaurentPolynomial_mpair m = mon if m._prod is None: m._compute_polydict() if self._prod is None: @@ -710,7 +739,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ if mon.parent() is not self._parent: mon = self._parent(mon) - cdef LaurentPolynomial_mpair m = mon + cdef LaurentPolynomial_mpair m = mon if self._prod is None: self._compute_polydict() if m._prod is None: @@ -780,7 +809,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ if self._prod is None: self._compute_polydict() - return self._prod.dict() + return < dict > self._prod.dict() def _fraction_pair(self): """ @@ -822,7 +851,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): x + y + z + y^-1 """ cdef LaurentPolynomial_mpair ans = self._new_c() - cdef LaurentPolynomial_mpair right = _right + cdef LaurentPolynomial_mpair right = _right ans._mon, a, b = self._mon.combine_to_positives(right._mon) if not a.is_constant(): ans._poly = self._poly * self._poly._parent({a: 1}) @@ -847,7 +876,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): -y - z + y^-1 """ cdef LaurentPolynomial_mpair ans = self._new_c() - cdef LaurentPolynomial_mpair right = _right + cdef LaurentPolynomial_mpair right = _right cdef ETuple a, b ans._mon, a, b = self._mon.combine_to_positives(right._mon) if not a.is_constant(): @@ -883,7 +912,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): sage: (s+q)/(q^2*t^(-2)) s*q^-2*t^2 + q^-1*t^2 """ - cdef LaurentPolynomial_mpair right = rhs + cdef LaurentPolynomial_mpair right = rhs if right.is_zero(): raise ZeroDivisionError if right._poly.is_term(): @@ -972,8 +1001,8 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): x*y + x*z + 1 + y^-1*z """ cdef LaurentPolynomial_mpair ans = self._new_c() - ans._mon = self._mon.eadd((right)._mon) - ans._poly = self._poly * (right)._poly + ans._mon = self._mon.eadd(( < LaurentPolynomial_mpair > right)._mon) + ans._poly = self._poly * ( < LaurentPolynomial_mpair > right)._poly return ans cpdef _floordiv_(self, right) noexcept: @@ -1012,7 +1041,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): b + 1 """ cdef LaurentPolynomial_mpair ans = self._new_c() - cdef LaurentPolynomial_mpair rightl = right + cdef LaurentPolynomial_mpair rightl = right self._normalize() rightl._normalize() ans._mon = self._mon.esub(rightl._mon) @@ -1064,8 +1093,8 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): selfl._poly = self._poly selfl._mon = self._mon cdef LaurentPolynomial_mpair rightl = self._new_c() - rightl._poly = ( right)._poly - rightl._mon = ( right)._mon + rightl._poly = (< LaurentPolynomial_mpair > right)._poly + rightl._mon = (< LaurentPolynomial_mpair > right)._mon selfl._normalize() rightl._normalize() @@ -1098,15 +1127,15 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): """ if self._prod is None: self._compute_polydict() - if ( right)._prod is None: - ( right)._compute_polydict() + if (< LaurentPolynomial_mpair > right)._prod is None: + (< LaurentPolynomial_mpair > right)._compute_polydict() try: sortkey = self._parent.term_order().sortkey except AttributeError: sortkey = None - return self._prod.rich_compare((right)._prod, + return self._prod.rich_compare(( < LaurentPolynomial_mpair > right)._prod, op, sortkey) def exponents(self): @@ -1143,7 +1172,7 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): if not x: return self._poly.total_degree() + sum(self._mon) - cdef tuple g = self._parent.gens() + cdef tuple g = self._parent.gens() cdef Py_ssize_t i cdef bint no_generator_found = True for i in range(len(g)): @@ -1581,14 +1610,14 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): u = self.parent(pf.unit()) - cdef tuple g = self._parent.gens() + cdef tuple g = self._parent.gens() for i in self._mon.nonzero_positions(): u *= g[i] ** self._mon[i] cdef list f = [] cdef dict d for t in pf: - d = (t[0].dict()) + d = (t[0].dict()) if len(d) == 1: # monomials are units u *= self.parent(d) ** t[1] else: @@ -1700,14 +1729,14 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): val *= d[i]**v[i] df[v] = R(h(val)) - ans = self._new_c() + ans = self._new_c() ans._prod = PolyDict(df) ans._mon = self._mon if new_ring is None: S = self._poly._parent else: S = self._poly._parent.change_ring(R) - ans._poly = S({v.esub(ans._mon): df[v] for v in df}) + ans._poly = S({v.esub(ans._mon): df[v] for v in df}) if new_ring is not None: return new_ring(ans) return ans @@ -1763,8 +1792,8 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): x = 0 for i in range(n): if not mat.get_is_zero_unsafe(j, i): - x += ( v[i]) * int(mat.get_unsafe(j, i)) - if x < ( mon[j]): + x += (< int > v[i]) * int(mat.get_unsafe(j, i)) + if x < (< int > mon[j]): mon[j] = x exp[j] = x dr[ETuple(exp)] = d[v] @@ -1773,10 +1802,10 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): for v in dr: dr[v] = self._parent._base(h(dr[v])) - ans = self._new_c() + ans = self._new_c() ans._prod = PolyDict(dr) ans._mon = ETuple(mon) - ans._poly = self._poly._parent({v.esub(ans._mon): dr[v] for v in dr}) + ans._poly = self._poly._parent({v.esub(ans._mon): dr[v] for v in dr}) if new_ring is not None: return new_ring(ans) return ans @@ -1847,10 +1876,10 @@ cdef class LaurentPolynomial_mpair(LaurentPolynomial): S = self._poly._parent else: S = self._poly._parent.change_ring(new_ring._base) - ans = self._new_c() + ans = self._new_c() ans._prod = PolyDict(dr) ans._mon = mon - ans._poly = S({v.esub(ans._mon): dr[v] for v in dr}) + ans._poly = S({v.esub(ans._mon): dr[v] for v in dr}) if new_ring is not None: return new_ring(ans) return ans diff --git a/src/sage/rings/polynomial/laurent_polynomial_ring_base.py b/src/sage/rings/polynomial/laurent_polynomial_ring_base.py index c10cbb219b0..bbb6b9e1fc9 100644 --- a/src/sage/rings/polynomial/laurent_polynomial_ring_base.py +++ b/src/sage/rings/polynomial/laurent_polynomial_ring_base.py @@ -25,6 +25,7 @@ from sage.rings.infinity import infinity +from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.rings.ring import CommutativeRing from sage.structure.parent import Parent @@ -61,6 +62,13 @@ def __init__(self, R): self._one_element = self.element_class(self, R.one()) CommutativeRing.__init__(self, R.base_ring(), names=names, category=R.category()) + ernames = [] + for n in names: + ernames.append(n) + ernames.append(n + "inv") + ER = PolynomialRing(R.base_ring(), ernames) + self._extended_ring = ER + self._extended_ring_ideal = ER.ideal([ER.gen(2*i)*ER.gen(2*i+1)-1 for i in range(self._n)]) def ngens(self): """ diff --git a/src/sage/rings/polynomial/multi_polynomial_ideal.py b/src/sage/rings/polynomial/multi_polynomial_ideal.py index a752af29e75..4b460f244d6 100644 --- a/src/sage/rings/polynomial/multi_polynomial_ideal.py +++ b/src/sage/rings/polynomial/multi_polynomial_ideal.py @@ -238,33 +238,34 @@ import sage.rings.abc import sage.rings.polynomial.toy_buchberger as toy_buchberger -import sage.rings.polynomial.toy_variety as toy_variety import sage.rings.polynomial.toy_d_basis as toy_d_basis - +import sage.rings.polynomial.toy_variety as toy_variety from sage.misc.cachefunc import cached_method from sage.misc.method_decorator import MethodDecorator from sage.misc.misc_c import prod -from sage.misc.verbose import verbose, get_verbose +from sage.misc.verbose import get_verbose, verbose from sage.rings.ideal import Ideal_generic from sage.rings.integer import Integer from sage.rings.integer_ring import ZZ from sage.rings.noncommutative_ideals import Ideal_nc from sage.rings.qqbar_decorators import handle_AA_and_QQbar +from sage.structure.richcmp import (op_EQ, op_GE, op_GT, op_LE, op_LT, op_NE, + rich_to_bool, richcmp_method) from sage.structure.sequence import Sequence -from sage.structure.richcmp import (richcmp_method, op_EQ, op_NE, - op_LT, op_GT, op_LE, op_GE, rich_to_bool) - try: from sage.interfaces.expect import StdOutContext - from sage.interfaces.singular import singular as singular_default, singular_gb_standard_options - from sage.libs.singular.standard_options import libsingular_gb_standard_options + from sage.interfaces.singular import singular as singular_default + from sage.interfaces.singular import singular_gb_standard_options + from sage.libs.singular.standard_options import \ + libsingular_gb_standard_options except ImportError: singular_default = None singular_gb_standard_options = libsingular_gb_standard_options = MethodDecorator try: - from sage.interfaces.magma import magma as magma_default, magma_gb_standard_options + from sage.interfaces.magma import magma as magma_default + from sage.interfaces.magma import magma_gb_standard_options except ImportError: magma_default = None magma_gb_standard_options = MethodDecorator @@ -439,7 +440,8 @@ def _groebner_basis_magma(self, deg_bound=None, prot=False, magma=magma_default) a = str(R.base_ring().gen()) mgb = [e.replace("$.1",a) for e in mgb] - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence B = PolynomialSequence([R(e) for e in mgb], R, immutable=True) return B @@ -531,11 +533,11 @@ def _groebner_basis_libsingular(self, algorithm="groebner", *args, **kwds): sage: len(gI.gens()) 3 """ - from sage.rings.polynomial.multi_polynomial_ideal_libsingular import std_libsingular, slimgb_libsingular from sage.libs.singular.function import singular_function - from sage.libs.singular.option import opt - from sage.libs.singular.function_factory import ff + from sage.libs.singular.option import opt + from sage.rings.polynomial.multi_polynomial_ideal_libsingular import ( + slimgb_libsingular, std_libsingular) groebner = ff.groebner if get_verbose() >= 2: @@ -592,14 +594,15 @@ def _groebner_cover(self): [[1], [1], [[[(2*a + 3)], [[1]]]]]] """ from sage.rings.fraction_field import FractionField_generic - from sage.rings.polynomial.multi_polynomial_ring_base import is_MPolynomialRing + from sage.rings.polynomial.multi_polynomial_ring_base import \ + is_MPolynomialRing from sage.rings.polynomial.polynomial_ring import is_PolynomialRing F = self.base_ring() if (not isinstance(F, FractionField_generic) or (not is_MPolynomialRing(F.ring()) and not is_PolynomialRing(F.ring()))): raise TypeError("the base ring must be a field with parameters") - from sage.libs.singular.function import singular_function, lib from sage.arith.functions import lcm + from sage.libs.singular.function import lib, singular_function lib("grobcov.lib") grobcov = singular_function("grobcov") polynomials = [] @@ -1142,8 +1145,8 @@ def triangular_decomposition(self, algorithm=None, singular=singular_default): if I.dimension() != 0: raise TypeError("dimension must be zero") - from sage.libs.singular.function import singular_function from sage.libs.singular.function import lib as singular_lib + from sage.libs.singular.function import singular_function singular_lib('triang.lib') @@ -1471,7 +1474,8 @@ def _groebner_basis_singular(self, algorithm="groebner", *args, **kwds): This method is called by the :meth:`.groebner_basis` method and the user usually doesn't need to bother with this one. """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence R = self.ring() S = self._groebner_basis_singular_raw(algorithm=algorithm, *args, **kwds) @@ -1806,7 +1810,8 @@ def integral_closure(self, p=0, r=True, singular=singular_default): Uses libSINGULAR. """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence R = self.ring() from sage.libs.singular.function_factory import ff @@ -1895,9 +1900,11 @@ def free_resolution(self, *args, **kwds): ... NotImplementedError: the ring must be a polynomial ring using Singular """ - from sage.rings.polynomial.multi_polynomial_libsingular import MPolynomialRing_libsingular + from sage.rings.polynomial.multi_polynomial_libsingular import \ + MPolynomialRing_libsingular if isinstance(self.ring(), MPolynomialRing_libsingular): - from sage.homology.free_resolution import FiniteFreeResolution_singular + from sage.homology.free_resolution import \ + FiniteFreeResolution_singular return FiniteFreeResolution_singular(self, *args, **kwds) raise NotImplementedError("the ring must be a polynomial ring using Singular") @@ -1934,9 +1941,11 @@ def graded_free_resolution(self, *args, **kwds): ... NotImplementedError: the ring must be a polynomial ring using Singular """ - from sage.rings.polynomial.multi_polynomial_libsingular import MPolynomialRing_libsingular + from sage.rings.polynomial.multi_polynomial_libsingular import \ + MPolynomialRing_libsingular if isinstance(self.ring(), MPolynomialRing_libsingular): - from sage.homology.graded_resolution import GradedFiniteFreeResolution_singular + from sage.homology.graded_resolution import \ + GradedFiniteFreeResolution_singular return GradedFiniteFreeResolution_singular(self, *args, **kwds) raise NotImplementedError("the ring must be a polynomial ring using Singular") @@ -2110,9 +2119,9 @@ def basis_is_groebner(self, singular=singular_default): sage: I2.basis_is_groebner() True """ - from sage.matrix.constructor import matrix - from sage.libs.singular.option import opt_verb_ctx from sage.libs.singular.function_factory import ff + from sage.libs.singular.option import opt_verb_ctx + from sage.matrix.constructor import matrix sing_reduce = ff.reduce syz = ff.syz @@ -2220,7 +2229,8 @@ def transformed_basis(self, algorithm="gwalk", other_ring=None, singular=singula sage: J = Ideal(I.transformed_basis('fglm', other_ring=S)) # known bug sage: J # known bug """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence R = self.ring() if self.basis_is_groebner(): @@ -2229,8 +2239,7 @@ def transformed_basis(self, algorithm="gwalk", other_ring=None, singular=singula I = R.ideal(self.groebner_basis()) if algorithm in ("gwalk","awalk1","awalk2","twalk","fwalk"): - from sage.libs.singular.function import lib - from sage.libs.singular.function import singular_function + from sage.libs.singular.function import lib, singular_function lib("grwalk.lib") gb = singular_function(algorithm)(I) return PolynomialSequence(R, sorted(gb,reverse=True), immutable=True) @@ -2468,6 +2477,7 @@ def saturation(self, other): (Ideal (y, x^5) of Multivariate Polynomial Ring in x, y, z over Algebraic Field, 4) """ from sage.libs.singular.function_factory import ff + # function renamed in singular > 4.3.2p4, see issue #35980 try: sat = ff.elim__lib.sat_with_exp @@ -3242,8 +3252,10 @@ def _normal_basis_libsingular(self, degree, weights=None): sage: I.normal_basis() [k, 1] """ - from sage.rings.polynomial.multi_polynomial_ideal_libsingular import kbase_libsingular - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_ideal_libsingular import \ + kbase_libsingular + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence gb = self._groebner_basis_libsingular() J = self.ring().ideal(gb) if weights is None or degree is None: @@ -3330,7 +3342,8 @@ def normal_basis(self, degree=None, algorithm='libsingular', sage: S.ideal(x^6 + y^3 + z^2).normal_basis(6, algorithm='singular') # needs sage.rings.finite_rings [x^4*y, x^2*y^2, y^3, x^3*z, x*y*z, z^2] """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence weights = tuple(x.degree() for x in self.ring().gens()) if all(w == 1 for w in weights): @@ -3427,7 +3440,8 @@ def _groebner_basis_macaulay2(self, strategy=None): ... ValueError: unsupported Macaulay2 strategy """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence I = self._macaulay2_() if strategy == "gb" or strategy is None: @@ -3904,7 +3918,8 @@ def gens(self): sage: I.gens() [x, y + 1] """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence return PolynomialSequence(self.ring(), Ideal_generic.gens(self), immutable=True) @property @@ -4636,8 +4651,10 @@ def groebner_basis(self, algorithm='', deg_bound=None, mult_bound=None, prot=Fal ... NotImplementedError: msolve only supports the degrevlex order (use transformed_basis()) """ - from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence - from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.multi_polynomial_sequence import \ + PolynomialSequence + from sage.rings.polynomial.polynomial_ring_constructor import \ + PolynomialRing if algorithm.lower() == "magma": algorithm = "magma:GroebnerBasis" @@ -5144,9 +5161,9 @@ def degree_of_semi_regularity(self): if m <= n: raise ValueError("This function requires an overdefined system of polynomials.") - from sage.rings.rational_field import QQ from sage.misc.misc_c import prod from sage.rings.power_series_ring import PowerSeriesRing + from sage.rings.rational_field import QQ z = PowerSeriesRing(QQ, 'z', default_prec=sum(degs)).gen() s = prod([1-z**d for d in degs]) / (1-z)**n @@ -5220,8 +5237,8 @@ def plot(self, *args, **kwds): Graphics object consisting of 1 graphics primitive """ - from sage.rings.real_mpfr import RR from sage.plot.all import implicit_plot + from sage.rings.real_mpfr import RR K = self.base_ring() if not RR.has_coerce_map_from(K): @@ -5538,7 +5555,8 @@ def weil_restriction(self): Based on a Singular implementation by Michael Brickenstein """ - from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import \ + PolynomialRing R = self.ring() nvars = R.ngens() diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx index e9787a2e0f7..561136bac6d 100644 --- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx @@ -253,7 +253,7 @@ from sage.misc.sage_eval import sage_eval import sage.rings.polynomial.polynomial_singular_interface cimport cypari2.gen -from . import polynomial_element +from sage.rings.polynomial import polynomial_element permstore=[] cdef class MPolynomialRing_libsingular(MPolynomialRing_base): diff --git a/src/sage/rings/polynomial/multi_polynomial_ring_base.pyx b/src/sage/rings/polynomial/multi_polynomial_ring_base.pyx index 66ade555385..44946845b83 100644 --- a/src/sage/rings/polynomial/multi_polynomial_ring_base.pyx +++ b/src/sage/rings/polynomial/multi_polynomial_ring_base.pyx @@ -22,9 +22,9 @@ from sage.arith.misc import binomial from sage.rings.integer_ring import ZZ -from . import polynomial_ring -from .term_order import TermOrder -from .polynomial_ring_constructor import (PolynomialRing, +from sage.rings.polynomial import polynomial_ring +from sage.rings.polynomial.term_order import TermOrder +from sage.rings.polynomial.polynomial_ring_constructor import (PolynomialRing, polynomial_default_category) @@ -135,7 +135,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): """ base = self.base_ring() if is_MPolynomialRing(base) or polynomial_ring.is_PolynomialRing(base): - from .flatten import FlatteningMorphism + from sage.rings.polynomial.flatten import FlatteningMorphism return FlatteningMorphism(self) else: return IdentityMorphism(self) @@ -157,7 +157,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): False """ - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.categories.pushout import MultiPolynomialFunctor return MultiPolynomialFunctor(self.variable_names(), self.term_order()), self.base_ring() @@ -323,7 +323,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): vars.remove(str(v)) if len(vars) == 0: return self.base_ring() - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing if order is None: try: return PolynomialRing(self.base_ring(), vars, @@ -614,7 +614,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): a dict with respect to ``self.variable_names()``. """ # This is probably horribly inefficient - from .polydict import ETuple + from sage.rings.polynomial.polydict import ETuple other_vars = list(x.parent().variable_names()) name_mapping = [(other_vars.index(var) if var in other_vars else -1) for var in self.variable_names()] K = self.base_ring() @@ -705,7 +705,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): return "%s[%s]" % (sage.misc.latex.latex(self.base_ring()), vars) def _ideal_class_(self, n=0): - from .multi_polynomial_ideal import MPolynomialIdeal + from sage.rings.polynomial.multi_polynomial_ideal import MPolynomialIdeal return MPolynomialIdeal def _is_valid_homomorphism_(self, codomain, im_gens, base_map=None): @@ -915,7 +915,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): elif not set(my_vars).issubset(set(vars)): while my_vars[-1] in vars: my_vars.pop() - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing return PolynomialRing(self.base_ring(), my_vars) else: try: @@ -1357,7 +1357,7 @@ cdef class MPolynomialRing_base(sage.rings.ring.CommutativeRing): if order is None: order = self.term_order() - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing return PolynomialRing(base_ring, self.ngens(), names, order=order) def monomial(self, *exponents): @@ -1786,11 +1786,11 @@ cdef class BooleanPolynomialRing_base(MPolynomialRing_base): # Leave *all* old versions! def unpickle_MPolynomialRing_generic_v1(base_ring, n, names, order): - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing return PolynomialRing(base_ring, n, names=names, order=order) def unpickle_MPolynomialRing_generic(base_ring, n, names, order): - from .polynomial_ring_constructor import PolynomialRing + from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing return PolynomialRing(base_ring, n, names=names, order=order) diff --git a/src/sage/rings/polynomial/multi_polynomial_sequence.py b/src/sage/rings/polynomial/multi_polynomial_sequence.py index b52fb34f721..9f0c7712d58 100644 --- a/src/sage/rings/polynomial/multi_polynomial_sequence.py +++ b/src/sage/rings/polynomial/multi_polynomial_sequence.py @@ -173,10 +173,10 @@ from sage.rings.quotient_ring import is_QuotientRing from sage.structure.sequence import Sequence_generic - try: from sage.interfaces.singular import singular, singular_gb_standard_options - from sage.libs.singular.standard_options import libsingular_gb_standard_options + from sage.libs.singular.standard_options import \ + libsingular_gb_standard_options except ImportError: singular = None singular_gb_standard_options = libsingular_gb_standard_options = MethodDecorator @@ -1151,8 +1151,10 @@ def reduced(self): [y^3 + z, x*y + (1 + 2 + O(2^20))*z, x*z - z] """ - from sage.rings.polynomial.multi_polynomial_ideal_libsingular import interred_libsingular - from sage.rings.polynomial.multi_polynomial_libsingular import MPolynomialRing_libsingular + from sage.rings.polynomial.multi_polynomial_ideal_libsingular import \ + interred_libsingular + from sage.rings.polynomial.multi_polynomial_libsingular import \ + MPolynomialRing_libsingular R = self.ring() @@ -1169,7 +1171,8 @@ def reduced(self): ret.append(f.lc()**(-1)*f) # lead coeffs are not reduced by interred s.option("set",o) except TypeError: - from sage.rings.polynomial.toy_buchberger import inter_reduction + from sage.rings.polynomial.toy_buchberger import \ + inter_reduction ret = inter_reduction(self) ret = sorted(ret, reverse=True) @@ -1327,15 +1330,17 @@ def eliminate_linear_variables(self, maxlength=Infinity, skip=None, return_reduc This is called "massaging" in [BCJ2007]_. """ - from sage.rings.polynomial.multi_polynomial_ring_base import BooleanPolynomialRing_base + from sage.rings.polynomial.multi_polynomial_ring_base import \ + BooleanPolynomialRing_base R = self.ring() if not isinstance(R, BooleanPolynomialRing_base): raise NotImplementedError("Only BooleanPolynomialRing's are supported.") + from sage.rings.polynomial.pbori.ll import (eliminate, ll_encode, + ll_red_nf_redsb) from sage.rings.polynomial.pbori.pbori import gauss_on_polys - from sage.rings.polynomial.pbori.ll import eliminate, ll_encode, ll_red_nf_redsb F = self reductors = [] @@ -1413,7 +1418,8 @@ def _groebner_strategy(self): sage: F._groebner_strategy() """ - from sage.rings.polynomial.multi_polynomial_ring_base import BooleanPolynomialRing_base + from sage.rings.polynomial.multi_polynomial_ring_base import \ + BooleanPolynomialRing_base R = self.ring() @@ -1537,7 +1543,8 @@ def solve(self, algorithm='polybori', n=1, eliminate_linear_variables=True, ver if eliminate_linear_variables: T, reductors = self.eliminate_linear_variables(return_reductors=True) if T.variables() != (): - from sage.rings.polynomial.pbori.pbori import BooleanPolynomialRing + from sage.rings.polynomial.pbori.pbori import \ + BooleanPolynomialRing R_solving = BooleanPolynomialRing( T.nvariables(), [str(_) for _ in list(T.variables())] ) S = PolynomialSequence( R_solving, [ R_solving(f) for f in T] ) @@ -1621,12 +1628,14 @@ def reduced(self): ....: assert g[i].lt() not in t.divisors() """ - from sage.rings.polynomial.multi_polynomial_ring_base import BooleanPolynomialRing_base + from sage.rings.polynomial.multi_polynomial_ring_base import \ + BooleanPolynomialRing_base R = self.ring() if isinstance(R, BooleanPolynomialRing_base): - from sage.rings.polynomial.pbori.interred import interred as inter_red + from sage.rings.polynomial.pbori.interred import \ + interred as inter_red l = [p for p in self if not p == 0] l = sorted(inter_red(l, completely=True), reverse=True) @@ -1683,5 +1692,6 @@ def weil_restriction(self): from sage.misc.persist import register_unpickle_override + register_unpickle_override("sage.crypto.mq.mpolynomialsystem","MPolynomialSystem_generic", PolynomialSequence_generic) register_unpickle_override("sage.crypto.mq.mpolynomialsystem","MPolynomialRoundSystem_generic", PolynomialSequence_generic) diff --git a/src/sage/rings/polynomial/pbori/fglm.py b/src/sage/rings/polynomial/pbori/fglm.py index dc60adef14c..60559b31b85 100644 --- a/src/sage/rings/polynomial/pbori/fglm.py +++ b/src/sage/rings/polynomial/pbori/fglm.py @@ -1,5 +1,5 @@ -from .PyPolyBoRi import Polynomial, BoolePolynomialVector -from .pbori import FGLMStrategy, BooleSet +from .pbori import BooleSet, FGLMStrategy +from .PyPolyBoRi import BoolePolynomialVector, Polynomial def _fglm(I, from_ring, to_ring): diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx index 90e3663da5c..f06b8241e9c 100644 --- a/src/sage/rings/polynomial/plural.pyx +++ b/src/sage/rings/polynomial/plural.pyx @@ -37,8 +37,7 @@ The underlying libSINGULAR interface was implemented by - Martin Albrecht (2009-05): added `\ZZ/n\ZZ` support, refactoring - - Martin Albrecht (2009-06): refactored the code to allow better - re-use + - Martin Albrecht (2009-06): refactored the code to allow better re-use .. TODO:: @@ -100,7 +99,6 @@ TESTS:: sage: TestSuite(P).run() sage: loads(dumps(P)) is P True - """ from cysignals.memory cimport sig_malloc, sig_free @@ -128,12 +126,11 @@ from sage.rings.polynomial.multi_polynomial_libsingular cimport MPolynomialRing_ from sage.rings.polynomial.multi_polynomial_ideal import NCPolynomialIdeal from sage.rings.polynomial.polydict import ETuple -from sage.rings.ring import check_default_category +from sage.rings.ring import check_default_category, Ring from sage.structure.element cimport CommutativeRingElement, Element, RingElement from sage.structure.factory import UniqueFactory from sage.structure.richcmp cimport rich_to_bool from sage.structure.parent cimport Parent -from sage.structure.parent_gens cimport ParentWithGens from sage.rings.polynomial.term_order import TermOrder from sage.misc.functional import coerce @@ -149,7 +146,6 @@ class G_AlgFactory(UniqueFactory): sage: H = A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) sage: H is A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) # indirect doctest True - """ def create_object(self, version, key, **extra_args): """ @@ -157,15 +153,15 @@ class G_AlgFactory(UniqueFactory): INPUT: - - ``key`` - a 6-tuple, formed by a base ring, a tuple of names, two + - ``key`` -- a 6-tuple, formed by a base ring, a tuple of names, two matrices over a polynomial ring over the base ring with the given variable names, a term order, and a category - - ``extra_args`` - a dictionary, whose only relevant key is 'check'. + - ``extra_args`` -- a dictionary, whose only relevant key is 'check'. TESTS:: sage: A. = FreeAlgebra(QQ, 3) - sage: H=A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) + sage: H = A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) sage: sorted(H.relations().items(), key=str) [(y*x, x*y - z), (z*x, x*z + 2*x), (z*y, y*z - 2*y)] """ @@ -183,12 +179,12 @@ class G_AlgFactory(UniqueFactory): INPUT: - - ``base_ring`` - a ring - - ``c,d`` - two matrices - - ``names`` - a tuple or list of names - - ``order`` - (optional) term order - - ``category`` - (optional) category - - ``check`` - optional bool + - ``base_ring`` -- a ring + - ``c,d`` -- two matrices + - ``names`` -- a tuple or list of names + - ``order`` -- (optional) term order + - ``category`` -- (optional) category + - ``check`` -- optional bool TESTS:: @@ -196,7 +192,6 @@ class G_AlgFactory(UniqueFactory): sage: H = A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) sage: H is A.g_algebra({y*x:x*y-z, z*x:x*z+2*x, z*y:y*z-2*y}) # indirect doctest True - """ if names is None: raise ValueError("The generator names must be provided") @@ -255,9 +250,9 @@ cdef class NCPolynomialRing_plural(Ring): INPUT: - - ``base_ring`` - base ring (must be either `\GF{q}`, `\ZZ`, `\ZZ/n\ZZ`, `\QQ` or absolute number field) + - ``base_ring`` -- base ring (must be either `\GF{q}`, `\ZZ`, `\ZZ/n\ZZ`, `\QQ` or absolute number field) - ``names`` - a tuple of names of ring variables - - ``c``, ``d``- upper triangular matrices of coefficients, + - ``c``, ``d`` -- upper triangular matrices of coefficients, resp. commutative polynomials, satisfying the nondegeneracy conditions, which are to be tested if ``check`` is ``True``. These matrices describe the noncommutative relations: @@ -266,8 +261,8 @@ cdef class NCPolynomialRing_plural(Ring): where ``0 <= i < j < self.ngens()``. Note that two variables commute if they are not part of one of these relations. - - ``order`` - term order - - ``check`` - check the noncommutative conditions (default: ``True``) + - ``order`` -- term order + - ``check`` -- check the noncommutative conditions (default: ``True``) TESTS: @@ -342,14 +337,11 @@ cdef class NCPolynomialRing_plural(Ring): Ring.__init__(self, base_ring, names, category=category) self._populate_coercion_lists_() - #MPolynomialRing_generic.__init__(self, base_ring, n, names, order) - #self._has_singular = True - assert(n == len(self._names)) + assert n == len(self._names) self._one_element = new_NCP(self, p_ISet(1, self._ring)) self._zero_element = new_NCP(self, NULL) - if check: from sage.libs.singular.function_factory import ff test = ff.nctools__lib.ndcond(ring = self) @@ -378,9 +370,9 @@ cdef class NCPolynomialRing_plural(Ring): True """ return g_Algebra, (self.base_ring(), self._c, self._d, - self.variable_names(), - self.term_order(), - self.category()) + self.variable_names(), + self.term_order(), + self.category()) def __dealloc__(self): r""" @@ -420,7 +412,7 @@ cdef class NCPolynomialRing_plural(Ring): def _element_constructor_(self, element): """ - Make sure element is a valid member of self, and return the constructed element. + Make sure element is a valid member of ``self``, and return the constructed element. EXAMPLES:: @@ -441,7 +433,7 @@ cdef class NCPolynomialRing_plural(Ring): TESTS: - Check conversion from self:: + Check conversion from ``self``:: sage: A. = FreeAlgebra(QQ, 3) sage: P. = A.g_algebra(relations={y*x:-x*y}, order = 'lex') @@ -496,9 +488,7 @@ cdef class NCPolynomialRing_plural(Ring): sage: B = A.g_algebra({y*x:-x*y}) sage: B(2) 2 - """ - if element == 0: return self._zero_element if element == 1: @@ -517,7 +507,8 @@ cdef class NCPolynomialRing_plural(Ring): except Exception: pass - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) if isinstance(element, NCPolynomial_plural): @@ -592,7 +583,7 @@ cdef class NCPolynomialRing_plural(Ring): def free_algebra(self): """ - The free algebra of which this is the quotient. + Return the free algebra of which this is the quotient. EXAMPLES:: @@ -607,7 +598,9 @@ cdef class NCPolynomialRing_plural(Ring): def __hash__(self): """ - Return a hash for this noncommutative ring, that is, a hash of the string + Return a hash for this noncommutative ring. + + This is a hash of the string representation of this polynomial ring. NOTE: @@ -624,7 +617,6 @@ cdef class NCPolynomialRing_plural(Ring): sage: P = A.g_algebra(relations={y*x:-x*y}, order = 'lex') sage: {P:2}[P] # indirect doctest 2 - """ return self @@ -632,10 +624,10 @@ cdef class NCPolynomialRing_plural(Ring): """ Return the free module of rank `n` over this ring. - NOTE: + .. NOTE:: - This is not properly implemented yet. Thus, there is - a warning. + This is not properly implemented yet. Thus, there is + a warning. EXAMPLES:: @@ -653,7 +645,6 @@ cdef class NCPolynomialRing_plural(Ring): It's also not guaranteed that all multiplications are done from the right side. Ambient free module of rank 3 over Noncommutative Multivariate Polynomial Ring in x, y, z over Rational Field, nc-relations: {y*x: -x*y} - """ from sage.modules.free_module import FreeModule return FreeModule(self, n) @@ -758,8 +749,7 @@ cdef class NCPolynomialRing_plural(Ring): rChangeCurrRing(_ring) from sage.libs.singular.function import singular_function ringlist = singular_function('ringlist') - result = ringlist(self, ring=self) - return result + return ringlist(self, ring=self) def relations(self, add_commutative=False): """ @@ -786,7 +776,6 @@ cdef class NCPolynomialRing_plural(Ring): {z*x: x*z + 2*x, z*y: y*z - 2*y} sage: H.relations(add_commutative=True) {y*x: x*y, z*x: x*z + 2*x, z*y: y*z - 2*y} - """ if add_commutative: if self._relations_commutative is not None: @@ -799,7 +788,7 @@ cdef class NCPolynomialRing_plural(Ring): n = self.ngens() for r in range(0, n-1, 1): for c in range(r+1, n, 1): - res[ A.gen(c) * A.gen(r) ] = self.gen(c) * self.gen(r) # C[r, c] * P.gen(r) * P.gen(c) + D[r, c] + res[A.gen(c) * A.gen(r)] = self.gen(c) * self.gen(r) # C[r, c] * P.gen(r) * P.gen(c) + D[r, c] self._relations_commutative = res return res @@ -814,14 +803,14 @@ cdef class NCPolynomialRing_plural(Ring): for r in range(0, n-1, 1): for c in range(r+1, n, 1): if (self.gen(c) * self.gen(r) != self.gen(r) * self.gen(c)): - res[ A.gen(c) * A.gen(r) ] = self.gen(c) * self.gen(r) # C[r, c] * P.gen(r) * P.gen(c) + D[r, c] + res[A.gen(c) * A.gen(r)] = self.gen(c) * self.gen(r) # C[r, c] * P.gen(r) * P.gen(c) + D[r, c] self._relations = res return self._relations def ngens(self): """ - Returns the number of variables in this noncommutative polynomial ring. + Return the number of variables in this noncommutative polynomial ring. EXAMPLES:: @@ -834,7 +823,7 @@ cdef class NCPolynomialRing_plural(Ring): def gen(self, int n=0): """ - Returns the ``n``-th generator of this noncommutative polynomial + Return the ``n``-th generator of this noncommutative polynomial ring. INPUT: @@ -890,15 +879,14 @@ cdef class NCPolynomialRing_plural(Ring): Left Ideal (x + 2*y + 2*z - 1, 2*x*y + 2*y*z - y, x^2 - x + 2*y^2 + 2*z^2) of Noncommutative Multivariate Polynomial Ring in x, y, z over Rational Field, nc-relations: {y*x: -x*y} sage: P.ideal([x + 2*y + 2*z-1, 2*x*y + 2*y*z-y, x^2 + 2*y^2 + 2*z^2-x], side="twosided") Twosided Ideal (x + 2*y + 2*z - 1, 2*x*y + 2*y*z - y, x^2 - x + 2*y^2 + 2*z^2) of Noncommutative Multivariate Polynomial Ring in x, y, z over Rational Field, nc-relations: {y*x: -x*y} - """ coerce = kwds.get('coerce', True) if len(gens) == 1: gens = gens[0] - #if is_SingularElement(gens): + # if is_SingularElement(gens): # gens = list(gens) # coerce = True - #elif is_Macaulay2Element(gens): + # elif is_Macaulay2Element(gens): # gens = list(gens) # coerce = True if not isinstance(gens, (list, tuple)): @@ -920,9 +908,9 @@ cdef class NCPolynomialRing_plural(Ring): sage: Q # indirect doctest """ - cdef ring* _ring = self._ring - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) from sage.libs.singular.function import singular_function ring = singular_function('ring') @@ -977,9 +965,9 @@ cdef class NCPolynomialRing_plural(Ring): INPUT: - - ``f`` - monomial - - ``g`` - monomial - - ``coeff`` - divide coefficients as well (default: ``False``) + - ``f`` -- monomial + - ``g`` -- monomial + - ``coeff`` -- divide coefficients as well (default: ``False``) EXAMPLES:: @@ -1050,7 +1038,8 @@ cdef class NCPolynomialRing_plural(Ring): if self is not g._parent: g = self.coerce(g) - if(r != currRing): rChangeCurrRing(r) + if r != currRing: + rChangeCurrRing(r) if not f._poly: return self._zero_element @@ -1060,7 +1049,8 @@ cdef class NCPolynomialRing_plural(Ring): res = pMDivide(f._poly, g._poly) if coeff: if (r.cf.type == n_unknown) or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): - n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) + n = r.cf.cfDiv(p_GetCoeff(f._poly, r), + p_GetCoeff(g._poly, r), r.cf) p_SetCoeff0(res, n, r) else: raise ArithmeticError("Cannot divide these coefficients.") @@ -1130,7 +1120,6 @@ cdef class NCPolynomialRing_plural(Ring): else: return True - def monomial_lcm(self, NCPolynomial_plural f, NCPolynomial_plural g): """ LCM for monomials. Coefficients are ignored. @@ -1187,7 +1176,8 @@ cdef class NCPolynomialRing_plural(Ring): if g._poly == NULL: raise ArithmeticError("Cannot compute LCM of zero and nonzero element.") - if(self._ring != currRing): rChangeCurrRing(self._ring) + if self._ring != currRing: + rChangeCurrRing(self._ring) pLcm(f._poly, g._poly, m) p_Setm(m, self._ring) @@ -1318,18 +1308,18 @@ cdef class NCPolynomialRing_plural(Ring): if p == NULL: if q == NULL: - return False #GCD(0,0) = 0 + return False # GCD(0,0) = 0 else: - return True #GCD(x,0) = 1 + return True # GCD(x,0) = 1 elif q == NULL: - return True # GCD(0,x) = 1 + return True # GCD(0,x) = 1 - elif p_IsConstant(p,r) or p_IsConstant(q,r): # assuming a base field + elif p_IsConstant(p, r) or p_IsConstant(q, r): # assuming a base field return False for i from 1 <= i <= r.N: - if p_GetExp(p,i,r) and p_GetExp(q,i,r): + if p_GetExp(p, i, r) and p_GetExp(q, i, r): return False return True @@ -1540,8 +1530,8 @@ cdef class NCPolynomial_plural(RingElement): """ cdef poly *_p singular_polynomial_add(&_p, left._poly, - (right)._poly, - (left._parent)._ring) + (right)._poly, + (left._parent)._ring) return new_NCP((left._parent), _p) cpdef _sub_(left, right) noexcept: @@ -1623,8 +1613,8 @@ cdef class NCPolynomial_plural(RingElement): # all currently implemented rings are commutative cdef poly *_p singular_polynomial_mul(&_p, left._poly, - (right)._poly, - (left._parent)._ring) + (right)._poly, + (left._parent)._ring) return new_NCP((left._parent),_p) cpdef _div_(left, right) noexcept: @@ -1764,7 +1754,8 @@ cdef class NCPolynomial_plural(RingElement): cdef ring *r = parent._ring cdef poly *res - if(r != currRing): rChangeCurrRing(r) + if r != currRing: + rChangeCurrRing(r) if isinstance(I, NCPolynomialIdeal): try: @@ -1777,7 +1768,7 @@ cdef class NCPolynomial_plural(RingElement): _I = idInit(len(I),1) for f in I: if not (isinstance(f, NCPolynomial_plural) - and (f)._parent is parent): + and (f)._parent is parent): try: f = parent.coerce(f) except TypeError as msg: @@ -1787,9 +1778,9 @@ cdef class NCPolynomial_plural(RingElement): _I.m[i] = p_Copy((f)._poly, r) i+=1 - #the second parameter would be qring! + # the second parameter would be qring! res = kNF(_I, NULL, self._poly) - id_Delete(&_I,r) + id_Delete(&_I, r) return new_NCP(parent,res) def _repr_(self): @@ -1971,8 +1962,10 @@ cdef class NCPolynomial_plural(RingElement): def degrees(self): """ - Returns a tuple with the maximal degree of each variable in - this polynomial. The list of degrees is ordered by the order + Return a tuple with the maximal degree of each variable in + this polynomial. + + The list of degrees is ordered by the order of the generators. EXAMPLES:: @@ -1998,7 +1991,6 @@ cdef class NCPolynomial_plural(RingElement): p = pNext(p) return tuple(d) - def coefficient(self, degrees): """ Return the coefficient of the variables with the degrees @@ -2208,18 +2200,19 @@ cdef class NCPolynomial_plural(RingElement): cdef int n cdef int v r = (self._parent)._ring - if r!=currRing: rChangeCurrRing(r) + if r != currRing: + rChangeCurrRing(r) base = (self._parent)._base p = self._poly pd = dict() while p: d = dict() for v from 1 <= v <= r.N: - n = p_GetExp(p,v,r) - if n!=0: + n = p_GetExp(p, v, r) + if n != 0: d[v-1] = n - pd[ETuple(d,r.N)] = si2sa(p_GetCoeff(p, r), r, base) + pd[ETuple(d, r.N)] = si2sa(p_GetCoeff(p, r), r, base) p = pNext(p) return pd @@ -2273,7 +2266,6 @@ cdef class NCPolynomial_plural(RingElement): base_map = codomain return sum(prod(im_gens[i]**val for i, val in enumerate(t))*base_map(d[t]) for t in d) - cdef long _hash_c(self) noexcept: """ See :meth:`__hash__` @@ -2283,16 +2275,17 @@ cdef class NCPolynomial_plural(RingElement): cdef int n cdef int v r = (self._parent)._ring - if r!=currRing: rChangeCurrRing(r) + if r != currRing: + rChangeCurrRing(r) base = (self._parent)._base p = self._poly - cdef long result = 0 # store it in a c-int and just let the overflowing additions wrap + cdef long result = 0 # store it in a c-int and just let the overflowing additions wrap cdef long result_mon var_name_hash = [hash(vn) for vn in self._parent.variable_names()] cdef long c_hash while p: c_hash = hash(si2sa(p_GetCoeff(p, r), r, base)) - if c_hash != 0: # this is always going to be true, because we are sparse (correct?) + if c_hash != 0: # this is always going to be true, because we are sparse (correct?) # Hash (self[i], gen_a, exp_a, gen_b, exp_b, gen_c, exp_c, ...) as a tuple according to the algorithm. # I omit gen,exp pairs where the exponent is zero. result_mon = c_hash @@ -2440,10 +2433,10 @@ cdef class NCPolynomial_plural(RingElement): True """ cdef ring *_ring = (self._parent)._ring - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) return bool(p_IsHomogeneous(self._poly,_ring)) - def is_monomial(self): """ Return ``True`` if this polynomial is a monomial. @@ -2474,7 +2467,8 @@ cdef class NCPolynomial_plural(RingElement): if self._poly == NULL: return True - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) _p = p_Head(self._poly, _ring) _n = p_GetCoeff(_p, _ring) @@ -2538,7 +2532,8 @@ cdef class NCPolynomial_plural(RingElement): l = list() cdef NCPolynomialRing_plural parent = self._parent cdef ring *_ring = parent._ring - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) cdef poly *p = p_Copy(self._poly, _ring) cdef poly *t @@ -2550,7 +2545,7 @@ cdef class NCPolynomial_plural(RingElement): p.next = NULL p_SetCoeff(p, n_Init(1,_ring.cf), _ring) p_Setm(p, _ring) - l.append( new_NCP(parent,p) ) + l.append(new_NCP(parent, p)) p = t return l @@ -2582,9 +2577,9 @@ cdef class NCPolynomial_plural(RingElement): p = pNext(p) if p_LmIsConstant(p, r): - return si2sa( p_GetCoeff(p, r), r, (self._parent)._base ) - else: - return (self._parent)._base._zero_element + return si2sa(p_GetCoeff(p, r), r, + (self._parent)._base) + return (self._parent)._base._zero_element cpdef is_constant(self) noexcept: """ @@ -2605,10 +2600,10 @@ cdef class NCPolynomial_plural(RingElement): def lm(NCPolynomial_plural self): """ - Returns the lead monomial of ``self`` with respect to the term + Return the lead monomial of ``self`` with respect to the term order of ``self.parent()``. - In Sage a monomial is a product of variables in some power + In Sage, a monomial is a product of variables in some power without a coefficient. EXAMPLES:: @@ -2645,7 +2640,6 @@ cdef class NCPolynomial_plural(RingElement): sage: f = x^4*y^7*z^1 + x^4*y^2*z^3 sage: f.lm() x^4*y^7*z - """ cdef poly *_p cdef ring *_ring @@ -2677,7 +2671,6 @@ cdef class NCPolynomial_plural(RingElement): sage: f.lc() 5 """ - cdef poly *_p cdef ring *_ring cdef number *_n @@ -2686,20 +2679,21 @@ cdef class NCPolynomial_plural(RingElement): if self._poly == NULL: return (self._parent)._base._zero_element - if(_ring != currRing): rChangeCurrRing(_ring) + if _ring != currRing: + rChangeCurrRing(_ring) _p = p_Head(self._poly, _ring) _n = p_GetCoeff(_p, _ring) - ret = si2sa(_n, _ring, (self._parent)._base) + ret = si2sa(_n, _ring, (self._parent)._base) p_Delete(&_p, _ring) return ret def lt(NCPolynomial_plural self): """ - Leading term of this polynomial. + Return the leading term of this polynomial. - In Sage a term is a product of variables in some power and a + In Sage, a term is a product of variables in some power and a coefficient. EXAMPLES:: @@ -2721,7 +2715,7 @@ cdef class NCPolynomial_plural(RingElement): return (self._parent)._zero_element return new_NCP((self._parent), - p_Head(self._poly,(self._parent)._ring)) + p_Head(self._poly, (self._parent)._ring)) def is_zero(self): """ @@ -2739,10 +2733,7 @@ cdef class NCPolynomial_plural(RingElement): sage: (x-x).is_zero() True """ - if self._poly is NULL: - return True - else: - return False + return self._poly is NULL def __bool__(self): """ @@ -2758,10 +2749,7 @@ cdef class NCPolynomial_plural(RingElement): sage: bool(x-x) False """ - if self._poly: - return True - else: - return False + return True if self._poly else False def __call__(self, *x, **kwds): """ @@ -2809,9 +2797,8 @@ cdef class NCPolynomial_plural(RingElement): ##################################################################### - cdef inline NCPolynomial_plural new_NCP(NCPolynomialRing_plural parent, - poly *juice) noexcept: + poly *juice) noexcept: """ Construct NCPolynomial_plural from parent and SINGULAR poly. @@ -2821,7 +2808,6 @@ cdef inline NCPolynomial_plural new_NCP(NCPolynomialRing_plural parent, sage: H = A.g_algebra({z*x:x*z+2*x, z*y:y*z-2*y}) sage: H.gen(2) # indirect doctest z - """ cdef NCPolynomial_plural p = NCPolynomial_plural.__new__(NCPolynomial_plural) p._parent = parent @@ -2830,8 +2816,6 @@ cdef inline NCPolynomial_plural new_NCP(NCPolynomialRing_plural parent, return p - - cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring) noexcept: """ Construct MPolynomialRing_libsingular from ringWrap, assuming the ground field to be base_ring @@ -2876,7 +2860,7 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring) noexcept: sage: C.one() 1 """ - assert( rw.is_commutative() ) + assert rw.is_commutative() cdef MPolynomialRing_libsingular self = MPolynomialRing_libsingular.__new__(MPolynomialRing_libsingular) @@ -2891,15 +2875,13 @@ cpdef MPolynomialRing_libsingular new_CRing(RingWrap rw, base_ring) noexcept: self._ring.ShortOut = 0 self._ngens = rw.ngens() - self._term_order = TermOrder(rw.ordering_string(), force=True) + self._term_order = TermOrder(rw.ordering_string(), force=True) - ParentWithGens.__init__(self, base_ring, tuple(rw.var_names()), - normalize=False) -# self._populate_coercion_lists_() # ??? + names = tuple(rw.var_names()) + Ring.__init__(self, base_ring, names, category=Algebras(base_ring), + normalize=False) - #MPolynomialRing_generic.__init__(self, base_ring, n, names, order) self._has_singular = True -# self._relations = self.relations() return self @@ -2951,8 +2933,7 @@ cpdef NCPolynomialRing_plural new_NRing(RingWrap rw, base_ring) noexcept: Noncommutative Multivariate Polynomial Ring in x, y, z over Rational Field, nc-relations: {y*x: x*y - 1} """ - - assert( not rw.is_commutative() ) + assert not rw.is_commutative() cdef NCPolynomialRing_plural self = NCPolynomialRing_plural.__new__(NCPolynomialRing_plural) self._ring = rw._ring @@ -2963,12 +2944,10 @@ cpdef NCPolynomialRing_plural new_NRing(RingWrap rw, base_ring) noexcept: self._ring.ShortOut = 0 self._ngens = rw.ngens() - self._term_order = TermOrder(rw.ordering_string(), force=True) + self._term_order = TermOrder(rw.ordering_string(), force=True) - ParentWithGens.__init__(self, base_ring, rw.var_names()) -# self._populate_coercion_lists_() # ??? + Ring.__init__(self, base_ring, rw.var_names(), category=Algebras(base_ring)) - #MPolynomialRing_generic.__init__(self, base_ring, n, names, order) self._has_singular = True self._relations = self.relations() @@ -3029,6 +3008,7 @@ def new_Ring(RingWrap rw, base_ring): return new_CRing(rw, base_ring) return new_NRing(rw, base_ring) + def SCA(base_ring, names, alt_vars, order='degrevlex'): """ Return a free graded-commutative algebra @@ -3067,24 +3047,25 @@ def SCA(base_ring, names, alt_vars, order='degrevlex'): n = len(names) alt_start = min(alt_vars) alt_end = max(alt_vars) - assert( alt_start >= 0 ) - assert( (alt_end >= alt_start) and (alt_end < n) ) + assert 0 <= alt_start <= alt_end < n - relations = {} # {y*x:-x*y} + relations = {} # {y*x:-x*y} from sage.algebras.free_algebra import FreeAlgebra A = FreeAlgebra(base_ring, n, names) for r in range(0, n-1, 1): for c in range(r+1, n, 1): - if (r in alt_vars) and (c in alt_vars): - relations[ A.gen(c) * A.gen(r) ] = - A.gen(r) * A.gen(c) + if r in alt_vars and c in alt_vars: + relations[A.gen(c) * A.gen(r)] = - A.gen(r) * A.gen(c) - cdef NCPolynomialRing_plural H = A.g_algebra(relations=relations, order=order) + cdef NCPolynomialRing_plural H = A.g_algebra(relations=relations, + order=order) I = H.ideal([H.gen(i) * H.gen(i) for i in alt_vars]).twostd() return H.quotient(I) + def ExteriorAlgebra(base_ring, names,order='degrevlex'): """ - Return the exterior algebra on some generators + Return the exterior algebra on some generators. This is also known as a Grassmann algebra. This is a finite dimensional algebra, where all generators anti-commute. @@ -3116,17 +3097,19 @@ def ExteriorAlgebra(base_ring, names,order='degrevlex'): 1 """ n = len(names) - relations = {} # {y*x:-x*y} + relations = {} # {y*x:-x*y} from sage.algebras.free_algebra import FreeAlgebra A = FreeAlgebra(base_ring, n, names) for r in range(n-1): for c in range(r+1, n): - relations[ A.gen(c) * A.gen(r) ] = - A.gen(r) * A.gen(c) + relations[A.gen(c) * A.gen(r)] = - A.gen(r) * A.gen(c) - cdef NCPolynomialRing_plural H = A.g_algebra(relations=relations,order=order) + cdef NCPolynomialRing_plural H = A.g_algebra(relations=relations, + order=order) I = H.ideal([H.gen(i) * H.gen(i) for i in range(n)]).twostd() return H.quotient(I) + cdef poly *addwithcarry(poly *tempvector, poly *maxvector, int pos, ring *_ring) noexcept: if p_GetExp(tempvector, pos, _ring) < p_GetExp(maxvector, pos, _ring): p_SetExp(tempvector, pos, p_GetExp(tempvector, pos, _ring)+1, _ring) diff --git a/src/sage/rings/polynomial/polynomial_number_field.pyx b/src/sage/rings/polynomial/polynomial_number_field.pyx index 96f1c002e99..5bd458e5d12 100644 --- a/src/sage/rings/polynomial/polynomial_number_field.pyx +++ b/src/sage/rings/polynomial/polynomial_number_field.pyx @@ -72,7 +72,7 @@ We can also construct polynomials over relative number fields:: # http://www.gnu.org/licenses/ #***************************************************************************** -from .polynomial_element_generic import Polynomial_generic_dense_field +from sage.rings.polynomial.polynomial_element_generic import Polynomial_generic_dense_field from sage.rings.rational_field import QQ from sage.structure.element import coerce_binop from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing diff --git a/src/sage/rings/power_series_ring_element.pyx b/src/sage/rings/power_series_ring_element.pyx index 8f570db774a..31206e347f9 100644 --- a/src/sage/rings/power_series_ring_element.pyx +++ b/src/sage/rings/power_series_ring_element.pyx @@ -2957,7 +2957,7 @@ def _solve_linear_de(R, N, L, a, b, f0): def make_powerseries_poly_v0(parent, f, prec, is_gen): # This is only used to unpickle old pickles. The new pickling # works differently! - from . import power_series_poly + from sage.rings import power_series_poly return power_series_poly.PowerSeries_poly(parent, f, prec, 0, is_gen) diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx index 63ad2b36bee..150e4a523bd 100644 --- a/src/sage/rings/rational.pyx +++ b/src/sage/rings/rational.pyx @@ -1749,7 +1749,7 @@ cdef class Rational(sage.structure.element.FieldElement): return (self > 0) ## Check that p is prime - from .integer_ring import ZZ + from sage.rings.integer_ring import ZZ p = ZZ(p) if check and not p.is_prime(): raise ValueError('p must be "infinity" or a positive prime number.') @@ -4094,8 +4094,8 @@ cdef class Z_to_Q(Morphism): From: Integer Ring To: Rational Field """ - from . import integer_ring - from . import rational_field + from sage.rings import integer_ring + from sage.rings import rational_field import sage.categories.homset Morphism.__init__(self, sage.categories.homset.Hom(integer_ring.ZZ, rational_field.QQ)) @@ -4215,7 +4215,7 @@ cdef class int_to_Q(Morphism): From: Set of Python objects of class 'int' To: Rational Field """ - from . import rational_field + from sage.rings import rational_field import sage.categories.homset from sage.sets.pythonclass import Set_PythonType Morphism.__init__(self, sage.categories.homset.Hom( diff --git a/src/sage/rings/real_double.pyx b/src/sage/rings/real_double.pyx index f1e5eb0a2c8..19c9501bcf8 100644 --- a/src/sage/rings/real_double.pyx +++ b/src/sage/rings/real_double.pyx @@ -327,9 +327,9 @@ cdef class RealDoubleField_class(sage.rings.abc.RealDoubleField): if S is int or S is float: return ToRDF(S) - from .rational_field import QQ + from sage.rings.rational_field import QQ try: - from .real_lazy import RLF + from sage.rings.real_lazy import RLF except ImportError: RLF = None @@ -349,7 +349,7 @@ cdef class RealDoubleField_class(sage.rings.abc.RealDoubleField): return None try: - from .real_mpfr import RR + from sage.rings.real_mpfr import RR except ImportError: pass else: @@ -431,7 +431,7 @@ cdef class RealDoubleField_class(sage.rings.abc.RealDoubleField): if prec == 53: return self else: - from .real_mpfr import RealField + from sage.rings.real_mpfr import RealField return RealField(prec) @@ -979,7 +979,7 @@ cdef class RealDoubleElement(FieldElement): sage: mathematica(RDF(1e-25)) # optional - mathematica 1.*^-25 """ - from .real_mpfr import RR + from sage.rings.real_mpfr import RR return RR(self._value)._mathematica_init_() def _sage_input_(self, sib, coerced): @@ -2069,7 +2069,7 @@ def is_RealDoubleElement(x): cdef RealDoubleElement global_dummy_element try: - from .real_double_element_gsl import RealDoubleElement_gsl + from sage.rings.real_double_element_gsl import RealDoubleElement_gsl except ImportError: global_dummy_element = RealDoubleElement(0) else: @@ -2175,7 +2175,7 @@ cdef void fast_tp_dealloc(PyObject* o) noexcept: from sage.misc.allocator cimport hook_tp_functions, hook_tp_functions_type hook_tp_functions(global_dummy_element, (&fast_tp_new), (&fast_tp_dealloc), False) try: - from .real_double_element_gsl import RealDoubleElement_gsl + from sage.rings.real_double_element_gsl import RealDoubleElement_gsl except Exception: pass else: diff --git a/src/sage/rings/real_double_element_gsl.pyx b/src/sage/rings/real_double_element_gsl.pyx index 3ebb703b367..05346073d08 100644 --- a/src/sage/rings/real_double_element_gsl.pyx +++ b/src/sage/rings/real_double_element_gsl.pyx @@ -216,10 +216,10 @@ cdef class RealDoubleElement_gsl(RealDoubleElement): cdef _log_base(self, double log_of_base) noexcept: if self._value == 0: - from .real_double import RDF + from sage.rings.real_double import RDF return RDF(-1)/RDF(0) elif self._value < 0: - from .real_double import RDF + from sage.rings.real_double import RDF return RDF.NaN() sig_on() a = self._new_c(gsl_sf_log(self._value) / log_of_base) diff --git a/src/sage/rings/real_lazy.pyx b/src/sage/rings/real_lazy.pyx index 54a84e4920a..e765cdfe801 100644 --- a/src/sage/rings/real_lazy.pyx +++ b/src/sage/rings/real_lazy.pyx @@ -49,9 +49,13 @@ from sage.rings.integer import Integer cdef QQ, RR, CC, RealField, ComplexField from sage.rings.rational_field import QQ -from sage.rings.real_mpfr import RR, RealField -from sage.rings.complex_mpfr import ComplexField -from sage.rings.cc import CC + +try: + from sage.rings.real_mpfr import RR, RealField + from sage.rings.complex_mpfr import ComplexField + from sage.rings.cc import CC +except ImportError: + pass cdef _QQx = None @@ -814,7 +818,6 @@ cdef class LazyFieldElement(FieldElement): try: return self.eval(complex) except Exception: - from .complex_mpfr import ComplexField return complex(self.eval(ComplexField(53))) cpdef eval(self, R) noexcept: diff --git a/src/sage/rings/real_mpfr.pxd b/src/sage/rings/real_mpfr.pxd index 5d44208f339..f89ec9557fd 100644 --- a/src/sage/rings/real_mpfr.pxd +++ b/src/sage/rings/real_mpfr.pxd @@ -1,10 +1,8 @@ -from sage.libs.mpfr.types cimport mpfr_rnd_t, mpfr_t +from sage.libs.mpfr.types cimport mpfr_rnd_t, mpfr_t, mpfr_prec_t cimport sage.rings.ring cimport sage.rings.abc cimport sage.structure.element -from cypari2.types cimport GEN -from sage.libs.mpfr.types cimport mpfr_prec_t cdef class RealNumber(sage.structure.element.RingElement) # forward decl @@ -26,7 +24,6 @@ cdef class RealNumber(sage.structure.element.RingElement): cpdef _mul_(self, other) noexcept cpdef _mod_(self, right) noexcept cdef _set(self, x, int base) noexcept - cdef _set_from_GEN_REAL(self, GEN g) noexcept cdef RealNumber abs(RealNumber self) noexcept cpdef RealField(mpfr_prec_t prec=*, int sci_not=*, rnd=*) noexcept diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx index 9117dfcd4ce..ba6a1bda129 100644 --- a/src/sage/rings/real_mpfr.pyx +++ b/src/sage/rings/real_mpfr.pyx @@ -107,7 +107,7 @@ Make sure we don't have a new field for every new literal:: True """ -#***************************************************************************** +# ***************************************************************************** # Copyright (C) 2005-2006 William Stein # # This program is free software: you can redistribute it and/or modify @@ -115,7 +115,7 @@ Make sure we don't have a new field for every new literal:: # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # https://www.gnu.org/licenses/ -#***************************************************************************** +# ***************************************************************************** import math # for log import sys @@ -142,10 +142,6 @@ import sage.misc.weak_dict import operator -from cypari2.paridecl cimport * -from cypari2.gen cimport Gen -from cypari2.stack cimport new_gen - from sage.libs.mpmath.utils cimport mpfr_to_mpfval from sage.rings.integer cimport Integer @@ -155,25 +151,31 @@ from sage.categories.map cimport Map from sage.rings.real_double cimport RealDoubleElement +import sage.rings.abc import sage.rings.rational_field import sage.rings.infinity +from sage.rings.ring import Ring -from sage.structure.parent_gens cimport ParentWithGens from sage.arith.numerical_approx cimport digits_to_bits from sage.arith.constants cimport M_LN2_LN10 from sage.arith.long cimport is_small_python_int +try: + from cypari2 import Gen + from sage.libs.pari.convert_sage_real_mpfr import new_gen_from_real_mpfr_element, set_real_mpfr_element_from_gen +except ImportError: + Gen = () cimport gmpy2 gmpy2.import_gmpy2() -#***************************************************************************** +# **************************************************************************** # # Implementation # -#***************************************************************************** +# **************************************************************************** _re_skip_zeroes = re.compile(r'^(.+?)0*$') @@ -356,11 +358,11 @@ def mpfr_get_exp_max_max(): mpfr_set_exp_min(mpfr_get_emin_min()) mpfr_set_exp_max(mpfr_get_emax_max()) -#***************************************************************************** +# ***************************************************************************** # # Real Field # -#***************************************************************************** +# ***************************************************************************** # The real field is in Cython, so mpfr elements will have access to # their parent via direct C calls, which will be faster. @@ -534,7 +536,7 @@ cdef class RealField_class(sage.rings.abc.RealField): self.rnd_str = char_to_str(rnd_str + 5) # Strip "MPFR_" from sage.categories.fields import Fields - ParentWithGens.__init__(self, self, tuple(), False, category=Fields().Infinite().Metric().Complete()) + Ring.__init__(self, self, tuple(), False, category=Fields().Infinite().Metric().Complete()) # Initialize zero and one cdef RealNumber rn @@ -725,9 +727,9 @@ cdef class RealField_class(sage.rings.abc.RealField): sage: R.get_action(ZZ) Right scalar multiplication by Integer Ring on Univariate Polynomial Ring in x over Real Field with 53 bits of precision """ - from .integer_ring import ZZ - from .rational_field import QQ - from .real_double import RDF + from sage.rings.integer_ring import ZZ + from sage.rings.rational_field import QQ + from sage.rings.real_double import RDF if S is ZZ: return ZZtoRR(ZZ, self) @@ -743,9 +745,8 @@ cdef class RealField_class(sage.rings.abc.RealField): return RRtoRR(S, self) elif QQ.has_coerce_map_from(S): return QQtoRR(QQ, self) * QQ._internal_coerce_map_from(S) - from sage.rings.qqbar import AA from sage.rings.real_lazy import RLF - if S is AA or S is RLF: + if isinstance(S, sage.rings.abc.AlgebraicRealField) or S is RLF: return self.convert_method_map(S, "_mpfr_") return self._coerce_map_via([RLF], S) @@ -1456,7 +1457,6 @@ cdef class RealNumber(sage.structure.element.RingElement): # This should not be called except when the number is being created. # Real Numbers are supposed to be immutable. cdef RealField_class parent - cdef Gen _gen parent = self._parent if isinstance(x, RealNumber): if isinstance(x, RealLiteral): @@ -1470,9 +1470,8 @@ cdef class RealNumber(sage.structure.element.RingElement): mpfr_set_z(self.value, (x).value, parent.rnd) elif isinstance(x, Rational): mpfr_set_q(self.value, (x).value, parent.rnd) - elif isinstance(x, Gen) and typ((x).g) == t_REAL: - _gen = x - self._set_from_GEN_REAL(_gen.g) + elif isinstance(x, Gen) and set_real_mpfr_element_from_gen(self, x): + pass elif isinstance(x, int): x = Integer(x) mpfr_set_z(self.value, (x).value, parent.rnd) @@ -1504,49 +1503,6 @@ cdef class RealNumber(sage.structure.element.RingElement): else: raise TypeError("unable to convert {!r} to a real number".format(s)) - cdef _set_from_GEN_REAL(self, GEN g) noexcept: - """ - EXAMPLES:: - - sage: rt2 = sqrt(pari('2.0')) - sage: rt2 - 1.41421356237310 - sage: rt2.sage() - 1.41421356237309505 - sage: rt2.sage().prec() - 64 - sage: pari(rt2.sage()) == rt2 - True - sage: for i in range(100, 200): - ....: assert(sqrt(pari(i)) == pari(sqrt(pari(i)).sage())) - sage: (-3.1415).__pari__().sage() - -3.14150000000000000 - """ - cdef int sgn - sgn = signe(g) - - if sgn == 0: - mpfr_set_ui(self.value, 0, MPFR_RNDN) - return - - cdef int wordsize = 8 * sizeof(long) - - cdef mpz_t mantissa - mpz_init(mantissa) - mpz_import(mantissa, lg(g) - 2, 1, wordsize/8, 0, 0, &g[2]) - - cdef mp_exp_t exponent = expo(g) - - # Round to nearest for best results when setting a low-precision - # MPFR from a high-precision GEN - mpfr_set_z(self.value, mantissa, MPFR_RNDN) - mpfr_mul_2si(self.value, self.value, exponent - wordsize * (lg(g) - 2) + 1, MPFR_RNDN) - - if sgn < 0: - mpfr_neg(self.value, self.value, MPFR_RNDN) - - mpz_clear(mantissa) - def __reduce__(self): """ EXAMPLES:: @@ -1875,7 +1831,7 @@ cdef class RealNumber(sage.structure.element.RingElement): sage: RealField(100)(2).imag() 0 """ - from .integer_ring import ZZ + from sage.rings.integer_ring import ZZ return ZZ(0) @@ -2389,7 +2345,7 @@ cdef class RealNumber(sage.structure.element.RingElement): if have_same_parent(left, right): return ( left)._add_(right) try: - from .real_mpfi import RealIntervalFieldElement + from sage.rings.real_mpfi import RealIntervalFieldElement except ImportError: RealIntervalFieldElement = None if type(right) is RealIntervalFieldElement: @@ -2413,7 +2369,7 @@ cdef class RealNumber(sage.structure.element.RingElement): if have_same_parent(left, right): return ( left)._sub_(right) try: - from .real_mpfi import RealIntervalFieldElement + from sage.rings.real_mpfi import RealIntervalFieldElement except ImportError: RealIntervalFieldElement = None if type(right) is RealIntervalFieldElement: @@ -2437,7 +2393,7 @@ cdef class RealNumber(sage.structure.element.RingElement): if have_same_parent(left, right): return ( left)._mul_(right) try: - from .real_mpfi import RealIntervalFieldElement + from sage.rings.real_mpfi import RealIntervalFieldElement except ImportError: RealIntervalFieldElement = None if type(right) is RealIntervalFieldElement: @@ -2461,7 +2417,7 @@ cdef class RealNumber(sage.structure.element.RingElement): if have_same_parent(left, right): return ( left)._div_(right) try: - from .real_mpfi import RealIntervalFieldElement + from sage.rings.real_mpfi import RealIntervalFieldElement except ImportError: RealIntervalFieldElement = None if type(right) is RealIntervalFieldElement: @@ -3370,48 +3326,7 @@ cdef class RealNumber(sage.structure.element.RingElement): sage: RR(a) << (sys.maxsize-3)/4 0.500000000000000 """ - # This uses interfaces of MPFR and PARI which are documented - # (and not marked subject-to-change). It could be faster - # by using internal interfaces of MPFR, which are documented - # as subject-to-change. - - if mpfr_nan_p(self.value) or mpfr_inf_p(self.value): - raise ValueError('cannot convert NaN or infinity to Pari float') - - # wordsize for PARI - cdef unsigned long wordsize = sizeof(long)*8 - - cdef mpfr_prec_t prec - prec = (self._parent)._prec - - # We round up the precision to the nearest multiple of wordsize. - cdef int rounded_prec - rounded_prec = (self.prec() + wordsize - 1) & ~(wordsize - 1) - - # Yes, assigning to self works fine, even in Cython. - if rounded_prec > prec: - self = RealField(rounded_prec)(self) - - cdef mpz_t mantissa - cdef mp_exp_t exponent - cdef GEN pari_float - - sig_on() - if mpfr_zero_p(self.value): - pari_float = real_0_bit(-rounded_prec) - else: - # Now we can extract the mantissa, and it will be normalized - # (the most significant bit of the most significant word will be 1). - mpz_init(mantissa) - exponent = mpfr_get_z_exp(mantissa, self.value) - - # Create a PARI REAL - pari_float = cgetr(2 + rounded_prec / wordsize) - pari_float[1] = evalexpo(exponent + rounded_prec - 1) + evalsigne(mpfr_sgn(self.value)) - mpz_export(&pari_float[2], NULL, 1, wordsize // 8, 0, 0, mantissa) - mpz_clear(mantissa) - - return new_gen(pari_float) + return new_gen_from_real_mpfr_element(self) def _mpmath_(self, prec=None, rounding=None): """ @@ -3431,7 +3346,6 @@ cdef class RealNumber(sage.structure.element.RingElement): from sage.libs.mpmath.all import make_mpf return make_mpf(mpfr_to_mpfval(self.value)) - def sign_mantissa_exponent(self): r""" Return the sign, mantissa, and exponent of ``self``. @@ -3714,7 +3628,7 @@ cdef class RealNumber(sage.structure.element.RingElement): if mpfr_zero_p(self.value): return Rational(0) - from .real_mpfi import RealIntervalField + from sage.rings.real_mpfi import RealIntervalField cdef mpfr_rnd_t rnd = (self._parent).rnd cdef mpfr_prec_t prec = (self._parent)._prec @@ -3834,7 +3748,7 @@ cdef class RealNumber(sage.structure.element.RingElement): raise ValueError('Must specify exactly one of max_error or max_denominator in nearby_rational()') if max_error is not None: - from .real_mpfi import RealIntervalField + from sage.rings.real_mpfi import RealIntervalField intv_field = RealIntervalField(self.prec()) intv = intv_field(self - max_error, self + max_error) @@ -5661,7 +5575,7 @@ cdef class RealNumber(sage.structure.element.RingElement): # If we got here, then we're not a perfect power of a boundary # point, so it's safe to use the interval arithmetic technique. - from .real_mpfi import RealIntervalField + from sage.rings.real_mpfi import RealIntervalField cdef mpfr_prec_t prec = fld._prec + 10 diff --git a/src/sage/rings/ring.pyx b/src/sage/rings/ring.pyx index 75f58656385..74a192be48b 100644 --- a/src/sage/rings/ring.pyx +++ b/src/sage/rings/ring.pyx @@ -150,7 +150,7 @@ cdef class Ring(ParentWithGens): Category of infinite algebras over (finite dimensional algebras with basis over (number fields and quotient fields and metric spaces) and infinite sets) sage: PolynomialRing(SteenrodAlgebra(2),'x').category() # needs sage.combinat sage.modules - Category of infinite algebras over (super hopf algebras with basis + Category of infinite algebras over (super Hopf algebras with basis over Finite Field of size 2 and supercocommutative super coalgebras over Finite Field of size 2) @@ -1447,7 +1447,7 @@ cdef class CommutativeRing(Ring): sage: f(1+u) 1 + u^25 """ - from .morphism import FrobeniusEndomorphism_generic + from sage.rings.morphism import FrobeniusEndomorphism_generic return FrobeniusEndomorphism_generic(self, n) def derivation_module(self, codomain=None, twist=None): diff --git a/src/sage/rings/tate_algebra.py b/src/sage/rings/tate_algebra.py index 993f1a95aa1..839d0e05b18 100644 --- a/src/sage/rings/tate_algebra.py +++ b/src/sage/rings/tate_algebra.py @@ -132,12 +132,12 @@ from sage.structure.factory import UniqueFactory from sage.structure.unique_representation import UniqueRepresentation from sage.monoids.monoid import Monoid_class -from sage.rings.ring import CommutativeAlgebra +from sage.categories.algebras import Algebras +from sage.structure.parent import Parent from sage.rings.integer_ring import ZZ from sage.rings.padics.padic_generic import pAdicGeneric from sage.misc.misc_c import prod -from sage.categories.commutative_algebras import CommutativeAlgebras from sage.categories.pushout import pushout from sage.structure.category_object import normalize_names @@ -481,7 +481,6 @@ def _coerce_map_from_(self, R): False sage: U.has_coerce_map_from(T) # indirect doctest False - """ base = self._base if base.has_coerce_map_from(R): @@ -686,7 +685,7 @@ def some_elements(self): # Tate algebras ############### -class TateAlgebra_generic(CommutativeAlgebra): +class TateAlgebra_generic(Parent): def __init__(self, field, prec, log_radii, names, order, integral=False): """ Initialize the Tate algebra @@ -708,7 +707,7 @@ def __init__(self, field, prec, log_radii, names, order, integral=False): self._cap = prec self._log_radii = ETuple(log_radii) # TODO: allow log_radii in QQ self._names = names - self._latex_names = [ latex_variable_name(var) for var in names ] + self._latex_names = [latex_variable_name(var) for var in names] uniformizer = field.change(print_mode='terse', show_prec=False).uniformizer() self._uniformizer_repr = uniformizer._repr_() self._uniformizer_latex = uniformizer._latex_() @@ -719,17 +718,19 @@ def __init__(self, field, prec, log_radii, names, order, integral=False): base = field.integer_ring() else: base = field - CommutativeAlgebra.__init__(self, base, names, category=CommutativeAlgebras(base)) + Parent.__init__(self, base=base, names=names, + category=Algebras(base).Commutative()) self._polynomial_ring = _multi_variate(field, names, order=order) - one = field(1) + one = field.one() self._parent_terms = TateTermMonoid(self) self._oneterm = self._parent_terms(one, ETuple([0]*self._ngens)) if integral: # This needs to be update if log_radii are allowed to be non-integral - self._gens = [ self((one << log_radii[i]) * self._polynomial_ring.gen(i)) for i in range(self._ngens) ] + self._gens = [self.element_class(self, (one << log_radii[i]) * self._polynomial_ring.gen(i)) for i in range(self._ngens)] self._integer_ring = self else: - self._gens = [ self(g) for g in self._polynomial_ring.gens() ] + self._gens = [self.element_class(self, g) + for g in self._polynomial_ring.gens()] self._integer_ring = TateAlgebra_generic(field, prec, log_radii, names, order, integral=True) self._integer_ring._rational_ring = self._rational_ring = self @@ -1265,14 +1266,13 @@ def random_element(self, degree=2, terms=5, integral=False, prec=None): sage: B. = TateAlgebra(R, log_radii=[-1,-2]) sage: B.random_element(integral=True) # random (...1111111.001)*x*y + (...111000101.1)*x + (...11010111.01)*y^2 + ...0010011011*y + ...0010100011000 - """ if integral or self._integral: polring = self._polynomial_ring.change_ring(self._field.integer_ring()) gens = self._integer_ring._gens else: polring = self._polynomial_ring - gens = [ self.element_class(self, g) for g in self._integer_ring._gens ] + gens = [self.element_class(self, g) for g in self._integer_ring._gens] return self.element_class(self, polring.random_element(degree, terms)(*gens), prec) def is_integral_domain(self, proof=True): diff --git a/src/sage/sat/solvers/satsolver.pyx b/src/sage/sat/solvers/satsolver.pyx index 83735c86989..04b9c95f089 100644 --- a/src/sage/sat/solvers/satsolver.pyx +++ b/src/sage/sat/solvers/satsolver.pyx @@ -390,16 +390,16 @@ def SAT(solver=None, *args, **kwds): from sage.sat.solvers.picosat import PicoSAT return PicoSAT(*args, **kwds) elif solver == "LP": - from .sat_lp import SatLP + from sage.sat.solvers.sat_lp import SatLP return SatLP() elif solver == 'glucose': - from .dimacs import Glucose + from sage.sat.solvers.dimacs import Glucose return Glucose(*args, **kwds) elif solver == 'glucose-syrup': - from .dimacs import GlucoseSyrup + from sage.sat.solvers.dimacs import GlucoseSyrup return GlucoseSyrup(*args, **kwds) elif solver == 'kissat': - from .dimacs import Kissat + from sage.sat.solvers.dimacs import Kissat return Kissat(*args, **kwds) else: raise ValueError("Solver '{}' is not available".format(solver)) diff --git a/src/sage/schemes/elliptic_curves/all.py b/src/sage/schemes/elliptic_curves/all.py index e339c40d843..f4abce51a62 100644 --- a/src/sage/schemes/elliptic_curves/all.py +++ b/src/sage/schemes/elliptic_curves/all.py @@ -29,6 +29,8 @@ lazy_import('sage.schemes.elliptic_curves.ell_rational_field', ['cremona_curves', 'cremona_optimal_curves']) +lazy_import('sage.schemes.elliptic_curves.ell_finite_field', 'special_supersingular_curve') + from .cm import ( cm_orders, cm_j_invariants, cm_j_invariants_and_orders, diff --git a/src/sage/schemes/elliptic_curves/ell_field.py b/src/sage/schemes/elliptic_curves/ell_field.py index 78712572239..5b2b23d81eb 100644 --- a/src/sage/schemes/elliptic_curves/ell_field.py +++ b/src/sage/schemes/elliptic_curves/ell_field.py @@ -1964,7 +1964,6 @@ class of curves. If the j-invariant is not unique in the isogeny """ from warnings import warn - from sage.graphs.graph import DiGraph, Graph from sage.matrix.constructor import Matrix # warn users if things are getting big @@ -2016,8 +2015,13 @@ class of curves. If the j-invariant is not unique in the isogeny labels.append(E._equation_string()) A = Matrix([r + [0] * (len(A) - len(r)) for r in A]) - G = (DiGraph if directed else Graph)(A, format="adjacency_matrix", - data_structure="static_sparse") + if directed: + from sage.graphs.digraph import DiGraph as GraphType + else: + from sage.graphs.graph import Graph as GraphType + + G = GraphType(A, format="adjacency_matrix", + data_structure="static_sparse") # inplace relabelling is necessary for static_sparse graphs GL = G.relabel(labels, inplace=False) return GL diff --git a/src/sage/schemes/elliptic_curves/ell_finite_field.py b/src/sage/schemes/elliptic_curves/ell_finite_field.py index 52115c51c7d..ec2ccf7f9e0 100644 --- a/src/sage/schemes/elliptic_curves/ell_finite_field.py +++ b/src/sage/schemes/elliptic_curves/ell_finite_field.py @@ -13,6 +13,8 @@ - Mariah Lenox (2011-03): Added ``set_order`` method - Lorenz Panny, John Cremona (2023-02): ``.twists()`` + +- Lorenz Panny (2023): ``special_supersingular_curve()`` """ # **************************************************************************** @@ -2414,3 +2416,200 @@ def is_j_supersingular(j, proof=True): # expensive since it involves counting the number of points on E): return E.trace_of_frobenius() % p == 0 + +def special_supersingular_curve(F, *, endomorphism=False): + r""" + Given a finite field ``F``, construct a "special" supersingular + elliptic curve `E` defined over ``F``. + + Such a curve + + - has coefficients in `\mathbb F_p`; + + - has group structure `E(\mathbb F_p) \cong \ZZ/(p+1)` and + `E(\mathbb F_{p^2}) \cong \ZZ/(p+1) \times \ZZ/(p+1)`; + + - has an endomorphism `\vartheta` of small degree `q` that + anticommutes with the `\mathbb F_p`-Frobenius on `E`. + + (The significance of `\vartheta` is that any such endomorphism, + together with the `\mathbb F_p`-Frobenius, generates the endomorphism + algebra `\mathrm{End}(E) \otimes \QQ`.) + + INPUT: + + - ``F`` -- finite field `\mathbb F_{p^r}`; + + - ``endomorphism`` -- boolean (optional, default ``False``): + When set to ``True``, it is required that `2 \mid r`, and + the function then additionally returns `\vartheta`. + + EXAMPLES:: + + sage: special_supersingular_curve(GF(1013^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1013^2, + Isogeny of degree 3 from Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1013^2 to Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1013^2) + + sage: special_supersingular_curve(GF(1019^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1019^2, + Elliptic-curve endomorphism of Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1019^2 + Via: (u,r,s,t) = (389*z2 + 241, 0, 0, 0)) + + sage: special_supersingular_curve(GF(1021^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + 785*x + 794 over Finite Field in z2 of size 1021^2, + Isogeny of degree 2 from Elliptic Curve defined by y^2 = x^3 + 785*x + 794 over Finite Field in z2 of size 1021^2 to Elliptic Curve defined by y^2 = x^3 + 785*x + 794 over Finite Field in z2 of size 1021^2) + + sage: special_supersingular_curve(GF(1031^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1031^2, + Elliptic-curve endomorphism of Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1031^2 + Via: (u,r,s,t) = (747*z2 + 284, 0, 0, 0)) + + sage: special_supersingular_curve(GF(1033^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + 53*x + 980 over Finite Field in z2 of size 1033^2, + Isogeny of degree 11 from Elliptic Curve defined by y^2 = x^3 + 53*x + 980 over Finite Field in z2 of size 1033^2 to Elliptic Curve defined by y^2 = x^3 + 53*x + 980 over Finite Field in z2 of size 1033^2) + + sage: special_supersingular_curve(GF(1039^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1039^2, + Elliptic-curve endomorphism of Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1039^2 + Via: (u,r,s,t) = (626*z2 + 200, 0, 0, 0)) + + sage: special_supersingular_curve(GF(1049^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1049^2, + Isogeny of degree 3 from Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1049^2 to Elliptic Curve defined by y^2 = x^3 + 1 over Finite Field in z2 of size 1049^2) + + sage: special_supersingular_curve(GF(1051^2), endomorphism=True) + (Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1051^2, + Elliptic-curve endomorphism of Elliptic Curve defined by y^2 = x^3 + x over Finite Field in z2 of size 1051^2 + Via: (u,r,s,t) = (922*z2 + 129, 0, 0, 0)) + + TESTS:: + + sage: p = random_prime(1000) + sage: E = special_supersingular_curve(GF(p)) + sage: E.is_supersingular() + True + sage: E.order() == p + 1 + True + sage: F. = GF((p,2)) + sage: E, endo = special_supersingular_curve(F, endomorphism=True) + sage: E.is_supersingular() + True + sage: E.j_invariant() in GF(p) + True + sage: E.abelian_group().invariants() == (p+1, p+1) + True + sage: endo.domain() is endo.codomain() is E + True + sage: endo.trace() + 0 + sage: pi = E.frobenius_isogeny() + sage: pi.codomain() is pi.domain() is E + True + sage: pi * endo == -endo * pi + True + + Also try it for larger-degree fields:: + + sage: k = ZZ(randrange(3, 10, 2)) + sage: E = special_supersingular_curve(GF((p, k))) + sage: E.is_supersingular() + True + sage: F. = GF((p, 2*k)) + sage: E, endo = special_supersingular_curve(F, endomorphism=True) + sage: E.is_supersingular() + True + sage: E.j_invariant() in GF(p) + True + sage: endo.domain() is endo.codomain() is E + True + sage: endo.trace() + 0 + sage: pi = E.frobenius_isogeny() + sage: pi.codomain() is pi.domain() is E + True + sage: pi * endo == -endo * pi + True + + .. NOTE:: + + This function makes no guarantees about the distribution of + the output. The current implementation is deterministic in + many cases. + + ALGORITHM: [Bro2009]_, Algorithm 2.4 + """ + if not isinstance(F, FiniteField): + raise TypeError('input must be a finite field') + p = F.characteristic() + deg = F.degree() + + if endomorphism and deg % 2: + raise ValueError('endomorphism was requested but is not defined over given field') + + E = None + + # first find the degree q of our special endomorphism + if p == 2: + q = 3 + E = EllipticCurve(F, [0,0,1,0,0]) + + elif p % 4 == 3: + q = 1 + E = EllipticCurve(F, [1,0]) + + elif p % 3 == 2: + q = 3 + E = EllipticCurve(F, [0,1]) + + elif p % 8 == 5: + q = 2 + E = EllipticCurve(F, [-4320, 96768]) + + else: + from sage.arith.misc import legendre_symbol + for q in map(ZZ, range(3,p,4)): + if not q.is_prime(): + continue + if legendre_symbol(-q, p) == -1: + break + else: + assert False # should never happen + + if E is None: + from sage.arith.misc import fundamental_discriminant + from sage.schemes.elliptic_curves.cm import hilbert_class_polynomial + H = hilbert_class_polynomial(fundamental_discriminant(-q)) + j = H.change_ring(GF(p)).any_root() + a = 27 * j / (4 * (1728-j)) + E = EllipticCurve(F, [a,-a]) + + if ZZ(2).divides(deg): + k = deg//2 + E.set_order((p**k - (-1)**k)**2) + else: + E.set_order(p**deg - (-1)**deg) + + if not endomorphism: + return E + + if q == 1 or p <= 13: + if q == 1: + endos = E.automorphisms() + else: + endos = (iso*phi for phi in E.isogenies_prime_degree(q) + for iso in phi.codomain().isomorphisms(E)) + endo = next(endo for endo in endos if endo.trace().is_zero()) + + else: + from sage.schemes.elliptic_curves.weierstrass_morphism import WeierstrassIsomorphism + iso = WeierstrassIsomorphism(None, (F(-q).sqrt(),0,0,0), E) + if q == 3 and E.a_invariants() == (0,0,0,0,1): + # workaround for #21883 + endo = E.isogeny(E(0,1)) + else: + endo = E.isogeny(None, iso.domain(), degree=q) + endo = iso * endo + + endo._degree = ZZ(q) + endo.trace.set_cache(ZZ.zero()) + return E, endo diff --git a/src/sage/sets/disjoint_set.pyx b/src/sage/sets/disjoint_set.pyx index 4db91f4f058..3d2f4dd1710 100644 --- a/src/sage/sets/disjoint_set.pyx +++ b/src/sage/sets/disjoint_set.pyx @@ -600,7 +600,7 @@ cdef class DisjointSet_of_integers(DisjointSet_class): [(0, 0, None), (1, 1, None), (2, 1, None), (3, 1, None), (4, 1, None)] """ d = {i: [self._nodes.parent[i]] for i in range(self.cardinality())} - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph return DiGraph(d) cdef class DisjointSet_of_hashables(DisjointSet_class): @@ -891,5 +891,5 @@ cdef class DisjointSet_of_hashables(DisjointSet_class): e = self._int_to_el[i] p = self._int_to_el[self._nodes.parent[i]] d[e] = [p] - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph return DiGraph(d) diff --git a/src/sage/sets/set.py b/src/sage/sets/set.py index 2ac71e73dbf..8131c044e86 100644 --- a/src/sage/sets/set.py +++ b/src/sage/sets/set.py @@ -813,7 +813,7 @@ def subsets_lattice(self): raise NotImplementedError( "this method is only implemented for finite sets") from sage.combinat.posets.lattices import FiniteLatticePoset - from sage.graphs.graph import DiGraph + from sage.graphs.digraph import DiGraph from sage.rings.integer import Integer n = self.cardinality() # list, contains at position 0 <= i < 2^n diff --git a/src/sage/structure/parent.pyx b/src/sage/structure/parent.pyx index 9a0cbd66b9a..6ac939db3c8 100644 --- a/src/sage/structure/parent.pyx +++ b/src/sage/structure/parent.pyx @@ -2672,7 +2672,7 @@ cdef class Parent(sage.structure.category_object.CategoryObject): _register_pair(self, S, "action") # avoid possible infinite loops # detect actions defined by _rmul_, _lmul_, _act_on_, and _acted_upon_ methods - from .coerce_actions import detect_element_action + from sage.structure.coerce_actions import detect_element_action action = detect_element_action(self, S, self_on_left, self_el, S_el) if action is not None: return action diff --git a/src/sage/structure/parent_old.pyx b/src/sage/structure/parent_old.pyx index c2afaa89000..06c84960605 100644 --- a/src/sage/structure/parent_old.pyx +++ b/src/sage/structure/parent_old.pyx @@ -216,31 +216,6 @@ cdef class Parent(parent.Parent): check_old_coerce(self) return self._coerce_c_impl(x) - def _coerce_try(self, x, v): - """ - Given a list v of rings, try to coerce x canonically into each - one in turn. Return the __call__ coercion of the result into - self of the first canonical coercion that succeeds. Raise a - :class:`TypeError` if none of them succeed. - - INPUT: - - - x -- Python object - - v -- parent object or list (iterator) of parent objects - """ - deprecation(33464, "usage of _coerce_try is deprecated") - check_old_coerce(self) - if not isinstance(v, list): - v = [v] - - for R in v: - try: - y = R._coerce_(x) - return self(y) - except (TypeError, AttributeError) as msg: - pass - raise TypeError("no canonical coercion of element into self") - cdef __has_coerce_map_from_c(self, S) noexcept: check_old_coerce(self) if self == S: diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx index 0b80c017a0b..9d86a81b24b 100644 --- a/src/sage/symbolic/expression.pyx +++ b/src/sage/symbolic/expression.pyx @@ -922,7 +922,7 @@ cdef class Expression(Expression_abc): if state[0] != 0 or len(state) != 3: raise ValueError("unknown state information") # set parent - from .ring import SR + from sage.symbolic.ring import SR self._parent = SR # get variables cdef GExList sym_lst @@ -966,7 +966,7 @@ cdef class Expression(Expression_abc): True """ - from .ring import SR + from sage.symbolic.ring import SR SR.cleanup_var(self) return False @@ -3250,7 +3250,7 @@ cdef class Expression(Expression_abc): sage: x.is_trivially_equal(QQbar(1/2)) True """ - from .ring import SR + from sage.symbolic.ring import SR cdef Expression _other = (SR(other)) sig_on() try: @@ -12130,7 +12130,7 @@ cdef class Expression(Expression_abc): ... ValueError: cannot convert """ - from . import units + from sage.symbolic import units return units.convert(self, target) ################################################################### diff --git a/src/sage/symbolic/function.pyx b/src/sage/symbolic/function.pyx index 792d81ebcc9..e349fe20100 100644 --- a/src/sage/symbolic/function.pyx +++ b/src/sage/symbolic/function.pyx @@ -148,10 +148,10 @@ from sage.structure.richcmp cimport richcmp from sage.misc.fpickle import pickle_function, unpickle_function -from .symbols import symbol_table, register_symbol +from sage.symbolic.symbols import symbol_table, register_symbol try: - from .expression import ( + from sage.symbolic.expression import ( call_registered_function, find_registered_function, register_or_update_function, get_sfunction_from_hash, get_sfunction_from_serial as get_sfunction_from_serial ) @@ -528,7 +528,7 @@ cdef class Function(SageObject): # to a numeric type at the end symbolic_input = any(isinstance(arg, Expression) for arg in args) - from .ring import SR + from sage.symbolic.ring import SR if coerce: try: @@ -606,7 +606,7 @@ cdef class Function(SageObject): sage: sin.default_variable() # needs sage.symbolic x """ - from .ring import SR + from sage.symbolic.ring import SR return SR.var('x') def _is_numerical(self, x): @@ -1053,7 +1053,7 @@ cdef class BuiltinFunction(Function): if (self._preserved_arg and isinstance(args[self._preserved_arg-1], Element)): arg_parent = parent(args[self._preserved_arg-1]) - from .ring import SR + from sage.symbolic.ring import SR if arg_parent is SR: return res from sage.rings.polynomial.polynomial_ring import PolynomialRing_commutative diff --git a/src/sage/symbolic/pynac_impl.pxi b/src/sage/symbolic/pynac_impl.pxi index 88436ee2705..b2091522c49 100644 --- a/src/sage/symbolic/pynac_impl.pxi +++ b/src/sage/symbolic/pynac_impl.pxi @@ -70,7 +70,7 @@ cdef ex_to_pyExpression(GEx juice) noexcept: cdef Expression nex nex = Expression.__new__(Expression) nex._gobj = GEx(juice) - from .ring import SR + from sage.symbolic.ring import SR nex._parent = SR return nex @@ -189,7 +189,7 @@ cdef GEx pyExpression_to_ex(res) except *: """ if res is None: raise TypeError("function returned None, expected return value of type sage.symbolic.expression.Expression") - from .ring import SR + from sage.symbolic.ring import SR try: t = SR.coerce(res) except TypeError as err: @@ -1156,7 +1156,7 @@ cdef bint py_is_integer(x) noexcept: if not isinstance(x, Element): return False P = (x)._parent - from .ring import SymbolicRing + from sage.symbolic.ring import SymbolicRing return (isinstance(P, SymbolicRing) or P.is_exact()) and x in ZZ @@ -1246,7 +1246,7 @@ cdef bint py_is_exact(x) noexcept: if not isinstance(x, Element): return False P = (x)._parent - from .ring import SymbolicRing + from sage.symbolic.ring import SymbolicRing return isinstance(P, SymbolicRing) or P.is_exact() @@ -1553,7 +1553,7 @@ cdef py_step(n) noexcept: """ Return step function of n. """ - from .ring import SR + from sage.symbolic.ring import SR if n < 0: return SR(0) elif n > 0: @@ -2466,7 +2466,7 @@ def init_pynac_I(): from sage.rings.number_field.number_field import GaussianField pynac_I = GaussianField().gen() ginac_pyinit_I(pynac_I) - from .ring import SR + from sage.symbolic.ring import SR return new_Expression_from_GEx(SR, g_I) diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx index f3f32b9c922..a74db5807d5 100644 --- a/src/sage/symbolic/ring.pyx +++ b/src/sage/symbolic/ring.pyx @@ -213,7 +213,7 @@ cdef class SymbolicRing(sage.rings.abc.SymbolicRing): from sage.rings.real_lazy import RLF, CLF from sage.rings.finite_rings.finite_field_base import FiniteField - from .subring import GenericSymbolicSubring + from sage.symbolic.subring import GenericSymbolicSubring if R._is_numerical(): # Almost anything with a coercion into any precision of CC @@ -1133,7 +1133,7 @@ cdef class SymbolicRing(sage.rings.abc.SymbolicRing): """ if self is not SR: raise NotImplementedError('cannot create subring of %s' % (self,)) - from .subring import SymbolicSubring + from sage.symbolic.subring import SymbolicSubring return SymbolicSubring(*args, **kwds) def _fricas_init_(self): diff --git a/src/sage/topology/simplicial_set.py b/src/sage/topology/simplicial_set.py index 3ee14ae2da8..e33465f1153 100644 --- a/src/sage/topology/simplicial_set.py +++ b/src/sage/topology/simplicial_set.py @@ -294,6 +294,7 @@ class AbstractSimplex_class(SageObject): Users should not call this directly, but instead use :func:`AbstractSimplex`. See that function for more documentation. """ + def __init__(self, dim, degeneracies=(), underlying=None, name=None, latex_name=None): """ @@ -3202,6 +3203,7 @@ class SimplicialSet_finite(SimplicialSet_arbitrary, GenericCellComplex): sage: X Y """ + def __init__(self, data, base_point=None, name=None, check=True, category=None, latex_name=None): r""" diff --git a/src/sage/version.py b/src/sage/version.py index f7c0467ee4e..b7ee40a93da 100644 --- a/src/sage/version.py +++ b/src/sage/version.py @@ -1,5 +1,5 @@ # Sage version information for Python scripts # This file is auto-generated by the sage-update-version script, do not edit! -version = '10.3.beta0' -date = '2023-12-05' -banner = 'SageMath version 10.3.beta0, Release Date: 2023-12-05' +version = '10.3.beta1' +date = '2023-12-10' +banner = 'SageMath version 10.3.beta1, Release Date: 2023-12-10' diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py index 63aa1145154..5ee619e56da 100644 --- a/src/sage_docbuild/builders.py +++ b/src/sage_docbuild/builders.py @@ -720,14 +720,14 @@ def pdf(self): # # Change the third form to # - # blah + # blah # rst = re.sub(r'`([^`\n]*)`__.*\n\n__ (.*)', r'\1.', rst) rst = re.sub(r'`([^<\n]*)\s+<(.*)>`_', r'\1', rst) rst = re.sub(r':doc:`([^<]*?)\s+<(.*)/index>`', - r' \1 ', rst) + r'\1 ', rst) # Body: add paragraph

markup. start = rst.rfind('*\n') + 1 end = rst.find('\nUser Interfaces') diff --git a/src/sage_setup/clean.py b/src/sage_setup/clean.py index 3cf0d08a353..e9c81c9ed1a 100644 --- a/src/sage_setup/clean.py +++ b/src/sage_setup/clean.py @@ -15,11 +15,11 @@ #***************************************************************************** -import os import importlib.util +import os from sage.misc.package_dir import SourceDistributionFilter -from sage_setup.find import installed_files_by_module, get_extensions +from sage_setup.find import get_extensions, installed_files_by_module def _remove(file_set, module_base, to_remove):

- + @@ -55,7 +58,7 @@