Skip to content

Commit c0531c7

Browse files
committed
documentation fix
1 parent 539aa9e commit c0531c7

File tree

6 files changed

+102
-55
lines changed

6 files changed

+102
-55
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
julia: 1.1
3434
os: linux
3535
script:
36-
- julia --project=docs/ -e 'using Pkg; println("1"); Pkg.add(PackageSpec(name="DocStringExtensions", version="0.8.0")); println("1a"); Pkg.add("Documenter"); println("2"); Pkg.update(); println("3"); Pkg.develop(PackageSpec(path=pwd())); println("4"); Pkg.instantiate(); println("5");'
36+
- julia --project=docs/ -e 'using Pkg; Pkg.add(PackageSpec(name="DocStringExtensions", version="0.8.0")); Pkg.add("Documenter"); Pkg.update(); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate();'
3737
- julia --project=docs/ docs/make.jl
3838
after_success: skip
3939

Manifest.toml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
[[Base64]]
4+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
5+
6+
[[Dates]]
7+
deps = ["Printf"]
8+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
9+
10+
[[Distributed]]
11+
deps = ["Random", "Serialization", "Sockets"]
12+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
13+
14+
[[DocStringExtensions]]
15+
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
16+
git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600"
17+
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
18+
version = "0.8.0"
19+
20+
[[InteractiveUtils]]
21+
deps = ["Markdown"]
22+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
23+
24+
[[LibGit2]]
25+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
26+
27+
[[Libdl]]
28+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
29+
30+
[[LinearAlgebra]]
31+
deps = ["Libdl"]
32+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
33+
34+
[[Logging]]
35+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
36+
37+
[[Markdown]]
38+
deps = ["Base64"]
39+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
40+
41+
[[Pkg]]
42+
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
43+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
44+
45+
[[Printf]]
46+
deps = ["Unicode"]
47+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
48+
49+
[[REPL]]
50+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
51+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
52+
53+
[[Random]]
54+
deps = ["Serialization"]
55+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
56+
57+
[[SHA]]
58+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
59+
60+
[[Serialization]]
61+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
62+
63+
[[Sockets]]
64+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
65+
66+
[[SparseArrays]]
67+
deps = ["LinearAlgebra", "Random"]
68+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
69+
70+
[[Test]]
71+
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
72+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
73+
74+
[[UUIDs]]
75+
deps = ["Random", "SHA"]
76+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
77+
78+
[[Unicode]]
79+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

docs/src/api.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ Order = [:constant]
1818

1919
```@autodocs
2020
Modules = [ExtendableSparse]
21-
Pages = ["extension.jl","extendable.jl","sprand.md"]
21+
Pages = ["extension.jl","extendable.jl", "sprand.jl"]
2222
Order = [:function]
2323
```
24-
25-
26-

src/extendable.jl

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ $(TYPEDEF)
55
Extendable sparse matrix. A nonzero entry of this matrix is contained
66
either in cscmatrix, or in extmatrix, never in both.
77
8-
98
$(TYPEDFIELDS)
109
"""
1110
mutable struct ExtendableSparseMatrix{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv,Ti}
@@ -20,21 +19,17 @@ mutable struct ExtendableSparseMatrix{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv
2019
extmatrix::SparseMatrixExtension{Tv,Ti}
2120
end
2221

22+
2323
"""
2424
$(TYPEDSIGNATURES)
2525
2626
Create empty ExtendablSparseMatrix.
2727
2828
This is a pendant to spzeros.
29-
3029
"""
3130
ExtendableSparseMatrix{Tv,Ti}(m::Integer, n::Integer) where {Tv,Ti<:Integer}=ExtendableSparseMatrix{Tv,Ti}(spzeros(Tv,Ti,m,n),SparseMatrixExtension{Tv, Ti}(m,n))
3231

3332

34-
35-
36-
37-
3833
"""
3934
$(TYPEDSIGNATURES)
4035
@@ -59,10 +54,8 @@ end
5954

6055

6156

62-
63-
6457
"""
65-
$(TYPEDSIGNATURES)
58+
$(SIGNATURES)
6659
6760
Find index in CSC matrix and set value if it exists. Otherwise,
6861
set index in extension.
@@ -81,7 +74,7 @@ end
8174

8275

8376
"""
84-
$(TYPEDSIGNATURES)
77+
$(SIGNATURES)
8578
8679
Find index in CSC matrix and return value, if it exists.
8780
Otherwise, return value from extension.
@@ -95,37 +88,23 @@ function Base.getindex(M::ExtendableSparseMatrix,i::Integer, j::Integer)
9588
end
9689
end
9790

