Code

Geometry improvements#4221

Code

Merged

tijcolem merged 90 commits intodevelopNREL/OpenStudio:developfrom Geometry_ImprovementsNREL/OpenStudio:Geometry_ImprovementsCopy head branch name to clipboardApr 13, 2021

+147,557-25

Commits

Commits on Feb 22, 2021

• Polygon3d class with various useful methods (area etc). join method that takes two Polygons and is not affected by holes. UNit test to test this out (Polygon3d_Join)

  ggartside

  committed
  cc3a0b7

  Copy full SHA for cc3a0b7

• Fnishes joinAll for Polygon3d. Added uniut test to repro issue 1614 and show fixed with using Polygon3ed

  ggartside

  committed
  b160f4b

  Copy full SHA for b160f4b

• Some basic Polygon3d unit tests in Geometry

  ggartside

  committed
  c8b56ff

  Copy full SHA for c8b56ff

• Merge branch 'develop' into Geometry_Improvements

  ggartside

  committed
  00f711b

  Copy full SHA for 00f711b

Commits on Feb 24, 2021

• Changed the names of class methods for Polygon3d to match naming convention

  ggartside

  committed
  5d1d00f

  Copy full SHA for 5d1d00f

• Added joinAllPolygons method that takes Point3dVectors as arguments and returns Polygon3d list as result

  ggartside

  committed
  2df7b7e

  Copy full SHA for 2df7b7e

• Fixes an accidenmtal compile error

  ggartside

  committed
  08b8946

  Copy full SHA for 08b8946

• Fixes a compile error reported in the pull request

  ggartside

  committed
  784f028

  Copy full SHA for 784f028

• Fixing cppcheck/clang format issues

  ggartside

  committed
  f2b8d95

  Copy full SHA for f2b8d95

Commits on Feb 25, 2021

• clang-format (with clang-format-12)

  jmarrec

  committed
  3ae5b31

  Copy full SHA for 3ae5b31

• Fix some cppcheck errors

  jmarrec

  committed
  5550a1d

  Copy full SHA for 5550a1d

• These are reported as cppcheck style warnings (unused variables). Consider using them?

  jmarrec

  committed
  ea25e0e

  Copy full SHA for ea25e0e

• Renamed more methods to conform to coding standards (removed get prefix)

  ggartside

  committed
  78c96eb

  Copy full SHA for 78c96eb

• joinAllPolygons was broken by a rename

  ggartside

  committed
  ced8117

  Copy full SHA for ced8117

• Update src/utilities/geometry/Polygon.cpp to use size_t to avoid -Werror=sign-compare]

  jmarrec

  authored
  8b86198

  Copy full SHA for 8b86198

Commits on Mar 8, 2021

• adding joinAllWithBuffer

  ggartside

  committed
  3ac5f46

  Copy full SHA for 3ac5f46

• Merge differences from recent pull

  ggartside

  committed
  d234a47

  Copy full SHA for d234a47

• Updated comments, added new Polygon3d constructor. Hoping thios one gets tho building on unix and macos

  ggartside

  committed
  3371648

  Copy full SHA for 3371648

Commits on Mar 9, 2021

• Merge remote-tracking branch 'origin/develop' into Geometry_Improvements

  jmarrec

  committed
  e004637

  Copy full SHA for e004637

• Lint geometry_improvements and use const refs + rename to NewallVector

  Show description for 15db807
  jmarrec

  committed
  15db807

  Copy full SHA for 15db807

• Merge pull request #4238 from NREL/geometry_improvements_mod

  Show description for 5f7742b
  ggartside

  authored
  5f7742b

  Copy full SHA for 5f7742b

• Adds method removeSpikesEx. This method uses buffer to shrink and expand the polygon to remove spikes. Degenerate space tests 1 & 3 pass with this modification

  ggartside

  committed
  d2a075f

  Copy full SHA for d2a075f

• Merges joinAllWithBuffer branch (2527)

  ggartside

  committed
  362bb8d

  Copy full SHA for 362bb8d

Commits on Mar 11, 2021

• Removes unused variables that are causing buildind fails

  ggartside

  committed
  dca4325

  Copy full SHA for dca4325

Commits on Mar 12, 2021

• One last effort to fix these warnings

  Show description for 8b5e98a
  ggartside

  committed
  8b5e98a

  Copy full SHA for 8b5e98a

Commits on Mar 15, 2021

• Added RemoveSpikesAndOverlaps test to verify removeSpikes fixes issue with intersect surfaces never finishing in two_stories_pre_intersect.osm. FIxed some intersection tests including buffer and bu…

  Show description for 212aea6
  ggartside

  committed
  212aea6

  Copy full SHA for 212aea6

Commits on Mar 16, 2021

• Suppress cppcheck warnings

  jmarrec

  committed
  9d3b85f

  Copy full SHA for 9d3b85f

