Merge pull request #29 from frankwswang/dev

Dev
frankwswang · Oct 26, 2021 · 63d6415 · 63d6415 · frankwswang · Oct 26, 2021
2 parents 620a8f6 + d41ef68
commit 63d6415
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/Basis.jl b/src/Basis.jl
@@ -471,6 +471,7 @@ function ijkIndex(b::FloatingGTBasisFuncs)
 end
 
 """
+
     centerOf(bf::FloatingGTBasisFuncs) -> Array{<:Real, 1}
 
 Return the center coordinate of the input `FloatingGTBasisFuncs`.

diff --git a/src/Tools.jl b/src/Tools.jl
@@ -436,17 +436,6 @@ function flatten(c::Array)
     [(c2...)...]
 end
 
-function flatten2(c::Array)
-    c2 = map( x->(x isa Tuple ? Any[i for i in x] : x), c )
-    vcat(c2...)
-end
-
-function flatten3(c::Array)
-    head = c[1] isa Union{Array, Tuple}
-    c2 = map( x->(x isa Tuple ? Any[i for i in x] : x), c )
-    vcat(c2...)
-end
-
 function flatten(c::Tuple)
     c2 = map( x->(x isa Union{Array, Tuple} ? x : [x]), c )
     ((c2...)...,)

diff --git a/test/unit-tests/Overload-test.jl b/test/unit-tests/Overload-test.jl
@@ -222,6 +222,7 @@ using Suppressor: @capture_out
     @test axes(pb1) == ()
 
     @test getindex(gf1) == gf1[] == gf1[begin] == gf1[end] == (gf1.param |> collect)
+    @test getindex(bf1) == bf1[] == bf1[begin] == bf1[end] == (bf1.gauss |> collect)
     bfm11 = Quiqbox.BasisFuncMix([bf1, bf2, bf1])
     @test getindex(bfm11) == bfm11[] == bfm11[begin] == bfm11[end] == 
           [bf1.gauss[1], bf2.gauss...]

diff --git a/test/unit-tests/Tools-test.jl b/test/unit-tests/Tools-test.jl
@@ -1,6 +1,6 @@
 using Test
 using Quiqbox: tryIncluding, @compareLength, hasBoolRelation, markUnique, flatten, 
-               alignSignedNum, symbolReplace, splitTerm, groupedSort, mapPermute
+               alignSignedNum, symbolReplace, splitTerm, groupedSort, mapPermute, Pf, itself
 using Quiqbox
 using Symbolics
 using Suppressor: @capture_out
@@ -95,4 +95,16 @@ using Suppressor: @capture_out
     @test bl1
     @test bl2
     @test bl3
+
+    # struct Pf
+    @test Pf(-1.5, abs)(-2) == -3.0
+    @test Pf(-1.0, Pf(-1.5, abs))(-2) == 3.0
+    @test Pf(1.5, Val(:abs))(-2) == 3.0
+    @test Pf(-1.0, Val(Pf{-1.5, :abs}))(-2) == 3.0
+    @test typeof(Pf(-1.5, abs))(-2) == -3.0
+
+    @test Pf(-1.0, Pf(-1.5, itself))(-2) == -3.0
+    @test Pf(1.5, Val(:itself))(-2) == -3.0
+    @test Pf(-1.0, Val(Pf{-1.5, :itself}))(-2) == -3.0
+    @test typeof(Pf(-1.5, itself))(-2) == 3.0
 end