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

Feature/battery-attributes #87

Merged
merged 33 commits into from
May 13, 2024
Merged

Feature/battery-attributes #87

merged 33 commits into from
May 13, 2024

Conversation

fletchapin
Copy link
Contributor

@fletchapin fletchapin commented May 7, 2024

Pull request recommendations:

  • Name your pull request your-development-type/short-description. Ex: feature/gui
  • Link to any relevant issue in the PR description. Ex: Resolves [ENH: Create GUI for easy user input #12]
  • Provide context of changes.
  • Provide relevant tests for your feature or bug fix.
  • Provide or update documentation for any feature added by your pull request.

Thanks for contributing! This pull request addresses the following issues: Closes #77, closes #78, closes #82, closes #83

To do so, the following changes were made:

  • Speed and Frequency added to TagType
  • IndustrialWastewater, MunicipalWastewater, Coagulant, Disinfectant, Deodorant, and Chemical added to ContentsType
  • charge_rate, leakage, and rte attributes added to battery
  • Renamed horsepower => power_rating and capacity => energy_capacity with DeprecationWarning
  • get_capacities and get_efficiencies functions provide users with convenient access to attributes in dictionary form
  • Tests have been updated accordingly

Copy link

codecov bot commented May 7, 2024

Codecov Report

Attention: Patch coverage is 91.21864% with 49 lines in your changes are missing coverage. Please review.

Project coverage is 88.70%. Comparing base (1f6b430) to head (8c492eb).
Report is 2 commits behind head on main.

Files Patch % Lines
pype_schema/node.py 91.37% 22 Missing ⚠️
pype_schema/connection.py 81.65% 20 Missing ⚠️
pype_schema/parse_json.py 94.23% 6 Missing ⚠️
pype_schema/utils.py 88.88% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #87      +/-   ##
==========================================
+ Coverage   88.20%   88.70%   +0.49%     
==========================================
  Files          18       18              
  Lines        1916     2399     +483     
==========================================
+ Hits         1690     2128     +438     
- Misses        226      271      +45     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@fletchapin
Copy link
Contributor Author

@jbolorinos or @dalyw I plan to merge soon, so if you have a chance to look at this PR that would be great to get another set of eyes on the code and confirm I've made all the changes you'd like!

@fletchapin fletchapin requested review from jbolorinos and dalyw May 7, 2024 21:45
Copy link

@dalyw dalyw left a comment

Choose a reason for hiding this comment

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

Question: I see that you added design_flow, min_flow and max_flow rather than just a single flow rate. I think oftentimes in facilities, the design flow is the max rated flow. Do you have specific use cases for including a design_flow, and not just min_flow and max_flow? If it's optional to define it's fine either way.
Updates to power/speed and chemical types look good - thanks!

@fletchapin fletchapin merged commit 04a9dd0 into main May 13, 2024
4 checks passed
LilyLiu0719 pushed a commit that referenced this pull request Jun 9, 2024
* Added charge rate and RTE attributes to battery

* Added ContentsType for chemical dosing

* Tweak to Speed units

* Added hertz to unit processing

* Removed units from capacity, charge, and discharge rate

* Implemented FutureWarning for old syntax

* Added backwards compatability with getters/setters

* test_get_capacities completed

* Created get_efficiencies function

* Autoreformatted with black

* Trying to fix getter and setter for backwards compatability

* Fixed test_get_efficiencies

* Still trying to figure out back compat

* Forgot to import warnings, duh

* Removed flake8 warnings

* trying to break circular dependency

* Typos in energy_capacity

* Trying to avoid infinite recursion

* Finally fixed the getter/setters

* Fixed backwards compat with charge_rate

* Typo in del_charge_rate

* Added RTE getter/setter

* Forgot getter/setter for leakage

* Adding verbose flag

* Missed variable assignment in parse_json

* WIP updating flow rate logic

* Reworked flow rate and pressure representation

* fixed test_get_capacities

* Typo in CAPACITY_ATTRS

* Fixed to_json bug with capacities

* Fixed line too long linter error

* Extending tests to DeprecationWarnings

* Fixed unused import linter error
@fletchapin fletchapin deleted the feature/batt-attr branch January 23, 2025 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants