Skip to content

Adds geometry-related functions & tests #3

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

Merged
brgix merged 50 commits into from
Aug 3, 2025
Merged

Adds geometry-related functions & tests #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a3e8b7c
Adds geometry-related functions & tests
brgix Jul 8, 2025
aad82a5
Implements basic 3DVector functions (untested)
brgix Jul 8, 2025
c77bcf1
Fixes is_same ('0' as valid list index)
brgix Jul 8, 2025
e842406
Implements width/height functions, tests triangulation
brgix Jul 9, 2025
0ba39ac
Adds (yet untested) line segment functions
brgix Jul 9, 2025
8d82211
Rehauls vestibule, plenum conditional checks (tested)
brgix Jul 10, 2025
d4e0bd0
Reinstates previous tests
brgix Jul 10, 2025
394a4e5
Completes (tested) ULC & BLC
brgix Jul 11, 2025
8266f63
Fixes & tests collinearity methods
brgix Jul 12, 2025
aae7307
Fixes & tests point-line intersection methods
brgix Jul 12, 2025
5ba1ace
Adds a handful of boolean functions
brgix Jul 13, 2025
9f41e35
First try at 'overlaps' - buggy for now
brgix Jul 14, 2025
838fb59
Fixes overlap method - initial tests only
brgix Jul 14, 2025
34ad038
Minor cleanup - post overlap fix
brgix Jul 14, 2025
1f8df35
Partial refactor of 'overlap' (tested)
brgix Jul 16, 2025
8ea89c7
Adds (yet untested) 'offset' & 'outline' methods
brgix Jul 16, 2025
82028fb
Initial tests of 'bounded boxes' methods
brgix Jul 16, 2025
d36561c
Tweaks 'overlap' (more testing needed)
brgix Jul 17, 2025
623ebbb
Completes 'fits' & 'overlap' method testing
brgix Jul 17, 2025
33600d1
Completes segments, triads and orientation tests
brgix Jul 17, 2025
9d44c8a
Initial implementation of 'realignedFace' (untested)
brgix Jul 17, 2025
9a4c20e
Completes 'poly' attributes testing
brgix Jul 18, 2025
c88bea5
Completes model transformation tests
brgix Jul 18, 2025
2f8ab94
Adds (getter) 'roofs' (tested)
brgix Jul 18, 2025
d49f52a
Adds 'isDaylit' (untested)
brgix Jul 18, 2025
8f27186
Minor cleanup
brgix Jul 18, 2025
89ba373
Partial implementation of convexity tests
brgix Jul 18, 2025
635adfd
Implements 'addSubs' (initial testing, more to come ...)
brgix Jul 19, 2025
4fba8e3
Merge branch 'geo' of https://github.com/rd2/pyOSut into geo
brgix Jul 19, 2025
1e4a90a
Updates pyproject.toml
brgix Jul 19, 2025
a0bf359
Adds numpy (dependency) in GH Actions pull_request.yml
brgix Jul 19, 2025
f838db4
Further testing of 'addSubs' (control case)
brgix Jul 19, 2025
4f57555
Completes 1st round of 'addSubs' testing
brgix Jul 21, 2025
b331905
Completes aligned width/height tests
brgix Jul 21, 2025
3f8ec9a
Completes 'WWR insertion' tests
brgix Jul 21, 2025
765d328
Completes 'genShade' fixes/tests
brgix Jul 21, 2025
fd3c2d4
Adds 'grossRoofArea' and 'getHorizontalRidges' (untested)
brgix Jul 22, 2025
e57e6b6
Adds 'toToplit' - yet untested
brgix Jul 23, 2025
45e1cbd
Adds 'genAnchors' - untested
brgix Jul 24, 2025
7108439
Adds 'genextendedvertices' - untested
brgix Jul 25, 2025
11397bb
Sets up 'addSkylights', fixes 'overlap'
brgix Jul 28, 2025
ef390a8
First draft of 'addSkylights': inoperable/inactive for now ...
brgix Aug 1, 2025
bfc9440
Purges 'set' variables (conflict with built-in)
brgix Aug 1, 2025
fb86a4b
First 'addSkylights' test 'green' (more to come)
brgix Aug 2, 2025
0d99847
Fixes (inter alia) ceiling leader lines (skylights)
brgix Aug 3, 2025
52dc079
Fixes roof leader line issues
brgix Aug 3, 2025
a6bca1b
Completes 'SmallOffice' skylight unittests
brgix Aug 3, 2025
60f9f6f
Completes 'SEB' addSkylights unittest
brgix Aug 3, 2025
62ec271
Completes 'Warehouse' addSkylights unittest
brgix Aug 3, 2025
3a1e4f7
Pre-merge cleanup (e.g. resequencing functions)
brgix Aug 3, 2025
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
86 changes: 41 additions & 45 deletions src/osut/osut.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ def holdsConstruction(set=None, base=None, gr=False, ex=False, type=""):
else:
return oslg.invalid("surface type", mth, 5, CN.DBG, False)