• Fix build error. The OSM file(s) referenced isn't in source control though

  jmarrec

  committed
  947ef2e

  Copy full SHA for 947ef2e

• Fix build error in Intersection_GTest due to unused variables

  Show description for b68c10a
  jmarrec

  committed
  b68c10a

  Copy full SHA for b68c10a

• Fix more issues in Space_GTest

  jmarrec

  committed
  51d5648

  Copy full SHA for 51d5648

• Give an example of how to register and use test OSM(s) for use in test.

  Show description for 9dfc54a
  jmarrec

  committed
  9dfc54a

  Copy full SHA for 9dfc54a

• clang format [chore]

  jmarrec

  committed
  94f4521

  Copy full SHA for 94f4521

• Merge remote-tracking branch 'upstream/develop' into Geometry_Improvements

  jmarrec

  committed
  fe52006

  Copy full SHA for fe52006

Commits on Mar 19, 2021

• Adds stripped down test for removing spikes where process was stuck in infinite loop. Adds test to verify issue 3982, Adds unit test to calculate the perimeter of a building

  ggartside

  committed
  d7ff466

  Copy full SHA for d7ff466

Commits on Mar 22, 2021

• Added overlap method to Polygon3d. Created Polygon3d_overlap unit test

  ggartside

  committed
  7c2cb9a

  Copy full SHA for 7c2cb9a

• Create example of selectively adding tests for windows only

  kbenne

  committed
  1553650

  Copy full SHA for 1553650

• Adds a unit test for calculating exposed perimeter

  ggartside

  committed
  ac2580c

  Copy full SHA for ac2580c

Commits on Mar 23, 2021

• Adds exterior perimeter to Building and space

  ggartside

  committed
  7060587

  Copy full SHA for 7060587

• Renamed Space.exposedPerimeter added call to ExposedPerimeter test

  ggartside

  committed
  b19f89d

  Copy full SHA for b19f89d

• Using unused variable result2

  ggartside

  committed
  4d95d0f

  Copy full SHA for 4d95d0f

• Merge branch 'Geometry_Improvements' of https://github.com/NREL/OpenStudio into Geometry_Improvements

  ggartside

  committed
  82ee291

  Copy full SHA for 82ee291

• Polygon.overlap, Building.exteriorPerimeter, Space.exposedPerimeter, fixes for 1398

  ggartside

  committed
  260901d

  Copy full SHA for 260901d

• Adds a test to repro 1683, adds a test to repro 3982, ensures all GeometryFixture tets run and pass

  ggartside

  committed
  c6da5c5

  Copy full SHA for c6da5c5

• Removed surface shattering test as it is not in the current scope

  ggartside

  committed
  8e3acb3

  Copy full SHA for 8e3acb3

• (Hopefully) removed warnings that translate into errors

  ggartside

  committed
  d52f56f

  Copy full SHA for d52f56f

Commits on Mar 24, 2021

• Exzclude two tests that rely on model files (one takes 16 minutes to run too!)

  ggartside

  committed
  d9e2a59

  Copy full SHA for d9e2a59

• clang-format changes

  ggartside

  committed
  6785082

  Copy full SHA for 6785082

• Added unit test for 3982 - am not getting any triangulated surfaces back, still getting the concave surface.

  ggartside

  committed
  08e7d19

  Copy full SHA for 08e7d19

• Unit test for issue 2560, changes to Geometry.i

  ggartside

  committed
  d01ea5f

  Copy full SHA for d01ea5f

Commits on Mar 25, 2021

• Test for issue 3982

  ggartside

  committed
  0e025e9

  Copy full SHA for 0e025e9

• Adds unit test for issue 2560

  ggartside

  committed
  1e00fee

  Copy full SHA for 1e00fee

