Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sorting2 #408

Merged
merged 51 commits into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0031f74
Start the addition of the module stdlib_sorting
wclodius2 Apr 11, 2021
56fd86f
Removed trailing whitespace
wclodius2 Apr 11, 2021
9b28d8f
Added stdlib_sorting to the index
wclodius2 Apr 11, 2021
f294422
Incorproated suggestions by Jeremie Vandenplas
wclodius2 Apr 13, 2021
28afb18
Added sorting for character(*) and string_type
wclodius2 Apr 21, 2021
5727398
Commited main sorting files
wclodius2 Apr 23, 2021
bc3d652
Commited files related to testing the sorting procedures.
wclodius2 Apr 23, 2021
cb2f0d8
Commited the revised stdlib/doc/specs/stdlib_sorting.md
wclodius2 Apr 23, 2021
d84da28
Fixed an off by one error in an array assignment
wclodius2 Apr 24, 2021
b2a2149
Fixed improperly assumed short circuiting.
wclodius2 Apr 24, 2021
4280f3e
Fixed documentation problems noted by gareth_nx
wclodius2 Apr 30, 2021
62c6781
Commited final edit
wclodius2 Apr 30, 2021
0a73bbc
Fixed misspellings
wclodius2 Apr 30, 2021
a0a5d0c
Commit modified index.md
wclodius2 May 2, 2021
b45441b
Added changes suggested by gareth-nx.
wclodius2 May 2, 2021
7087255
Update src/stdlib_sorting.fypp
wclodius2 May 9, 2021
6f0f189
Update src/stdlib_sorting.fypp
wclodius2 May 9, 2021
7c8ed79
Update src/stdlib_sorting.fypp
wclodius2 May 9, 2021
8b9be81
Commited suggestions by jvdp1
wclodius2 May 9, 2021
e6a376f
Merge branch 'SortingStdlibPullRequest' into sorting2
wclodius2 May 12, 2021
abf10c6
Implemented changes suggested by Jeremie
wclodius2 May 20, 2021
e8d80de
simplifies code by adding fypp variables
jvdp1 May 20, 2021
5a9ccff
simplifies code by adding fypp variables
jvdp1 May 20, 2021
c3128ac
sorting_sort: add fypp variable for simplifying code
jvdp1 May 20, 2021
450247e
sort_index: add fypp variable to reduce code size
jvdp1 May 20, 2021
b7d79af
fix issue
jvdp1 May 20, 2021
30fda42
sort_index: add fypp variable for code simplifications
jvdp1 May 20, 2021
f26a47b
sort: add fypp variable for code simplifications + fix typo
jvdp1 May 20, 2021
3f8bea7
fix typo
jvdp1 May 20, 2021
4b16aca
ord_sort: add fypp variable to reduce code
jvdp1 May 20, 2021
e836175
Merge pull request #1 from jvdp1/sorting_fypp_proposition_2
wclodius2 May 21, 2021
84f1294
Update src/stdlib_sorting.fypp
wclodius2 May 23, 2021
8d91761
Update doc/specs/stdlib_sorting.md
wclodius2 May 23, 2021
6ccd366
Update src/stdlib_sorting_sort.fypp
wclodius2 May 23, 2021
8e59d2f
Changed intent of arguments from inout to out
wclodius2 May 24, 2021
6e77312
add reverse to sort
jvdp1 May 28, 2021
40e084e
sort_sign: add reverse in ord_sort
jvdp1 May 28, 2021
940b6fc
sort_sign: add checks (error stop) to all tests
jvdp1 May 28, 2021
df150f2
sort_sign: remove module subroutines when inappropriate
jvdp1 May 28, 2021
41b8b8e
sort_sign: add init ltest
jvdp1 May 28, 2021
5a6f463
Merge pull request #2 from jvdp1/sort_sign
wclodius2 May 29, 2021
6c4d3e2
update specs
jvdp1 May 29, 2021
18ad979
sort_sign: removed bold sentences
jvdp1 May 30, 2021
1c6e985
Merge pull request #3 from jvdp1/sort_sign
wclodius2 May 30, 2021
933837a
Corrected doc/specs/incex,md
wclodius2 May 31, 2021
de03c1d
update of the comments in source code
jvdp1 May 31, 2021
720a0cd
fixed typo
jvdp1 May 31, 2021
70e13f8
Merge pull request #4 from jvdp1/sort_sign
wclodius2 May 31, 2021
8fc4f67
add checks
jvdp1 Jun 1, 2021
25876b7
changes following wclodius2
jvdp1 Jun 1, 2021
1fc5cd9
Merge pull request #5 from jvdp1/add_checks1
wclodius2 Jun 2, 2021
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
1 change: 1 addition & 0 deletions doc/specs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ This is and index/directory of the specifications (specs) for each new module/fe
- [logger](./stdlib_logger.html) - Runtime logging system
- [optval](./stdlib_optval.html) - Fallback value for optional arguments
- [quadrature](./stdlib_quadrature.html) - Numerical integration
- [sorting](./stdlib_sorting.html) - Sorting of rank one arrays
- [stats](./stdlib_stats.html) - Descriptive Statistics
- [stats_distribution_PRNG](./stdlib_stats_distribution_PRNG.html) - Probability Distributions random number generator
- [string\_type](./stdlib_string_type.html) - Basic string support
Expand Down
619 changes: 619 additions & 0 deletions doc/specs/stdlib_sorting.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ set(fppFiles
stdlib_linalg.fypp
stdlib_linalg_diag.fypp
stdlib_optval.fypp
stdlib_sorting.fypp
stdlib_sorting_ord_sort.fypp
stdlib_sorting_sort.fypp
stdlib_sorting_sort_index.fypp
stdlib_stats.fypp
stdlib_stats_corr.fypp
stdlib_stats_cov.fypp
Expand Down
13 changes: 13 additions & 0 deletions src/Makefile.manual
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ SRCFYPP =\
stdlib_quadrature.fypp \
stdlib_quadrature_trapz.fypp \
stdlib_quadrature_simps.fypp \
stdlib_sorting.fypp \
stdlib_sorting_ord_sort.fypp \
stdlib_sorting_sort.fypp \
stdlib_sorting_sort_index.fypp \
stdlib_stats.fypp \
stdlib_stats_corr.fypp \
stdlib_stats_cov.fypp \
Expand Down Expand Up @@ -79,6 +83,15 @@ stdlib_quadrature_trapz.o: \
stdlib_quadrature.o \
stdlib_error.o \
stdlib_kinds.o
stdlib_sorting.o: \
stdlib_kinds.o \
stdlib_string_type.o
stdlib_sorting_ord_sort.o: \
stdlib_sorting.o
stdlib_sorting_sort.o: \
stdlib_sorting.o
stdlib_sorting_sort_index.o: \
stdlib_sorting.o
stdlib_stats.o: \
stdlib_kinds.o
stdlib_stats_corr.o: \
Expand Down
15 changes: 12 additions & 3 deletions src/common.fypp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#! Real kinds to be considered during templating
#:set REAL_KINDS = ["sp", "dp", "qp"]

#! Real types to be considere during templating
#! Real types to be considered during templating
#:set REAL_TYPES = ["real({})".format(k) for k in REAL_KINDS]

#! Collected (kind, type) tuples for real types
Expand All @@ -12,7 +12,7 @@
#! Complex kinds to be considered during templating
#:set CMPLX_KINDS = ["sp", "dp", "qp"]

#! Complex types to be considere during templating
#! Complex types to be considered during templating
#:set CMPLX_TYPES = ["complex({})".format(k) for k in CMPLX_KINDS]

#! Collected (kind, type) tuples for complex types
Expand All @@ -21,12 +21,21 @@
#! Integer kinds to be considered during templating
#:set INT_KINDS = ["int8", "int16", "int32", "int64"]

#! Integer types to be considere during templating
#! Integer types to be considered during templating
#:set INT_TYPES = ["integer({})".format(k) for k in INT_KINDS]

#! Collected (kind, type) tuples for integer types
#:set INT_KINDS_TYPES = list(zip(INT_KINDS, INT_TYPES))

#! Derived type string_type
#:set STRING_KINDS = ["string_type"]

#! String types to be considered during templating
#:set STRING_TYPES = ["type({})".format(k) for k in STRING_KINDS]

#! Collected (kind, type) tuples for string derived types
#:set STRING_KINDS_TYPES = list(zip(STRING_KINDS, STRING_TYPES))


#! Whether Fortran 90 compatible code should be generated
#:set VERSION90 = defined('VERSION90')
Expand Down
Loading