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.

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

Jump to bottom

File comparison fixes #47

Merged
merged 2 commits into from
Dec 19, 2018
Merged

File comparison fixes #47

merged 2 commits into from
Dec 19, 2018

Conversation

jsiirola
Copy link
Contributor

Summary/Motivation:

Overhaul of pyutilib file comparison operators. This simplifies the code and fixes issues with numeric comparisons.

Changes proposed in this PR:

  • simplifying the file comparison code
  • adding both absolute and relative tolerances for numeric comparison
  • fixing bug where consecutive numbers without spaces were not correctly
    parsed (i.e., "-12.34-56.78-9.10")

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@jsiirola
Overhaul of pyutilib file comparison
fa80c93 
Changes:
- simplifying the file comparison code
- adding both absolute and relative tolerances for numeric comparison
- fixing bug where consecutive numbers without spaces were not correctly
  parsed (i.e., "-12.34-56.78-9.10")
@jsiirola
Merge branch 'master' into file-comp-fixes
325ad8d
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 63.972% when pulling 325ad8d on file-comp-fixes into 2e25e1d on master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 63.972% when pulling 325ad8d on file-comp-fixes into 2e25e1d on master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 63.972% when pulling 325ad8d on file-comp-fixes into 2e25e1d on master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 63.972% when pulling 325ad8d on file-comp-fixes into 2e25e1d on master.

jsiirola added a commit to jsiirola/pyomo that referenced this pull request Dec 19, 2018
@jsiirola
Removing some of the relaxed numeric tolerances
0ebf03d 
This is enabled by a fix to PyUtilib's numeric comparisons to support
both absolute and relative tolerances (PyUtilib/pyutilib#47).
@jsiirola jsiirola mentioned this pull request Dec 19, 2018
Merged
blnicho
blnicho approved these changes Dec 19, 2018
View reviewed changes
Copy link
Contributor

@blnicho blnicho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine.

@jsiirola jsiirola merged commit cbc58d6 into master Dec 19, 2018
@jsiirola jsiirola deleted the file-comp-fixes branch April 23, 2019 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blnicho blnicho blnicho approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jsiirola @coveralls @blnicho