Skip to content

Commit

Permalink
Merge branch 'devel':
Browse files Browse the repository at this point in the history
Bugfixes: Broadcast ".=" in tests and Banded
Bugfix: local variable epsilon in tests

Updated: travis
  • Loading branch information
luchr committed Aug 20, 2018
2 parents 0bd134a + 3b243e8 commit 384de23
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ os:
- linux
- osx
julia:
- 0.7
- 1.0
- nightly
notifications:
email: false
Expand Down
48 changes: 26 additions & 22 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,40 @@
Here is a picture, describing the (planned) version numbers:

```
v0.1.4 v0.4.0 [branch: master] (for current/nightly)
───┴─────┬─┴─────────────────────────────────────────────────────────────
v0.1.4 v0.4.0 ... [branch: master] (for current/nightly)
───┴─────┬─┴─────────────────────────────────────────────────────────────
│ [branch: julia_v0.4-v0.6]
└───┬──────┬─────┬──────┬────────────┬──────────┬────────────────
v0.1.5 ... v0.1.a │ v0.1.(a+1) ...
│ [branch: julia_v0.5-v0.6]
└───┬──────┬────┬────┬────┬──────────┬───
v0.2.0 ... v0.2.b │ v0.2.(b+1) ...
│ [branch: julia_v0.6]
└───┬──────┬────────
v0.3.0 ...
│ [branch: julia_v0.4-v0.6] [branch: julia_v0.4]
└───┬──────┬────────────────┬────────────┬──────────┬────────────
... v0.1.5 │ v0.1.6 ...
│ [branch: julia_v0.5]
└┬───┬──────┬────────────────────────
│ v0.2.0 ...
│ [branch: julia_v0.6]
└───┬──────┬────────────────────────
v0.3.0 ...
──────────────────────────────────────────────────────────────────────> time
────────────────────────────────────────────────────────────────────> time
```

* v0.4.0, v0.4.1 are the new versions (with new features) in
the master branch for julia nightly.
* v0.1.5, v0.1.6 until v0.1.a are the versions
* Versions until v0.1.5 are the versions
where new features (of the master branch) are backported
for 0.4 ≤ julia ≤ 0.6.
v0.1.a is the last "feature" version for julia 0.4.
* v0.1.(a+1), etc. are only bug fixes (for the julia 0.4 version).
* v0.2.0, v0.2.1 until v0.2.b are the versions
where new features (of the master branch) are backported
for 0.5 ≤ julia ≤ 0.6.
v0.2.b is the last "feature" version for julia 0.5.
* v0.2.(b+1), etc are only bug fixes (for the julia 0.5 version).
v0.1.5 is the last "feature" version for julia 0.4.
* v0.1.6, etc. are bug fixes (for the julia 0.4 version).
Unfortunately this versions cannot be found in the Julia Metadata.
* The v0.2.* versions were planned for new features (of the master branch)
that are backported for 0.5 ≤ julia ≤ 0.6.
But the end of the supoort for julia 0.5 came first. Hence:
v0.1.5 is the last "feature" version for julia 0.5.
* v0.2.0, etc are only bug fixes (for the julia 0.5 version).
Unfortunately this versions cannot be found in the Julia Metadata.
* v0.3.0, v0.3.1 are the versions
where new features (of the master branch) are backported
for julia 0.6.
Expand Down
4 changes: 3 additions & 1 deletion src/Banded.jl
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,10 @@ function setdiagonal!(bm::BandedMatrix,d::Integer,value)
length(ra) == length(value) || throw(ArgumentErrorODE(string(
"for d=$d expected length ",length(ra),"; but found ",length(value)),
:value))
bm.entries[dIndex,ra] = value
else
bm.entries[dIndex,ra] .= value
end
bm.entries[dIndex,ra] .= value
return value
end

Expand Down
5 changes: 3 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,8 @@ function test_colnew1(solver::Function)
OPT_RTOL => [1e-4, 1e-4], OPT_MAXSUBINTERVALS => 200)

sol = nothing
for ε = [1.0, 0.5, 0.2, 0.1]
for ε_new = [1.0, 0.5, 0.2, 0.1]
ε = ε_new
guess = (sol_oldnothing) ? sol_old : initial_guess
sol, retcode, stats = colnew([a,b], orders, ζ, rhs, Drhs, bc, Dbc,
guess ,opt);
Expand Down Expand Up @@ -1009,7 +1010,7 @@ function test_Banded()
@test full(bm) == [1 4 2 0; 5 2 3 1; 0 4 3 0; 0 0 3 4; 0 0 0 2]

bm = BandedMatrix(5,4, 1,2, NaN)
diagonals = Any[ [2, 1], [4, 3, 0], [1, 2, 3, 4], [5, 4, 3, 2] ]
diagonals = Any[ [2 1], [4 3 0], [1,2,3,4], [5 4 3 2] ]
@test setdiagonals!(bm,diagonals) == diagonals
@test full(bm) == [1 4 2 0; 5 2 3 1; 0 4 3 0; 0 0 3 4; 0 0 0 2]

Expand Down

0 comments on commit 384de23

Please sign in to comment.