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

Fix #4125, Fix #4135 - GbXML ForwardTranslator: clear map&set, and add a modelToGbXMLString method #4136

Merged
merged 3 commits into from
Nov 3, 2020
Merged

Fix #4125, Fix #4135 - GbXML ForwardTranslator: clear map&set, and add a modelToGbXMLString method #4136

merged 3 commits into from
Nov 3, 2020

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Nov 2, 2020

Pull request overview

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Checked behavior in OpenStudioApplication, adjusted policies as needed (src/openstudio_lib/library/OpenStudioPolicy.xml)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified

@jmarrec jmarrec added component - gbXML Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Nov 2, 2020
@jmarrec jmarrec added this to the OpenStudio SDK 3.2.0 milestone Nov 2, 2020
@jmarrec jmarrec requested a review from tijcolem November 2, 2020 13:15
@jmarrec jmarrec self-assigned this Nov 2, 2020
@ci-commercialbuildings
Copy link
Collaborator

ci-commercialbuildings commented Nov 2, 2020 •
edited
Loading

CI Results for d85958a:

@jmarrec
Copy link
Collaborator Author

jmarrec commented Nov 2, 2020

None of the tests that are failing are related to this change.

jmarrec
jmarrec commented Nov 2, 2020
View reviewed changes
src/gbxml/ForwardTranslator.cpp
Comment on lines +203 to +205
// Clear the map & set
m_translatedObjects.clear();
m_materials.clear();
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fix #4135

src/gbxml/ForwardTranslator.hpp
Comment on lines +84 to +85
// Return a string representation of the GbXML document
std::string modelToGbXMLString(const openstudio::model::Model& model, ProgressBar* progressBar = nullptr);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fix #4125

@tijcolem tijcolem merged commit d7cf7c8 into develop Nov 3, 2020
@tijcolem tijcolem deleted the 4125_4135_GbXML_ForwardTranslator branch November 3, 2020 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tijcolem tijcolem tijcolem approved these changes

Assignees

@jmarrec jmarrec

Labels
component - gbXML Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Milestone
OpenStudio SDK 3.2.0
3 participants
@jmarrec @ci-commercialbuildings @tijcolem