if not c: return False
if c is None: return False

if type in t1:
if type == "roofceiling":
Expand Down Expand Up @@ -1554,44 +1554,44 @@ def maxHeatScheduledSetpoint(zone=None) -> dict:
if coil.heatingControlTemperatureSchedule():
sched = coil.heatingControlTemperatureSchedule().get()

if not sched: continue
if sched is None: continue

if sched.to_ScheduleRuleset():
sched = sched.to_ScheduleRuleset().get()
maximum = scheduleRulesetMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

dd = sched.winterDesignDaySchedule()

if dd.values():
if not res["spt"] or res["spt"] < max(dd.values()):
if res["spt"] is None or res["spt"] < max(dd.values()):
res["spt"] = max(dd.values())

if sched.to_ScheduleConstant():
sched = sched.to_ScheduleConstant().get()
maximum = scheduleConstantMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if sched.to_ScheduleCompact():
sched = sched.to_ScheduleCompact().get()
maximum = scheduleCompactMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if sched.to_ScheduleInterval():
sched = sched.to_ScheduleInterval().get()
maximum = scheduleIntervalMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if not zone.thermostat(): return res
Expand All @@ -1616,37 +1616,37 @@ def maxHeatScheduledSetpoint(zone=None) -> dict:
maximum = scheduleRulesetMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

dd = sched.winterDesignDaySchedule()

if dd.values():
if not res["spt"] or res["spt"] < max(dd.values()):
if res["spt"] is None or res["spt"] < max(dd.values()):
res["spt"] = max(dd.values())

if sched.to_ScheduleConstant():
sched = sched.to_ScheduleConstant().get()
maximum = scheduleConstantMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if sched.to_ScheduleCompact():
sched = sched.to_ScheduleCompact().get()
maximum = scheduleCompactMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if sched.to_ScheduleInterval():
sched = sched.to_ScheduleInterval().get()
maximum = scheduleIntervalMinMax(sched)["max"]

if maximum:
if not res["spt"] or res["spt"] < maximum:
if res["spt"] is None or res["spt"] < maximum:
res["spt"] = maximum

if sched.to_ScheduleYear():
Expand All @@ -1657,7 +1657,7 @@ def maxHeatScheduledSetpoint(zone=None) -> dict:
dd = week.winterDesignDaySchedule().get()

if dd.values():
if not res["spt"] or res["spt"] < max(dd.values()):
if res["spt"] is None or res["spt"] < max(dd.values()):
res["spt"] = max(dd.values())
return res

Expand Down Expand Up @@ -1734,44 +1734,44 @@ def minCoolScheduledSetpoint(zone=None):
if coil.coolingControlTemperatureSchedule():
sched = coil.coolingControlTemperatureSchedule().get()

if not sched: continue
if sched is None: continue

if sched.to_ScheduleRuleset():
sched = sched.to_ScheduleRuleset().get()
minimum = scheduleRulesetMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

dd = sched.summerDesignDaySchedule()

if dd.values():
if not res["spt"] or res["spt"] > min(dd.values()):
if res["spt"] is None or res["spt"] > min(dd.values()):
res["spt"] = min(dd.values())

