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

#5226 - Remove SpaceAndSpaceGroupNames from Building #5305

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion resources/model/OpenStudio.idd
Original file line number Diff line number Diff line change
Expand Up @@ -5138,7 +5138,6 @@ OS:Building,
\type alpha
\required-field
\reference BuildingNames
\reference SpaceAndSpaceGroupNames
A3, \field Building Sector Type
\deprecated
\type choice
Expand Down
6 changes: 3 additions & 3 deletions src/model/test/Model_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -819,13 +819,13 @@ TEST_F(ModelFixture, Ensure_Name_Unicity_SpaceAndSpaceGroupNames) {
// Zone, ZoneList, Space, SpaceList all need to be unique names
Model m;

std::vector<ModelObject> mos{Space{m}, m.getUniqueModelObject<Building>(), BuildingStory{m}, SpaceType{m}, ThermalZone{m}};
EXPECT_EQ(5, m.getObjectsByReference("SpaceAndSpaceGroupNames").size());
std::vector<ModelObject> mos{Space{m}, BuildingStory{m}, SpaceType{m}, ThermalZone{m}};
EXPECT_EQ(4, m.getObjectsByReference("SpaceAndSpaceGroupNames").size());

std::string name = "A Name";

std::vector<std::pair<size_t, size_t>> combinations{
{0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 2}, {1, 3}, {1, 4}, {2, 3}, {2, 4}, {3, 4},
{0, 1}, {0, 2}, {0, 3}, {1, 2}, {1, 3}, {2, 3},
};

auto resetNames = [&mos]() {
Expand Down