call of sort_adj in sort_index

Author: jvdp1

src/CMakeLists.txt

@@ -39,7 +39,6 @@ set(fppFiles
     stdlib_sorting_ord_sort.fypp
     stdlib_sorting_sort.fypp
     stdlib_sorting_sort_adj.fypp
-    stdlib_sorting_sort_index.fypp
     stdlib_specialfunctions_gamma.fypp
     stdlib_stats.fypp
     stdlib_stats_corr.fypp

src/stdlib_sorting.fypp

@@ -13,6 +13,9 @@
 #! This approach allows us to have the same code for all input types.
 #:set IRSCB_TYPES_ALT_NAME = INT_TYPES_ALT_NAME + REAL_TYPES_ALT_NAME + STRING_TYPES_ALT_NAME + CHAR_TYPES_ALT_NAME &
     & + BITSET_TYPES_ALT_NAME
+#:set IRC_INDEX_TYPES_ALT_NAME = INT_TYPES_ALT_NAME + REAL_TYPES_ALT_NAME
+
+
 
 !! Licensing:
 !!
@@ -520,23 +523,23 @@ module stdlib_sorting
 !! non-decreasing sort, but if the optional argument `REVERSE` is present
 !! with a value of `.TRUE.` the indices correspond to a non-increasing sort.
 
-#:for ki, ti, namei in INT_INDEX_TYPES_ALT_NAME
+#:for ki, ti, namei in IRC_INDEX_TYPES_ALT_NAME
     #:for t1, t2, name1 in IRSCB_TYPES_ALT_NAME
-        module subroutine ${name1}$_sort_adj_${namei}$( array, index, work, iwork, &
+        module subroutine ${name1}$_${namei}$_sort_adj( array, index, work, iwork, &
             reverse )
 !! Version: experimental
 !!
-!! `${name1}$_sort_adj_${namei}$( array, index[, work, iwork, reverse] )` sorts
+!! `${name1}$_${namei}$_sort_adj( array, index[, work, iwork, reverse] )` sorts
 !! an input `ARRAY` of type `${t1}$`
 !! using a hybrid sort based on the `"Rust" sort` algorithm found in `slice.rs`
 !! and returns the sorted `ARRAY` and an array `INDEX` of indices in the
 !! order that would sort the input `ARRAY` in the desired direction.
             ${t1}$, intent(inout)                     :: array(0:)
-            ${ti}$, intent(out)                      :: index(0:)
+            ${ti}$, intent(inout)                     :: index(0:)
             ${t2}$, intent(out), optional             :: work(0:)
-            ${ti}$, intent(out), optional            :: iwork(0:)
+            ${ti}$, intent(out), optional             :: iwork(0:)
             logical, intent(in), optional             :: reverse
-        end subroutine ${name1}$_sort_adj_${namei}$
+        end subroutine ${name1}$_${namei}$_sort_adj
 
     #:endfor
 #:endfor
@@ -559,7 +562,24 @@ module stdlib_sorting
 
 #:for ki, ti, namei in INT_INDEX_TYPES_ALT_NAME
     #:for t1, t2, name1 in IRSCB_TYPES_ALT_NAME
-        module subroutine ${name1}$_sort_index_${namei}$( array, index, work, iwork, &
+!> Version: experimental
+!>
+!> `${name1}$_sort_index_${namei}$( array, index[, work, iwork, reverse] )` sorts
+!> an input `ARRAY` of type `${t1}$`
+!> using a hybrid sort based on the `"Rust" sort` algorithm found in `slice.rs`
+!> and returns the sorted `ARRAY` and an array `INDEX` of indices in the
+!> order that would sort the input `ARRAY` in the desired direction.
+        module procedure ${name1}$_sort_index_${namei}$
+    #:endfor
+#:endfor
+
+    end interface sort_index
+
+contains
+
+#:for ki, ti, namei in INT_INDEX_TYPES_ALT_NAME
+    #:for t1, t2, name1 in IRSCB_TYPES_ALT_NAME
+        subroutine ${name1}$_sort_index_${namei}$( array, index, work, iwork, &
             reverse )
 !! Version: experimental
 !!
@@ -573,12 +593,32 @@ module stdlib_sorting
             ${t2}$, intent(out), optional             :: work(0:)
             ${ti}$, intent(out), optional            :: iwork(0:)
             logical, intent(in), optional             :: reverse
+
+
+        integer(int_index) :: array_size, i
+
+        array_size = size(array, kind=int_index)
+
+        if ( array_size > huge(index)) then
+            error stop "Too many entries for the kind of index."
+        end if
+
+        if ( array_size > size(index, kind=int_index) ) then
+            error stop "Too many entries for the size of index."
+        end if
+
+        do i = 0, array_size-1
+            index(i) = int(i+1, kind=${ki}$)
+        end do
+
+        call sort_adj(array, index, work, iwork, reverse)
+
+
+
         end subroutine ${name1}$_sort_index_${namei}$
 
     #:endfor
 #:endfor
 
-    end interface sort_index
-
 
 end module stdlib_sorting

src/stdlib_sorting_sort_adj.fypp

@@ -5,13 +5,12 @@
 #:set CHAR_TYPES_ALT_NAME = list(zip(["character(len=*)"],  ["character(len=:)"], ["character(len=len(array))"], ["char"]))
 #:set BITSET_TYPES_ALT_NAME = list(zip(BITSET_TYPES, BITSET_TYPES, BITSET_TYPES, BITSET_KINDS))
 
-#:set INT_INDEX_TYPES_ALT_NAME = list(zip(["int_index", "int_index_low"], ["integer(int_index)", "integer(int_index_low)"], ["default", "low"]))
-
 #! For better code reuse in fypp, make lists that contain the input types,
 #! with each having output types and a separate name prefix for subroutines
 #! This approach allows us to have the same code for all input types.
 #:set IRSCB_TYPES_ALT_NAME = INT_TYPES_ALT_NAME + REAL_TYPES_ALT_NAME + STRING_TYPES_ALT_NAME + CHAR_TYPES_ALT_NAME &
     & + BITSET_TYPES_ALT_NAME
+#:set IRC_INDEX_TYPES_ALT_NAME = INT_TYPES_ALT_NAME + REAL_TYPES_ALT_NAME
 
 !! Licensing:
 !!
@@ -68,10 +67,10 @@ submodule(stdlib_sorting) stdlib_sorting_sort_adj
 
 contains
 
-#:for ki, ti, namei in INT_INDEX_TYPES_ALT_NAME
+#:for ki, ti, tii, namei in IRC_INDEX_TYPES_ALT_NAME
   #:for t1, t2, t3, name1 in IRSCB_TYPES_ALT_NAME
 
-    module subroutine ${name1}$_sort_adj_${namei}$( array, index, work, iwork, reverse )
+    module subroutine ${name1}$_${namei}$_sort_adj( array, index, work, iwork, reverse )
 ! A modification of `${name1}$_ord_sort` to return an array of indices that
 ! would perform a stable sort of the `ARRAY` as input, and also sort `ARRAY`
 ! as desired. The indices by default
@@ -98,7 +97,7 @@ contains
 ! used as scratch memory.
 
         ${t1}$, intent(inout)         :: array(0:)
-        ${ti}$, intent(out)           :: index(0:)
+        ${ti}$, intent(inout)         :: index(0:)
         ${t3}$, intent(out), optional :: work(0:)
         ${ti}$, intent(out), optional :: iwork(0:)
         logical, intent(in), optional :: reverse
@@ -117,10 +116,6 @@ contains
             error stop "Too many entries for the size of index."
         end if
 
-        do i = 0, array_size-1
-            index(i) = int(i+1, kind=${ki}$)
-        end do
-
         if ( optval(reverse, .false.) ) then
             call reverse_segment( array, index )
         end if
@@ -494,7 +489,7 @@ contains
 
         end subroutine reverse_segment
 
-    end subroutine ${name1}$_sort_adj_${namei}$
+    end subroutine ${name1}$_${namei}$_sort_adj
 
   #:endfor
 #:endfor