Skip to content

Feature: loadtxt skiprows and max_rows #652

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Jun 16, 2022
Merged

Feature: loadtxt skiprows and max_rows #652

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d980c64
stdlib_io: add skiprows to loadtxt
MuellerSeb Apr 19, 2022
de74cd8
Add test for skiprows in loadtxt
MuellerSeb Apr 19, 2022
ea80574
stdlib_io: add check for skiprows >= 0
MuellerSeb Apr 19, 2022
bcc3f36
stdlib_io: add max_rows to loadtxt
MuellerSeb Apr 19, 2022
3c66fcc
Update src/stdlib_io.fypp
MuellerSeb Apr 19, 2022
938ba8c
loadtxt: Add test for max_rows
MuellerSeb Apr 19, 2022
5af87c6
loadtxt: treat negative skiprows as 0 (numpy like)
MuellerSeb Apr 20, 2022
ad2faa9
stdlib_io: cut off skiprows
MuellerSeb May 5, 2022
6c01940
stdlib_io: docs for cut off skiprows
MuellerSeb May 5, 2022
93689c9
rename test in src/tests/io/test_loadtxt.f90
MuellerSeb May 5, 2022
ec049ea
update specs docs of loadtxt
MuellerSeb May 8, 2022
c046e7e
Update doc/specs/stdlib_io.md
MuellerSeb Jun 13, 2022
764322a
Update src/stdlib_io.fypp
MuellerSeb Jun 13, 2022
0f356db
loadtxt: determine number of columns from first line to be read
MuellerSeb Jun 13, 2022
b428213
number_of_columns: bugfix for missing int
MuellerSeb Jun 13, 2022
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
loadtxt: treat negative skiprows as 0 (numpy like)
  • Loading branch information
@MuellerSeb
MuellerSeb authored Apr 20, 2022
commit 5af87c6f19d707a510dbcb7d98f66432b0acc91f
4 changes: 1 addition & 3 deletions src/stdlib_io.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ contains
integer :: s
integer :: nrow, ncol, i, skiprows_, max_rows_

skiprows_ = optval(skiprows, 0)
if ( skiprows_ < 0 ) call error_stop("loadtxt: skiprows must be non-negative.")

skiprows_ = max(optval(skiprows, 0), 0)
max_rows_ = optval(max_rows, -1)

s = open(filename)
Expand Down