Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
07c0e10
added BITSET_KINDS and BITSET_TYPES
degawa Jun 25, 2023
04104b1
added `use` statement for stdlib_bitsets
degawa Jun 25, 2023
b482534
added BITSET_TYPES_ALT_NAME
degawa Jun 25, 2023
799ce0d
appended ALT_NAME of bitsets to IRSC ALT_NAME
degawa Jun 25, 2023
bd92e37
added whitespace after comma
degawa Jun 25, 2023
4d3057a
added tests for bitset_large and bitset_64
degawa Jun 25, 2023
a99f19d
aligned the frame of the table of results
degawa Jun 25, 2023
6154e2b
fixed incorrect right-hand side value
degawa Jun 25, 2023
423a8b4
added an example for sorting array of bitset_large
degawa Jun 25, 2023
0ee5fb1
updated api-docs
degawa Jun 25, 2023
a9254e1
fixed enclosure symbol mismatches
degawa Jun 25, 2023
e1b520c
added a newline to enable the unordered list
degawa Jun 25, 2023
185c695
replaced tab with spaces
degawa Jun 25, 2023
1b0d50a
aligned indent width
degawa Jun 25, 2023
47e9c19
fixed missing stdlib_kinds module
degawa Jun 25, 2023
e27e9af
reduced the size of bitset arrays
degawa Jun 25, 2023
e7e6e41
changed `intent` from `out` to `inout`
degawa Jun 26, 2023
5f1195f
changed component assignment operation
degawa Jun 26, 2023
4100e61
specified the entity to be used in the example
degawa Jul 2, 2023
bdd6dcc
specified the entity to be used in the example
degawa Jul 2, 2023
61029ee
deleted tailing "l"
degawa Jul 2, 2023
7d6d979
removed `block` structures
degawa Jul 2, 2023
de2dbbb
add explicity in test_stdlib_bitset_large
jvdp1 Jul 8, 2023
96763e1
add test following issue #726
jvdp1 Jul 8, 2023
1905c80
Merge branch 'pullreq_727' into support-sorting-bitsets
degawa Jul 15, 2023
efbc0cc
removed `assign_large`
degawa Jul 15, 2023
916d83d
Merge branch 'master' into support-sorting-bitsets
jvdp1 Aug 8, 2023
e661cd2
Removed additional empty lines introduced by resolving conflicts
jvdp1 Aug 8, 2023
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
Prev Previous commit
Next Next commit
aligned the frame of the table of results
  • Loading branch information
degawa committed Jun 25, 2023
commit a99f19d51f932a504679a13b76cd45cdae45aefc
26 changes: 13 additions & 13 deletions test/sorting/test_sorting.f90
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ subroutine initialize_tests()
form='formatted', status='replace' )
write( lun, '(a)' ) trim(compiler_version())
write( lun, * )
write( lun, '("| Type | Elements | Array Name | Method ' // &
write( lun, '("| Type | Elements | Array Name | Method ' // &
' | Time (s) |")' )
write( lun, '("|-------------|----------|-----------------|-----------' // &
write( lun, '("|--------------|----------|-----------------|-----------' // &
'--|-----------|")' )

end subroutine initialize_tests
Expand Down Expand Up @@ -330,7 +330,7 @@ subroutine test_int_ord_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a12, 2i7)') 'dummy(i-1:i) = ', dummy(i-1:i)
end if
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
test_size, a_name, "Ord_Sort", tdiff/rate

Expand Down Expand Up @@ -405,7 +405,7 @@ subroutine test_char_ord_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a, 2(1x,a4))') 'char_dummy(i-1:i) = ', char_dummy(i-1:i)
end if
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
char_size, a_name, "Ord_Sort", tdiff/rate

Expand Down Expand Up @@ -484,7 +484,7 @@ subroutine test_string_ord_sort( a, a_name, ltest )
write(*,'(a, 2(1x,a))') 'string_dummy(i-1:i) = ', &
string_dummy(i-1:i)
end if
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
string_size, a_name, "Ord_Sort", tdiff/rate

Expand Down Expand Up @@ -770,7 +770,7 @@ subroutine test_int_radix_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a12, 2i7)') 'dummy(i-1:i) = ', dummy(i-1:i)
end if
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
test_size, a_name, "Radix_Sort", tdiff/rate

Expand Down Expand Up @@ -816,7 +816,7 @@ subroutine test_real_radix_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a12, 2f12.5)') 'real_dummy(i-1:i) = ', real_dummy(i-1:i)
end if
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Real |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
test_size, a_name, "Radix_Sort", tdiff/rate

Expand Down Expand Up @@ -923,7 +923,7 @@ subroutine test_int_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a12, 2i7)') 'dummy(i-1:i) = ', dummy(i-1:i)
end if
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
test_size, a_name, "Sort", tdiff/rate

Expand Down Expand Up @@ -987,7 +987,7 @@ subroutine test_char_sort( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a17, 2(1x,a4))') 'char_dummy(i-1:i) = ', char_dummy(i-1:i)
end if
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
char_size, a_name, "Sort", tdiff/rate

Expand Down Expand Up @@ -1052,7 +1052,7 @@ subroutine test_string_sort( a, a_name, ltest )
write(*,'(a17, 2(1x,a4))') 'string_dummy(i-1:i) = ', &
string_dummy(i-1:i)
end if
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
string_size, a_name, "Sort", tdiff/rate

Expand Down Expand Up @@ -1293,7 +1293,7 @@ subroutine test_int_sort_index( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a18, 2i7)') 'a(index(i-1:i)) = ', a(index(i-1:i))
end if
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Integer |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
test_size, a_name, "Sort_Index", tdiff/rate

Expand Down Expand Up @@ -1362,7 +1362,7 @@ subroutine test_char_sort_index( a, a_name, ltest )
write(*,*) 'i = ', i
write(*,'(a17, 2(1x,a4))') 'char_dummy(i-1:i) = ', char_dummy(i-1:i)
end if
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| Character |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
char_size, a_name, "Sort_Index", tdiff/rate

Expand Down Expand Up @@ -1416,7 +1416,7 @@ subroutine test_string_sort_index( a, a_name, ltest )
write(*,'(a17, 2(1x,a4))') 'string_dummy(i-1:i) = ', &
string_dummy(i-1:i)
end if
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
write( lun, '("| String_type |", 1x, i7, 2x, "|", 1x, a15, " |", ' // &
'a12, " |", F10.6, " |" )' ) &
string_size, a_name, "Sort_Index", tdiff/rate

Expand Down