if sched.to_ScheduleConstant():
sched = sched.to_ScheduleConstant().get()
minimum = scheduleConstantMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if sched.to_ScheduleCompact():
sched = sched.to_ScheduleCompact().get()
minimum = scheduleCompactMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if sched.to_ScheduleInterval():
sched = sched.to_ScheduleInterval().get()
minimum = scheduleIntervalMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if not zone.thermostat(): return res
Expand All @@ -1797,37 +1797,37 @@ def minCoolScheduledSetpoint(zone=None):
minimum = scheduleRulesetMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

dd = sched.summerDesignDaySchedule()

if dd.values():
if not res["spt"] or res["spt"] > min(dd.values()):
if res["spt"] is None or res["spt"] > min(dd.values()):
res["spt"] = min(dd.values())

if sched.to_ScheduleConstant():
sched = sched.to_ScheduleConstant().get()
minimum = scheduleConstantMinMax(sched)[:min]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if sched.to_ScheduleCompact():
sched = sched.to_ScheduleCompact().get()
minimum = scheduleCompactMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if sched.to_ScheduleInterval():
sched = sched.to_ScheduleInterval().get()
minimum = scheduleIntervalMinMax(sched)["min"]

if minimum:
if not res["spt"] or res["spt"] > minimum:
if res["spt"] is None or res["spt"] > minimum:
res["spt"] = minimum

if sched.to_ScheduleYear():
Expand All @@ -1838,7 +1838,7 @@ def minCoolScheduledSetpoint(zone=None):
dd = week.summerDesignDaySchedule().get()

if dd.values():
if not res["spt"] or res["spt"] < min(dd.values()):
if res["spt"] is None or res["spt"] < min(dd.values()):
res["spt"] = min(dd.values())

return res
Expand Down Expand Up @@ -2098,7 +2098,7 @@ def setpoints(space=None):
cnd = None

# 2. Check instead OSut's INDIRECTLYCONDITIONED (parent space) link.
if not cnd:
if cnd is None:
id = space.additionalProperties().getFeatureAsString(tg2)

if id:
Expand Down Expand Up @@ -2273,7 +2273,7 @@ def availabilitySchedule(model=None, avl=""):

limits = l

if not limits:
if limits is None:
limits = openstudio.model.ScheduleTypeLimits(model)
limits.setName("HVAC Operation ScheduleTypeLimits")
limits.setLowerLimitValue(0)
Expand Down Expand Up @@ -2418,7 +2418,7 @@ def transforms(group=None) -> dict:
res = dict(t=None, r=None)
cl = openstudio.model.PlanarSurfaceGroup

if isinstance(group, cl):
if not isinstance(group, cl):
return oslg.mismatch("group", group, cl, mth, CN.DBG, res)

mdl = group.model()
Expand Down Expand Up @@ -2555,37 +2555,33 @@ def is_same(s1=None, s2=None, indexed=True) -> bool:
if not isinstance(indexed, bool): indexed = True

if indexed:
xOK = abs(s1[0].x() - s2[0].x()) < CN.TOL
yOK = abs(s1[0].y() - s2[0].y()) < CN.TOL
zOK = abs(s1[0].z() - s2[0].z()) < CN.TOL

if xOK and yOK and zOK and len(s1) == 1:
return True
if len(s1) == 1:
if abs(s1[0].x() - s2[0].x()) > CN.TOL: return False
if abs(s1[0].y() - s2[0].y()) > CN.TOL: return False
if abs(s1[0].z() - s2[0].z()) > CN.TOL: return False
else:
indx = None

for i, pt in enumerate(s2):
if indx: continue
if indx: break

xOK = abs(s1[0].x() - s2[i].x()) < CN.TOL
yOK = abs(s1[0].y() - s2[i].y()) < CN.TOL
zOK = abs(s1[0].z() - s2[i].z()) < CN.TOL
if abs(s1[0].x() - s2[i].x()) > CN.TOL: continue
if abs(s1[0].y() - s2[i].y()) > CN.TOL: continue
if abs(s1[0].z() - s2[i].z()) > CN.TOL: continue

if xOK and yOK and zOK: indx = i
indx = i

if not indx: return False
if indx is None: return False
Copy link
Member Author

@brgix brgix Jul 8, 2025

Choose a reason for hiding this comment

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

