-
Notifications
You must be signed in to change notification settings - Fork 20
refactor: separate isfloat into a new file within validators.py and rename to is_number
#301
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
77c5957
docs: generate docs with auto api
bobleesj c65eace
refactor: rename isfloat to is_number, in a separate validators.py fo…
bobleesj 23c32d6
chore: add news file
bobleesj 7d6dbc1
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] 84dcb4e
docs: improve description on how int is also a float
bobleesj f8b1c41
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,3 +18,4 @@ diffpy.utils.wx.gridutils module | |
| :members: | ||
| :undoc-members: | ||
| :show-inheritance: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| **Added:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Changed:** | ||
|
|
||
| * Rename the `isfloat` function to `is_number`, and move it to the `diffpy/utils/utilsvalidators.py` directory | ||
|
|
||
| **Deprecated:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Removed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Fixed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Security:** | ||
|
|
||
| * <news item> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,8 @@ | |
|
|
||
| import numpy | ||
|
|
||
| from diffpy.utils import validators | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. import |
||
|
|
||
|
|
||
| def loadData(filename, minrows=10, headers=False, hdel="=", hignore=None, **kwargs): | ||
| """Find and load data from a text file. | ||
|
|
@@ -139,7 +141,7 @@ def countcolumnsvalues(line): | |
| name = hpair[0] | ||
| value = hpair[1] | ||
| # check if data value should be stored as float | ||
| if isfloat(hpair[1]): | ||
| if validators.is_number(hpair[1]): | ||
| value = float(hpair[1]) | ||
| hdata.update({name: value}) | ||
| # continue search for the start of datablock | ||
|
|
@@ -331,16 +333,3 @@ def _findDataBlocks(self): | |
| self.headers.append(header) | ||
| self.datasets.append(data) | ||
| return | ||
|
|
||
|
|
||
| # End of class TextDataLoader | ||
|
|
||
|
|
||
| def isfloat(s): | ||
| """True if s is convertible to float.""" | ||
| try: | ||
| float(s) | ||
| return True | ||
| except ValueError: | ||
| pass | ||
| return False | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| def is_number(string): | ||
| """ | ||
| Check if the provided string can be converted to a float. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| string : str | ||
| The string to evaluate for numeric conversion. | ||
|
|
||
| Returns | ||
| ------- | ||
| bool | ||
| The boolean whether `string` can be successfully converted to float. | ||
|
|
||
| Examples | ||
| -------- | ||
| >>> is_number("3.14") | ||
| True | ||
|
|
||
| >>> is_number("-1.23") | ||
| True | ||
|
|
||
| >>> is_number("007") | ||
| True | ||
|
|
||
| >>> is_number("five") | ||
| False | ||
|
|
||
| >>> is_number("3.14.15") | ||
| False | ||
|
|
||
| >>> is_number("NaN") | ||
| True | ||
|
|
||
| >>> is_number("Infinity") | ||
| True | ||
|
|
||
| >>> is_number("Inf") | ||
| True | ||
| """ | ||
| try: | ||
| float(string) | ||
| return True | ||
| except ValueError: | ||
| return False |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| from diffpy.utils.validators import is_number | ||
| import pytest | ||
|
|
||
| @pytest.mark.parametrize("input,expected", [ | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Lots of tests |
||
| ("3.14", True), # Standard float | ||
| ("2", True), # Integer | ||
| ("-100", True), # Negative integer | ||
| ("-3.14", True), # Negative float | ||
| ("0", True), # Zero | ||
| ("4.5e-1", True), # Scientific notation | ||
| ("abc", False), # Non-numeric string | ||
| ("", False), # Empty string | ||
| ("3.14.15", False), # Multiple dots | ||
| ("2+3", False), # Arithmetic expression | ||
| ("NaN", True), # Not a Number (special float value) | ||
| ("Infinity", True), # Positive infinity | ||
| ("-Infinity", True), # Negative infinity | ||
| ("Inf", True), # Positive infinity | ||
| ("-Inf", True), # Negative infinity | ||
| ]) | ||
| def test_is_number(input, expected): | ||
| assert is_number(input) == expected | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reran auto_api just to ensure the new api is loading since we've created a new file
src/diffpy/utils/validators.py