Add metadata description #232
Open
Conversation
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
…er/HPWHsim into add-metadata-description # Conflicts: # src/HPWH.hh # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json
…er/HPWHsim into add-metadata-description # Conflicts: # src/Condenser.cc # src/Condenser.hh # src/HPWH.cc # src/HPWH.hh # src/HPWHpresets.cc # src/Resistance.cc # src/Resistance.hh # src/Tank.cc # src/Tank.hh # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #232 +/- ##
==========================================
+ Coverage 69.74% 74.55% +4.81%
==========================================
Files 6 18 +12
Lines 5397 7442 +2045
==========================================
+ Hits 3764 5548 +1784
- Misses 1633 1894 +261
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
…er/HPWHsim into add-metadata-description # Conflicts: # test/models_json/AOSmithCAHP120.json # test/models_json/AOSmithHPTS40.json # test/models_json/AOSmithHPTS50.json # test/models_json/AOSmithHPTS66.json # test/models_json/AOSmithHPTS80.json # test/models_json/AOSmithHPTU50.json # test/models_json/AOSmithHPTU66.json # test/models_json/AOSmithHPTU80.json # test/models_json/AOSmithHPTU80_DR.json # test/models_json/AOSmithPHPT60.json # test/models_json/AOSmithPHPT80.json # test/models_json/AWHSTier3Generic40.json # test/models_json/AWHSTier3Generic50.json # test/models_json/AWHSTier3Generic65.json # test/models_json/AWHSTier3Generic80.json # test/models_json/AWHSTier4Generic40.json # test/models_json/AWHSTier4Generic50.json # test/models_json/AWHSTier4Generic65.json # test/models_json/AWHSTier4Generic80.json # test/models_json/AquaThermAire.json # test/models_json/BWC2020_65.json # test/models_json/BradfordWhiteAeroThermRE2H50.json # test/models_json/BradfordWhiteAeroThermRE2H65.json # test/models_json/BradfordWhiteAeroThermRE2H80.json # test/models_json/ColmacCxA_10_MP.json # test/models_json/ColmacCxA_10_SP.json # test/models_json/ColmacCxA_15_MP.json # test/models_json/ColmacCxA_15_SP.json # test/models_json/ColmacCxA_20_MP.json # test/models_json/ColmacCxA_20_SP.json # test/models_json/ColmacCxA_25_MP.json # test/models_json/ColmacCxA_25_SP.json # test/models_json/ColmacCxA_30_MP.json # test/models_json/ColmacCxA_30_SP.json # test/models_json/ColmacCxV_5_MP.json # test/models_json/ColmacCxV_5_SP.json # test/models_json/GE.json # test/models_json/GE2014STDMode.json # test/models_json/GE2014STDMode_80.json # test/models_json/GE502014.json # test/models_json/GE802014.json # test/models_json/Generic1.json # test/models_json/Generic2.json # test/models_json/Generic3.json # test/models_json/GenericUEF217.json # test/models_json/LG_APHWC50.json # test/models_json/LG_APHWC80.json # test/models_json/NyleC125A_C_MP.json # test/models_json/NyleC125A_C_SP.json # test/models_json/NyleC125A_MP.json # test/models_json/NyleC125A_SP.json # test/models_json/NyleC185A_C_MP.json # test/models_json/NyleC185A_C_SP.json # test/models_json/NyleC185A_MP.json # test/models_json/NyleC185A_SP.json # test/models_json/NyleC250A_C_MP.json # test/models_json/NyleC250A_C_SP.json # test/models_json/NyleC250A_MP.json # test/models_json/NyleC250A_SP.json # test/models_json/NyleC25A_SP.json # test/models_json/NyleC60A_C_MP.json # test/models_json/NyleC60A_C_SP.json # test/models_json/NyleC60A_MP.json # test/models_json/NyleC60A_SP.json # test/models_json/NyleC90A_C_MP.json # test/models_json/NyleC90A_C_SP.json # test/models_json/NyleC90A_MP.json # test/models_json/NyleC90A_SP.json # test/models_json/QAHV_N136TAU_HPB_SP.json # test/models_json/Rheem2020Build40.json # test/models_json/Rheem2020Build50.json # test/models_json/Rheem2020Build65.json # test/models_json/Rheem2020Build80.json # test/models_json/Rheem2020Prem40.json # test/models_json/Rheem2020Prem50.json # test/models_json/Rheem2020Prem65.json # test/models_json/Rheem2020Prem80.json # test/models_json/RheemHB50.json # test/models_json/RheemHBDR2250.json # test/models_json/RheemHBDR2265.json # test/models_json/RheemHBDR2280.json # test/models_json/RheemHBDR4550.json # test/models_json/RheemHBDR4565.json # test/models_json/RheemHBDR4580.json # test/models_json/RheemHPHD135.json # test/models_json/RheemHPHD60.json # test/models_json/RheemPlugInDedicated40.json # test/models_json/RheemPlugInDedicated50.json # test/models_json/RheemPlugInShared40.json # test/models_json/RheemPlugInShared50.json # test/models_json/RheemPlugInShared65.json # test/models_json/RheemPlugInShared80.json # test/models_json/Sanden120.json # test/models_json/Sanden40.json # test/models_json/Sanden80.json # test/models_json/Scalable_MP.json # test/models_json/Stiebel220e.json # test/models_json/TamScalable_SP.json # test/models_json/TamScalable_SP_2X.json # test/models_json/TamScalable_SP_Half.json # test/models_json/UEF2generic.json # test/models_json/restankRealistic.json
# Conflicts: # src/HPWH.hh
…-metadata-description # Conflicts: # src/Condenser.cc # src/HPWH.cc # src/Resistance.cc # src/Tank.cc
# Conflicts: # test/unit_tests/performanceMapTest.cpp
…er/HPWHsim into add-metadata-description
# Conflicts: # scripts/python/data_model/poetry.lock # scripts/python/data_model/pyproject.toml # src/HPWHUtils.cc # src/HPWHUtils.hh
|
@nealkruis This branch has a fix for partial filling of fields (e.g., product_information with manufacturer, but no model_number). The diffs in the model jsons seem to be dates only. Should be ready to merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add member variable metadataDescription that can contain an extended textual description of a product. Presently, this information can be hard-coded for preset models, and is then written to the json representation.