98-
99-
100-
101-
102-
10391
"""
104-
$(TYPEDSIGNATURES)
92+
$(SIGNATURES)
10593
106-
Matrix size.
94+
Size of ExtendableSparseMatrix.
10795
"""
10896
Base.size(E::ExtendableSparseMatrix) = (E.cscmatrix.m, E.cscmatrix.n)
10997

11098

111-
112-
113-
114-
11599
"""
116-
$(TYPEDSIGNATURES)
100+
$(SIGNATURES)
117101
118-
Number of nonzeros.
102+
Number of nonzeros of ExtendableSparseMatrix.
119103
"""
120104
SparseArrays.nnz(E::ExtendableSparseMatrix)=(nnz(E.cscmatrix)+nnz(E.extmatrix))
121105

122106

123107

124-
125-
126-
127-
128-
129108
# Struct holding pair of value and row
130109
# number, for sorting
131110
mutable struct ColEntry{Tv,Ti<:Integer}
@@ -221,9 +200,6 @@ function _splice(E::SparseMatrixExtension{Tv,Ti},S::SparseMatrixCSC{Tv,Ti}) wher
221200
end
222201

223202

224-
225-
226-
227203
"""
228204
$(TYPEDSIGNATURES)
229205
@@ -240,11 +216,8 @@ end
240216

241217

242218

243-
244-
245-
246219
"""
247-
$(TYPEDSIGNATURES)
220+
$(SIGNATURES)
248221
249222
Flush and delegate to cscmatrix.
250223
"""
@@ -257,7 +230,7 @@ end
257230

258231

259232
"""
260-
$(TYPEDSIGNATURES)
233+
$(SIGNATURES)
261234
262235
Flush and delegate to cscmatrix.
263236
"""
@@ -267,11 +240,8 @@ function SparseArrays.rowvals(E::ExtendableSparseMatrix)
267240
end
268241

269242

270-
271-
272-
273243
"""
274-
$(TYPEDSIGNATURES)
244+
$(SIGNATURES)
275245
276246
Flush and delegate to cscmatrix.
277247
"""
@@ -281,10 +251,8 @@ function xcolptrs(E::ExtendableSparseMatrix)
281251
end
282252

283253

284-
285-
286254
"""
287-
$(TYPEDSIGNATURES)
255+
$(SIGNATURES)
288256
289257
Flush and delegate to cscmatrix.
290258
"""
@@ -295,7 +263,7 @@ end
295263

296264

297265
"""
298-
$(TYPEDSIGNATURES)
266+
$(SIGNATURES)
299267
300268
Flush and delegate to cscmatrix.
301269
"""
@@ -320,7 +288,7 @@ end
320288

321289

322290
"""
323-
$(TYPEDSIGNATURES)
291+
$(SIGNATURES)
324292
325293
Flush and delegate to cscmatrix.
326294
"""

src/extension.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##################################################################
1+
22
"""
33
$(TYPEDEF)
44
@@ -25,6 +25,7 @@ mutable struct SparseMatrixExtension{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv,
2525
"""
2626
nnz::Ti
2727

28+
2829
"""
2930
Linked list of column entries. Initial length is n,
3031
it grows with each new entry.
@@ -40,7 +41,7 @@ mutable struct SparseMatrixExtension{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv,
4041
Row numbers. For each index it contains the zero (initial state)
4142
or the row numbers corresponding to the column entry list in colptr.
4243
43-
Initial length is n,
44+
Initial length is n,
4445
it grows with each new entry.
4546
"""
4647
rowval::Vector{Ti}
@@ -55,6 +56,7 @@ mutable struct SparseMatrixExtension{Tv,Ti<:Integer} <: AbstractSparseMatrix{Tv,
5556
end
5657

5758

59+
5860
"""
5961
$(TYPEDSIGNATURES)
6062
@@ -66,7 +68,7 @@ SparseMatrixExtension{Tv,Ti}(m::Integer, n::Integer) where {Tv,Ti<:Integer} =
6668

6769

6870
"""
69-
$(TYPEDSIGNATURES)
71+
$(SIGNATURES)
7072
7173
Return value stored for entry or zero if not found
7274
"""
@@ -90,7 +92,7 @@ end
9092

9193

9294
"""
93-
$(TYPEDSIGNATURES)
95+
$(SIGNATURES)
9496
9597
Update value of existing entry, otherwise extend matrix.
9698
"""
@@ -168,3 +170,4 @@ used in thest methods
168170
function flush!(M::SparseMatrixExtension{Tv, Ti}) where{Tv, Ti}
169171
return M
170172
end
173+

src/sprand.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
$(TYPEDSIGNATURES)
2+
$(SIGNATURES)
33
44
Fill empty sparse matrix A with random nonzero elements from interval [1,2]
55
using incremental assembly.

0 commit comments

Comments
 (0)