Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SpectralUnmixing"
uuid = "18035c97-8b76-4bd8-9b58-2d1c7240eddc"
authors = ["Phil Brodrick <phil.brodrick@gmail.com>"]
version = "0.3.0"
version = "0.3.1"

[deps]
ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
Expand Down
2 changes: 2 additions & 0 deletions docs/src/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ save_data
## Unmixing and Simulation Functions
```@docs
unmix_pixel
_unmix_pixel_kernel
simulate_pixel
unmix_line
unmix_and_write_line
Expand Down Expand Up @@ -61,6 +62,7 @@ compute_kkt_optimality

# Utility Functions
```@docs
ensure_2d
wl_index
nanargmax
nanargmin
Expand Down
13 changes: 7 additions & 6 deletions src/Datasets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ process.
- `good_data`: A boolean array indicating which pixels contain valid reflectance data.
"""
function load_line(reflectance_file::String, reflectance_uncertainty_file::String,
line::Int64, good_bands::Array{Bool}, refl_nodata::Float64)
line::Int64, good_bands::Array{Bool},
refl_nodata::Float64)::Tuple{Union{Nothing, Matrix{Float64}}, Union{Nothing, Matrix{Float64}}, BitVector}

reflectance_dataset = ArchGDAL.read(reflectance_file, alloweddrivers=["ENVI"])
img_dat = convert(
Expand All @@ -292,17 +293,17 @@ function load_line(reflectance_file::String, reflectance_uncertainty_file::Strin
img_dat = img_dat[good_data, :]

if sum(good_data) >= 1
if reflectance_uncertainty_file != ""
unc_dat = convert(
unc_dat::Union{Nothing, Matrix{Float64}} = if reflectance_uncertainty_file != ""
unc_temp = convert(
Array{Float64},
ArchGDAL.readraster(
reflectance_uncertainty_file, alloweddrivers=["ENVI"]
)[:, line, :]
)
unc_dat = unc_dat[:, good_bands]
unc_dat = unc_dat[good_data, :]
unc_temp = unc_temp[:, good_bands]
unc_temp[good_data, :]
else
unc_dat = nothing
nothing
end
else
return nothing, nothing, good_data
Expand Down
Loading
Loading