If a list's index equals 0, if not indx returns False - not good! if indx is None is better here. Made multiple changes to ensure consistency.


s2 = collections.deque(s2)
s2.rotate(indx)
s2 = list(s2)

# openstudio.isAlmostEqual3dPt(p1, p2, TOL) # ... from v350 onwards.
for i in range(len(s1)):
xOK = abs(s1[i].x() - s2[i].x()) < CN.TOL
yOK = abs(s1[i].y() - s2[i].y()) < CN.TOL
zOK = abs(s1[i].z() - s2[i].z()) < CN.TOL

if not xOK or not yOK or not zOK: return False
if abs(s1[i].x() - s2[i].x()) > CN.TOL: return False
if abs(s1[i].y() - s2[i].y()) > CN.TOL: return False
if abs(s1[i].z() - s2[i].z()) > CN.TOL: return false

return True

Expand Down
74 changes: 72 additions & 2 deletions tests/test_osut.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,8 +2268,78 @@ def test21_availability_schedules(self):

del(model)

# def test22_model_transformation(self):
#
def test22_model_transformation(self):
o = osut.oslg
self.assertEqual(o.status(), 0)
self.assertEqual(o.reset(DBG), DBG)
self.assertEqual(o.level(), DBG)
self.assertEqual(o.status(), 0)
translator = openstudio.osversion.VersionTranslator()

# Successful test.
path = openstudio.path("./tests/files/osms/out/seb2.osm")
model = translator.loadModel(path)
self.assertTrue(model)
model = model.get()

for space in model.getSpaces():
tr = osut.transforms(space)
self.assertTrue(isinstance(tr, dict))
self.assertTrue("t" in tr)
self.assertTrue("r" in tr)
self.assertTrue(isinstance(tr["t"], openstudio.Transformation))
self.assertAlmostEqual(tr["r"], 0, places=2)

# Invalid input test.
self.assertEqual(o.status(), 0)
m1 = "'group' NoneType? expecting PlanarSurfaceGroup (osut.transforms)"
tr = osut.transforms(None)
self.assertTrue(isinstance(tr, dict))
self.assertTrue("t" in tr)
self.assertTrue("r" in tr)
self.assertFalse(tr["t"])
self.assertFalse(tr["r"])
self.assertTrue(o.is_debug())
self.assertEqual(len(o.logs()), 1)
self.assertEqual(o.logs()[0]["message"], m1)
self.assertEqual(o.clean(), DBG)

# --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- #
# Realignment of flat surfaces.
vtx = openstudio.Point3dVector()
vtx.append(openstudio.Point3d( 1, 4, 0))
vtx.append(openstudio.Point3d( 2, 2, 0))
vtx.append(openstudio.Point3d( 6, 4, 0))
vtx.append(openstudio.Point3d( 5, 6, 0))

origin = vtx[1]
hyp = (origin - vtx[0]).length()
hyp2 = (origin - vtx[2]).length()
right = openstudio.Point3d(origin.x()+10, origin.y(), origin.z() )
zenith = openstudio.Point3d(origin.x(), origin.y(), origin.z()+10)
seg = vtx[2] - origin
axis = zenith - origin
droite = right - origin
radians = openstudio.getAngle(droite, seg)
degrees = openstudio.radToDeg(radians)
self.assertAlmostEqual(degrees, 26.565, places=3)

r = openstudio.Transformation.rotation(origin, axis, radians)
a = r.inverse() * vtx

self.assertTrue(osut.is_same(a[1], vtx[1]))
self.assertAlmostEqual(a[0].x() - a[1].x(), 0)
self.assertAlmostEqual(a[2].x() - a[1].x(), hyp2)
self.assertAlmostEqual(a[3].x() - a[2].x(), 0)
self.assertAlmostEqual(a[0].y() - a[1].y(), hyp)
self.assertAlmostEqual(a[2].y() - a[1].y(), 0)
self.assertAlmostEqual(a[3].y() - a[1].y(), hyp)

pts = r * a
self.assertTrue(osut.is_same(pts, vtx))

# ... to be completed later.

# def test23_fits_overlaps(self):
#
# def test24_triangulation(self):
Expand Down