Skip to content

Commit a9fb4d1

Browse files
committed
replace RGB{} with RGBX{} in plots
1 parent 0d28c70 commit a9fb4d1

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
- LMS returns betas rather than coefs
77
- PrecompileTools integration for faster loading of package
8+
- Replace RGB{} to RGBX{} in plots
89

910
# v0.9.5
1011

src/LinRegOutliers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using Requires
77
function __init__()
88
@require Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" begin
99

10-
import .Plots: RGB
10+
import .Plots: RGBX
1111

1212
include("mveltsplot.jl")
1313
include("dataimage.jl")
@@ -17,7 +17,7 @@ function __init__()
1717
import .DataImage: dataimage
1818
import .BCHPlot: bchplot
1919

20-
export mveltsplot, dataimage, bchplot, RGB
20+
export mveltsplot, dataimage, bchplot, RGBX
2121

2222
end
2323
end

src/dataimage.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export dataimage
55
import ..Diagnostics:
66
mahalanobisSquaredMatrix, euclideanDistances, mahalanobisSquaredBetweenPairs
77

8-
import ..RGB
8+
import ..RGBX
99

1010
"""
1111
@@ -46,7 +46,7 @@ Computational Statistics & Data Analysis 43.4 (2003): 541-552.
4646
function dataimage(
4747
dataMatrix::Array{Float64,2};
4848
distance = :mahalanobis,
49-
)::Matrix{RGB{Float64}}
49+
)::Matrix{RGBX{Float64}}
5050
d = nothing
5151
if distance == :mahalanobis
5252
d = mahalanobisSquaredBetweenPairs(dataMatrix)
@@ -59,10 +59,10 @@ function dataimage(
5959
end
6060
colours = 1.0 .- d / maximum(d)
6161
n, _ = size(d)
62-
colormatrix = Array{RGB{Float64},2}(undef, n, n)
62+
colormatrix = Array{RGBX{Float64},2}(undef, n, n)
6363
for i = 1:n
6464
for j = 1:n
65-
colormatrix[i, j] = RGB(colours[i, j])
65+
colormatrix[i, j] = RGBX(colours[i, j])
6666
end
6767
end
6868
return colormatrix

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Random
44
using LinearAlgebra
55

66
using LinRegOutliers
7-
import Plots: RGB
7+
import Plots: RGBX
88

99
include("testdiagnostics.jl")
1010
include("testbasis.jl")

test/testdataimage.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
di = dataimage(datamat, distance = :euclidean)
1010

1111

12-
result = RGB{Float64}[
13-
RGB{Float64}(1.0, 1.0, 1.0) RGB{Float64}(0.5, 0.5, 0.5) RGB{Float64}(0.0, 0.0, 0.0) RGB{Float64}(0.3914193805498154, 0.3914193805498154, 0.3914193805498154)
14-
RGB{Float64}(0.5, 0.5, 0.5) RGB{Float64}(1.0, 1.0, 1.0) RGB{Float64}(0.5, 0.5, 0.5) RGB{Float64}(0.36901018379996964, 0.36901018379996964, 0.36901018379996964)
15-
RGB{Float64}(0.0, 0.0, 0.0) RGB{Float64}(0.5, 0.5, 0.5) RGB{Float64}(1.0, 1.0, 1.0) RGB{Float64}(0.037749551350623745, 0.037749551350623745, 0.037749551350623745)
16-
RGB{Float64}(0.3914193805498154, 0.3914193805498154, 0.3914193805498154) RGB{Float64}(0.36901018379996964, 0.36901018379996964, 0.36901018379996964) RGB{Float64}(0.037749551350623745, 0.037749551350623745, 0.037749551350623745) RGB{Float64}(1.0, 1.0, 1.0)
12+
result = RGBX{Float64}[
13+
RGBX{Float64}(1.0, 1.0, 1.0) RGBX{Float64}(0.5, 0.5, 0.5) RGBX{Float64}(0.0, 0.0, 0.0) RGBX{Float64}(0.3914193805498154, 0.3914193805498154, 0.3914193805498154)
14+
RGBX{Float64}(0.5, 0.5, 0.5) RGBX{Float64}(1.0, 1.0, 1.0) RGBX{Float64}(0.5, 0.5, 0.5) RGBX{Float64}(0.36901018379996964, 0.36901018379996964, 0.36901018379996964)
15+
RGBX{Float64}(0.0, 0.0, 0.0) RGBX{Float64}(0.5, 0.5, 0.5) RGBX{Float64}(1.0, 1.0, 1.0) RGBX{Float64}(0.037749551350623745, 0.037749551350623745, 0.037749551350623745)
16+
RGBX{Float64}(0.3914193805498154, 0.3914193805498154, 0.3914193805498154) RGBX{Float64}(0.36901018379996964, 0.36901018379996964, 0.36901018379996964) RGBX{Float64}(0.037749551350623745, 0.037749551350623745, 0.037749551350623745) RGBX{Float64}(1.0, 1.0, 1.0)
1717
]
1818

1919
@test di isa Matrix

0 commit comments

Comments
 (0)