reexport SparsitOperators and depend on it

JuliaImageRecon · Sep 30, 2019 · e2cd4f7 · e2cd4f7
1 parent 599ddcd
commit e2cd4f7
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 377 deletions.
diff --git a/Project.toml b/Project.toml
@@ -11,7 +11,9 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LinearOperators = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125"
 ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+SparsityOperators = "a5ff1dd3-4e0a-50db-9022-6d011c1d5846"
 Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a"
 
 [compat]

diff --git a/src/LinearOperator.jl b/src/LinearOperator.jl
diff --git a/src/RegularizedLeastSquares.jl b/src/RegularizedLeastSquares.jl
@@ -10,6 +10,8 @@ using SparseArrays
 using ProgressMeter
 using IterativeSolvers
 using Random
+using Reexport
+@reexport using SparsityOperators
 
 export createLinearSolver, init, deinit, solve, linearSolverList,linearSolverListReal
 
@@ -31,7 +33,6 @@ include("proximalMaps/ProxTV.jl")
 include("proximalMaps/ProxNuclear.jl")
 
 include("Regularization.jl")
-include("LinearOperator.jl")
 include("Utils.jl")
 include("Kaczmarz.jl")
 include("DAXKaczmarz.jl")

diff --git a/src/linearOperators/DCTOp.jl b/src/linearOperators/DCTOp.jl
diff --git a/src/linearOperators/DSTOp.jl b/src/linearOperators/DSTOp.jl
diff --git a/src/linearOperators/FFTOp.jl b/src/linearOperators/FFTOp.jl
diff --git a/src/linearOperators/SamplingOp.jl b/src/linearOperators/SamplingOp.jl
diff --git a/src/linearOperators/WaveletOp.jl b/src/linearOperators/WaveletOp.jl
diff --git a/src/linearOperators/WeightingOp.jl b/src/linearOperators/WeightingOp.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,6 +2,5 @@ using RegularizedLeastSquares, LinearAlgebra, FFTW
 # Packages for tetsing only
 using Random, Test
 
-include("testOperators.jl")
 include("testProxMaps.jl")
 include("testSolvers.jl")