Skip to content

Commit 2e14f60

Browse files
youdongguoyoudongguo
youdongguo
and
youdongguo
authored
add queuepenalty (#33)
* add queuepenalty * fix some api * delete shotpenalty * update the docstring of queuepenalty * consistent_with_dealing with zero * fix bugs * test_customized merge function * revert the datastructure version --------- Co-authored-by: youdongguo <1010705897@qq.com>
1 parent f3f4f7b commit 2e14f60

File tree

5 files changed

+192
-158
lines changed

5 files changed

+192
-158
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
name: CI
2-
on:
3-
push:
4-
branches:
5-
- main
6-
tags: ['*']
7-
pull_request:
8-
workflow_dispatch:
9-
concurrency:
10-
# Skip intermediate builds: always.
11-
# Cancel intermediate builds: only if it is a pull request build.
12-
group: ${{ github.workflow }}-${{ github.ref }}
13-
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14-
jobs:
15-
test:
16-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
17-
runs-on: ${{ matrix.os }}
18-
timeout-minutes: 60
19-
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
20-
actions: write
21-
contents: read
22-
strategy:
23-
fail-fast: false
24-
matrix:
25-
version:
26-
- '1.10'
27-
- '1'
28-
os:
29-
- ubuntu-latest
30-
arch:
31-
- x64
32-
steps:
33-
- uses: actions/checkout@v4
34-
- uses: julia-actions/setup-julia@v2
35-
with:
36-
version: ${{ matrix.version }}
37-
arch: ${{ matrix.arch }}
38-
- uses: julia-actions/cache@v2
39-
- uses: julia-actions/julia-buildpkg@v1
40-
- uses: julia-actions/julia-runtest@v1
41-
- uses: julia-actions/julia-processcoverage@v1
42-
- uses: codecov/codecov-action@v5
43-
with:
44-
files: lcov.info
45-
token: ${{ secrets.CODECOV_TOKEN }}
46-
fail_ci_if_error: false
47-
# docs:
48-
# name: Documentation
49-
# runs-on: ubuntu-latest
50-
# permissions:
51-
# actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created
52-
# contents: write
53-
# statuses: write
54-
# steps:
55-
# - uses: actions/checkout@v4
56-
# - uses: julia-actions/setup-julia@v2
57-
# with:
58-
# version: '1'
59-
# - uses: julia-actions/cache@v2
60-
# - name: Configure doc environment
61-
# shell: julia --project=docs --color=yes {0}
62-
# run: |
63-
# using Pkg
64-
# Pkg.develop(PackageSpec(path=pwd()))
65-
# Pkg.instantiate()
66-
# - uses: julia-actions/julia-buildpkg@v1
67-
# - uses: julia-actions/julia-docdeploy@v1
68-
# env:
69-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70-
# DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
71-
# - name: Run doctests
72-
# shell: julia --project=docs --color=yes {0}
73-
# run: |
74-
# using Documenter: DocMeta, doctest
75-
# using NMFMerge
76-
# DocMeta.setdocmeta!(NMFMerge, :DocTestSetup, :(using NMFMerge); recursive=true)
77-
# doctest(NMFMerge)
1+
name: CI
2+
on:
3+
push:
4+
branches:
5+
- main
6+
tags: ['*']
7+
pull_request:
8+
workflow_dispatch:
9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14+
jobs:
15+
test:
16+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
17+
runs-on: ${{ matrix.os }}
18+
timeout-minutes: 60
19+
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
20+
actions: write
21+
contents: read
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
version:
26+
- '1.10'
27+
- '1'
28+
os:
29+
- ubuntu-latest
30+
arch:
31+
- x64
32+
steps:
33+
- uses: actions/checkout@v4
34+
- uses: julia-actions/setup-julia@v2
35+
with:
36+
version: ${{ matrix.version }}
37+
arch: ${{ matrix.arch }}
38+
- uses: julia-actions/cache@v2
39+
- uses: julia-actions/julia-buildpkg@v1
40+
- uses: julia-actions/julia-runtest@v1
41+
- uses: julia-actions/julia-processcoverage@v1
42+
- uses: codecov/codecov-action@v5
43+
with:
44+
files: lcov.info
45+
token: ${{ secrets.CODECOV_TOKEN }}
46+
fail_ci_if_error: false
47+
# docs:
48+
# name: Documentation
49+
# runs-on: ubuntu-latest
50+
# permissions:
51+
# actions: write # needed to allow julia-actions/cache to proactively delete old caches that it has created
52+
# contents: write
53+
# statuses: write
54+
# steps:
55+
# - uses: actions/checkout@v4
56+
# - uses: julia-actions/setup-julia@v2
57+
# with:
58+
# version: '1'
59+
# - uses: julia-actions/cache@v2
60+
# - name: Configure doc environment
61+
# shell: julia --project=docs --color=yes {0}
62+
# run: |
63+
# using Pkg
64+
# Pkg.develop(PackageSpec(path=pwd()))
65+
# Pkg.instantiate()
66+
# - uses: julia-actions/julia-buildpkg@v1
67+
# - uses: julia-actions/julia-docdeploy@v1
68+
# env:
69+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70+
# DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
71+
# - name: Run doctests
72+
# shell: julia --project=docs --color=yes {0}
73+
# run: |
74+
# using Documenter: DocMeta, doctest
75+
# using NMFMerge
76+
# DocMeta.setdocmeta!(NMFMerge, :DocTestSetup, :(using NMFMerge); recursive=true)
77+
# doctest(NMFMerge)

‎.github/workflows/CompatHelper.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
name: CompatHelper
2-
on:
3-
schedule:
4-
- cron: '0 0 * * 0'
5-
workflow_dispatch:
6-
jobs:
7-
CompatHelper:
8-
runs-on: ubuntu-latest
9-
steps:
10-
- name: Pkg.add("CompatHelper")
11-
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
12-
- name: CompatHelper.main()
13-
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15-
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
16-
run: julia -e 'using CompatHelper; CompatHelper.main()'
1+
name: CompatHelper
2+
on:
3+
schedule:
4+
- cron: '0 0 * * 0'
5+
workflow_dispatch:
6+
jobs:
7+
CompatHelper:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Pkg.add("CompatHelper")
11+
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
12+
- name: CompatHelper.main()
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
16+
run: julia -e 'using CompatHelper; CompatHelper.main()'

‎Project.toml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
name = "NMFMerge"
2-
uuid = "9cc52eda-dfaf-4e21-aae3-9f26bed153a3"
3-
authors = ["youdongguo <1010705897@qq.com> and contributors"]
4-
version = "1.0.1"
5-
6-
[deps]
7-
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
8-
GsvdInitialization = "2ac24108-be9c-42b8-8d78-6a4f62a87e7d"
9-
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
10-
NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386"
11-
TSVD = "9449cd9e-2762-5aa3-a617-5413e99d722e"
12-
13-
[compat]
14-
DataStructures = "0.18, 0.19"
15-
ForwardDiff = "0.10"
16-
GsvdInitialization = "1"
17-
LinearAlgebra = "1"
18-
NMF = "1"
19-
TSVD = "0.4"
20-
Test = "1"
21-
julia = "1.10"
22-
23-
[extras]
24-
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
25-
NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386"
26-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
27-
28-
[targets]
29-
test = ["ForwardDiff", "NMF", "Test"]
1+
name = "NMFMerge"
2+
uuid = "9cc52eda-dfaf-4e21-aae3-9f26bed153a3"
3+
authors = ["youdongguo <1010705897@qq.com> and contributors"]
4+
version = "1.1.0"
5+
6+
[deps]
7+
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
8+
GsvdInitialization = "2ac24108-be9c-42b8-8d78-6a4f62a87e7d"
9+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
10+
NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386"
11+
TSVD = "9449cd9e-2762-5aa3-a617-5413e99d722e"
12+
13+
[compat]
14+
DataStructures = "0.18, 0.19"
15+
ForwardDiff = "0.10"
16+
GsvdInitialization = "1"
17+
LinearAlgebra = "1"
18+
NMF = "1"
19+
TSVD = "0.4"
20+
Test = "1"
21+
julia = "1.10"
22+
23+
[extras]
24+
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
25+
NMF = "6ef6ca0d-6ad7-5ff6-b225-e928bfa0a386"
26+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
27+
28+
[targets]
29+
test = ["ForwardDiff", "NMF", "Test"]

0 commit comments

Comments
 (0)