• Fixes to unit tests Issue_3982 and Surface_Intersect_ConcaveSurfaces that hopefully resolve the issues in CI where the surface lis comes back in a different order (sort by ascending # vertices)

  ggartside

  committed
  480971b

  Copy full SHA for 480971b

• Adjust BoundingBox intersection tolerance to 10mm from 1mm.

  ggartside

  committed
  e1e1429

  Copy full SHA for e1e1429

• Renamed Polygon.hpp(cpp) -> Polygon3d.hpp(cpp)

  ggartside

  committed
  78dc6d8

  Copy full SHA for 78dc6d8

Commits on Mar 26, 2021

• Relaxes the tolerances for the area check in Surface::comupteIntersection

  ggartside

  committed
  b624855

  Copy full SHA for b624855

• Merge branch 'GeometryShared' into Geometry_Improvements

  ggartside

  committed
  dba1300

  Copy full SHA for dba1300

• Fixes a build/merge issue

  ggartside

  committed
  3d768ef

  Copy full SHA for 3d768ef

• clang!!!

  ggartside

  committed
  05a44a9

  Copy full SHA for 05a44a9

• Fixes issues that are causing Space_intersectSurfaces_degenerate2 to fail

  ggartside

  committed
  feed490

  Copy full SHA for feed490

Commits on Mar 29, 2021

• Adds exposedPerimeter for Surface

  ggartside

  committed
  d17df78

  Copy full SHA for d17df78

• Formatting corrections

  ggartside

  committed
  b5657e1

  Copy full SHA for b5657e1

Commits on Mar 31, 2021

• Added ruby tests for the geometry improvements

  ggartside

  committed
  28f842a

  Copy full SHA for 28f842a

• Changes geometry.i for polygon3d

  ggartside

  committed
  8474eb1

  Copy full SHA for 8474eb1

• SOm enew tests some updated tests

  ggartside

  committed
  4f4c7fc

  Copy full SHA for 4f4c7fc

• Moved model files to resources/model, updated cmake file

  ggartside

  committed
  d94a96c

  Copy full SHA for d94a96c

• Removing failing tests

  ggartside

  committed
  0f38555

  Copy full SHA for 0f38555

• Fixes error in file name

  ggartside

  committed
  bf23615

  Copy full SHA for bf23615

Commits on Apr 5, 2021

• Fixing a missing swig type optional Point3dVectorVector

  ggartside

  committed
  c0e8704

  Copy full SHA for c0e8704

Commits on Apr 7, 2021

• Merge branch 'develop' into Geometry_Improvements

  jmarrec

  committed
  33ae7be

  Copy full SHA for 33ae7be

• Whitespace changes in ruby tests

  Show description for 5777ebb
  jmarrec

  committed
  5777ebb

  Copy full SHA for 5777ebb

• Use correct name for 7-7_Windows_Complete.osm

  Show description for 8a4a5d3
  jmarrec

  committed
  8a4a5d3

  Copy full SHA for 8a4a5d3

• Adjust and disable via commenting all saving of output (which is for debugging purposes only)

  jmarrec

  committed
  ddf711b

  Copy full SHA for ddf711b

• Infer where to save, but also disable saving models in ruby test (this is for debugging purposes only)

  jmarrec

  committed
  fb25ab9

  Copy full SHA for fb25ab9

• Some cleanup in comments

  Show description for ef3201b
  jmarrec

  committed
  ef3201b

  Copy full SHA for ef3201b

• Space_Gtest: use EXPECT_ insert of ASSERT_ where possible

  jmarrec

  committed
  52daa4f

  Copy full SHA for 52daa4f

• Space_Gtest: Remove macro code: enable tests on other than win32. For Surface Shattering and the two exclude, mark them DISABLED_ so google tests won't run them by default...

  jmarrec

  committed
  0ba9769

  Copy full SHA for 0ba9769

• change model version back down to 3.1.0 (or they won't load, 3.1.1 isn't happening)

  jmarrec

  committed
  2f1fa96

  Copy full SHA for 2f1fa96

• Move disabled tests at end. surface shattering fails (logically), the two other pass but take 5 and 20 seconds...

  jmarrec

  committed
  284002c

  Copy full SHA for 284002c

• TEMPORARY: change jenkinsfile to point to the geometry_improvements branch of CBCI that will run disabled geometry tests

  jmarrec

  committed
  ac3d471

  Copy full SHA for ac3d471

• output log file in a folder that exists.

  jmarrec

  committed
  c32ba21

  Copy full SHA for c32ba21

• Use const ref where possible, remove unused variables, break one-line ifs

  Show description for ad99016
  jmarrec

  committed
  ad99016

  Copy full SHA for ad99016

• Change comments in Surface by adjusting units from mm2 to cm2 as I think they should

  Show description for 0be4881
  jmarrec

  committed
  0be4881

  Copy full SHA for 0be4881

• Use std::abs(float) instead of cstdlib abs(int)

  jmarrec

  committed
  8c07f5a

  Copy full SHA for 8c07f5a

• Remove kyle's example of selectively adding test files in CMakeLists.txt

  Show description for eed6954
  jmarrec

  committed
  eed6954

  Copy full SHA for eed6954

• Merge pull request #4275 from NREL/Geometry_improvements_review

  Show description for f7ca31e
  tijcolem

  authored
  f7ca31e

  Copy full SHA for f7ca31e

Commits on Apr 8, 2021

• Added method to create a test model for perimeter calculations, rempved dependency on an osm file

  ggartside

  committed
  1063eb0

  Copy full SHA for 1063eb0

Commits on Apr 9, 2021

• Merge develop to branch

  ggartside

  committed
  7efb19f

  Copy full SHA for 7efb19f

• Resolved merge conflicts

  ggartside

  committed
  26ee1fc

  Copy full SHA for 26ee1fc

• Fixed clan clanger (all clang did was remove an extra blank line from the file?)

  ggartside

  committed
  fa14e8a

  Copy full SHA for fa14e8a

Commits on Apr 12, 2021

• Added ruby scripts that create the floorplan_school model via the api

  ggartside

  committed
  debd914

  Copy full SHA for debd914