-
Notifications
You must be signed in to change notification settings - Fork 0
add queuepenalty #33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
youdongguo
wants to merge
9
commits into
main
Choose a base branch
from
yg/add_queuepenalty
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+192
−158
Open
add queuepenalty #33
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c6f8149
add queuepenalty
b895242
fix some api
04bfa31
delete shotpenalty
84df5e8
update the docstring of queuepenalty
5b14a34
Merge branch 'main' into yg/add_queuepenalty
youdongguo da9e6ea
Merge branch 'main' into yg/add_queuepenalty
youdongguo 6350807
consistent_with_dealing with zero
10c241e
fix bugs
74856b6
test_customized merge function
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,77 @@ | ||
| name: CI | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| tags: ['*'] | ||
| pull_request: | ||
| workflow_dispatch: | ||
| concurrency: | ||
| # Skip intermediate builds: always. | ||
| # Cancel intermediate builds: only if it is a pull request build. | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} | ||
| jobs: | ||
| test: | ||
| name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} | ||
| runs-on: ${{ matrix.os }} | ||
| timeout-minutes: 60 | ||
| permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created | ||
| actions: write | ||
| contents: read | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| version: | ||
| - '1.10' | ||
| - '1' | ||
| os: | ||
| - ubuntu-latest | ||
| arch: | ||
| - x64 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: julia-actions/setup-julia@v2 | ||
| with: | ||
| version: ${{ matrix.version }} | ||
| arch: ${{ matrix.arch }} | ||
| - uses: julia-actions/cache@v2 | ||
| - uses: julia-actions/julia-buildpkg@v1 | ||
| - uses: julia-actions/julia-runtest@v1 | ||
| - uses: julia-actions/julia-processcoverage@v1 | ||
| - uses: codecov/codecov-action@v5 | ||
| with: | ||
| files: lcov.info | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| fail_ci_if_error: false | ||
| # docs: | ||
| # name: Documentation | ||
| # runs-on: ubuntu-latest | ||
| # permissions: | ||
| # actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created | ||
| # contents: write | ||
| # statuses: write | ||
| # steps: | ||
| # - uses: actions/checkout@v4 | ||
| # - uses: julia-actions/setup-julia@v2 | ||
| # with: | ||
| # version: '1' | ||
| # - uses: julia-actions/cache@v2 | ||
| # - name: Configure doc environment | ||
| # shell: julia --project=docs --color=yes {0} | ||
| # run: | | ||
| # using Pkg | ||
| # Pkg.develop(PackageSpec(path=pwd())) | ||
| # Pkg.instantiate() | ||
| # - uses: julia-actions/julia-buildpkg@v1 | ||
| # - uses: julia-actions/julia-docdeploy@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} | ||
| # - name: Run doctests | ||
| # shell: julia --project=docs --color=yes {0} | ||
| # run: | | ||
| # using Documenter: DocMeta, doctest | ||
| # using NMFMerge | ||
| # DocMeta.setdocmeta!(NMFMerge, :DocTestSetup, :(using NMFMerge); recursive=true) | ||
| # doctest(NMFMerge) | ||
| name: CI | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| tags: ['*'] | ||
| pull_request: | ||
| workflow_dispatch: | ||
| concurrency: | ||
| # Skip intermediate builds: always. | ||
| # Cancel intermediate builds: only if it is a pull request build. | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} | ||
| jobs: | ||
| test: | ||
| name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} | ||
| runs-on: ${{ matrix.os }} | ||
| timeout-minutes: 60 | ||
| permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created | ||
| actions: write | ||
| contents: read | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| version: | ||
| - '1.10' | ||
| - '1' | ||
| os: | ||
| - ubuntu-latest | ||
| arch: | ||
| - x64 | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: julia-actions/setup-julia@v2 | ||
| with: | ||
| version: ${{ matrix.version }} | ||
| arch: ${{ matrix.arch }} | ||
| - uses: julia-actions/cache@v2 | ||
| - uses: julia-actions/julia-buildpkg@v1 | ||
| - uses: julia-actions/julia-runtest@v1 | ||
| - uses: julia-actions/julia-processcoverage@v1 | ||
| - uses: codecov/codecov-action@v5 | ||
| with: | ||
| files: lcov.info | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| fail_ci_if_error: false | ||
| # docs: | ||
| # name: Documentation | ||
| # runs-on: ubuntu-latest | ||
| # permissions: | ||
| # actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created | ||
| # contents: write | ||
| # statuses: write | ||
| # steps: | ||
| # - uses: actions/checkout@v4 | ||
| # - uses: julia-actions/setup-julia@v2 | ||
| # with: | ||
| # version: '1' | ||
| # - uses: julia-actions/cache@v2 | ||
| # - name: Configure doc environment | ||
| # shell: julia --project=docs --color=yes {0} | ||
| # run: | | ||
| # using Pkg | ||
| # Pkg.develop(PackageSpec(path=pwd())) | ||
| # Pkg.instantiate() | ||
| # - uses: julia-actions/julia-buildpkg@v1 | ||
| # - uses: julia-actions/julia-docdeploy@v1 | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} | ||
| # - name: Run doctests | ||
| # shell: julia --project=docs --color=yes {0} | ||
| # run: | | ||
| # using Documenter: DocMeta, doctest | ||
| # using NMFMerge | ||
| # DocMeta.setdocmeta!(NMFMerge, :DocTestSetup, :(using NMFMerge); recursive=true) | ||
| # doctest(NMFMerge) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| name: CompatHelper | ||
| on: | ||
| schedule: | ||
| - cron: '0 0 * * 0' | ||
| workflow_dispatch: | ||
| jobs: | ||
| CompatHelper: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Pkg.add("CompatHelper") | ||
| run: julia -e 'using Pkg; Pkg.add("CompatHelper")' | ||
| - name: CompatHelper.main() | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} | ||
| run: julia -e 'using CompatHelper; CompatHelper.main()' | ||
| name: CompatHelper | ||
| on: | ||
| schedule: | ||
| - cron: '0 0 * * 0' | ||
| workflow_dispatch: | ||
| jobs: | ||
| CompatHelper: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Pkg.add("CompatHelper") | ||
| run: julia -e 'using Pkg; Pkg.add("CompatHelper")' | ||
| - name: CompatHelper.main() | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }} | ||
| run: julia -e 'using CompatHelper; CompatHelper.main()' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| name = "NMFMerge" | ||
| uuid = "9cc52eda-dfaf-4e21-aae3-9f26bed153a3" | ||
| authors = ["youdongguo <[email protected]> and contributors"] | ||
| version = "1.0.1" | ||
|
|
||
| [deps] | ||
| DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" | ||
| GsvdInitialization = "2ac24108-be9c-42b8-8d78-6a4f62a87e7d" | ||
| LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" | ||
| NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386" | ||
| TSVD = "9449cd9e-2762-5aa3-a617-5413e99d722e" | ||
|
|
||
| [compat] | ||
| DataStructures = "0.18, 0.19" | ||
| ForwardDiff = "0.10" | ||
| GsvdInitialization = "1" | ||
| LinearAlgebra = "1" | ||
| NMF = "1" | ||
| TSVD = "0.4" | ||
| Test = "1" | ||
| julia = "1.10" | ||
|
|
||
| [extras] | ||
| ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" | ||
| NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386" | ||
| Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" | ||
|
|
||
| [targets] | ||
| test = ["ForwardDiff", "NMF", "Test"] | ||
| name = "NMFMerge" | ||
| uuid = "9cc52eda-dfaf-4e21-aae3-9f26bed153a3" | ||
| authors = ["youdongguo <[email protected]> and contributors"] | ||
| version = "1.1.0" | ||
| [deps] | ||
| DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" | ||
| GsvdInitialization = "2ac24108-be9c-42b8-8d78-6a4f62a87e7d" | ||
| LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" | ||
| NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386" | ||
| TSVD = "9449cd9e-2762-5aa3-a617-5413e99d722e" | ||
| [compat] | ||
| DataStructures = "0.18" | ||
| ForwardDiff = "0.10" | ||
| GsvdInitialization = "1" | ||
| LinearAlgebra = "1" | ||
| NMF = "1" | ||
| TSVD = "0.4" | ||
| Test = "1" | ||
| julia = "1.10" | ||
| [extras] | ||
| ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" | ||
| NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386" | ||
| Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" | ||
| [targets] | ||
| test = ["ForwardDiff", "NMF", "Test"] | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is accepting 0.19 reverted?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the only thing left before merging. Is there a reason to require 0.18 or was that a mistake?