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

update main #772

Merged
merged 200 commits into from
Dec 20, 2024
Merged

update main #772

merged 200 commits into from
Dec 20, 2024

Conversation

DaJansenGit
Copy link
Member

No description provided.

DaJansenGit and others added 30 commits January 8, 2024 15:00
@DaJansenGit
add heatpump attributes from VDI 3805 for carf export
68d35cc
@DaJansenGit
fix problem with multiple entries in finder for same default_ps
109facd
@DaJansenGit
add functionality to parse upper/lower bound of IfcPropertyBoundedValue
7c3090e
@DaJansenGit
add further attribute sources for CARF finder
8d2d01b
@DaJansenGit
Merge branch 'heatpump_tables' into 615-vdi-3805-mapping
2bc541c
@DaJansenGit
implementation of tables as attributes via pandas dataframes
5ffd4d6
@DaJansenGit
remove example which was just to test tables
dfbd2c2
@HoeppJ
Fixed bug
9fd5eb5
@HoeppJ
Update
a7b68cd
@HoeppJ
Update
2a1af96
@DaJansenGit
Merge branch 'refs/heads/development' into 615-vdi-3805-mapping
e4e6232 
# Conflicts:
#	bim2sim/plugins/PluginAixLib/bim2sim_aixlib/__init__.py
@DaJansenGit
minor work on cached properties
5aec5ed
@DaJansenGit
Merge branch 'refs/heads/development' into 639_cached_property_local
4d63769
@DaJansenGit
remove obsolete bound_neighbors property
81f2965
@DaJansenGit
mv bound_area to attribute
80286aa
@DaJansenGit
check attributes of serialized elements if they are pickleable
f55f677
@DaJansenGit
mv cached_property to attribute for Layer class
95479d8
@DaJansenGit
allow inheritance for attribute functions
ec3c14c
@DaJansenGit
move all @cached_properties to attributes in bps_elements.py
331801e
@DaJansenGit
add todos and temporary roll back some attributes to cached properties
5c81d22
@DaJansenGit
Merge branch 'development' into 688-use-given-plugin-instead-of-plugi…
b822f1b 
…n-in-configtoml
@DaJansenGit
update profile to add maintained illuminance
807a722
@DaJansenGit
use maintained illuminance for all cases
8a7a6f6
@DaJansenGit
update templates and functions to use maintained illuminance attribute
9879426
@DaJansenGit
Merge branch 'development' into 740-update-to-new-teaser-use-conditions
f9653af
@DaJansenGit
add docs for lighting power changes and adjust EP part
92e4080
@DaJansenGit
Merge branch 'development' into 740-update-to-new-teaser-use-conditions
f28110e
@DaJansenGit
Merge branch 'refs/heads/development' into 639_cached_property_local
0ea687b 
# Conflicts:
#	bim2sim/elements/base_elements.py
#	bim2sim/elements/mapping/attribute.py
@DaJansenGit
Merge branch 'refs/heads/development' into 639_cached_property_local
3d8b998
@DaJansenGit
add reset function and try to move all cached properties to attributes
12cd8b7
Cudok and others added 26 commits December 18, 2024 11:11
@Cudok
Merge branch 'development' into 766-mermaid-figure-some-parts-missing…
318f6a0 
…-firefox
@DaJansenGit
remove cached property from remaining code
226265a
@Cudok
not needed, pluginCFD is removed since 0.2.1
6014906
@Cudok
comment cfd option
ef7502e
@Cudok
updated mermaid files
52bae91
@DaJansenGit
use attributes for position, volume, name and teaser_orientation
dd83a38
@DaJansenGit
use attributes for position, volume, name and teaser_orientation
2d3b750
@Cudok
Merge pull request #768 from BIM2SIM/748-update-mermaid-files
09a50b1 
748 update mermaid files
@Cudok
Merge branch 'development' into 766-mermaid-figure-some-parts-missing…
a26009d 
…-firefox
@Cudok
Merge pull request #767 from BIM2SIM/766-mermaid-figure-some-parts-mi…
e5afe11 
…ssing-firefox

add hint mermaid figure issue
@DaJansenGit
fix calc_position method for AggregationMixin and improve robustness …
3d8cc08 
…of method
@DaJansenGit
add more docs about when to use the attribute system
3cf4e85
@DaJansenGit
fix wrong function name calc_teaser_orientation -> calc_teaser_orient…
d5a5619 
…ation
@DaJansenGit
mv teaser_orientation from IFCBased to BPSProduct as its only relevan…
93d85a3 
…t for these elements
@DaJansenGit
adjust tests to removed teaser_orientation IFCBased attribute
83de5c5
@DaJansenGit
Merge branch 'refs/heads/development' into 639_cached_property_local
c96aaa7
@DaJansenGit
Merge branch 'development' into 615-vdi-3805-mapping
940e0c2
@DaJansenGit
add sim_setting to deactive geometry based connection check
7abdb85
@DaJansenGit
reset tolerance_connect_by_position to 10
f1cf777
@DaJansenGit
update test resources submodule branch to current main commit
9a99612
@DaJansenGit
add ifc link of parent to disaggregation to keep orientation calculat…
4d68f0e 
…ion correct with teaser_orientation as attribute
@DaJansenGit
use shutil move instead of replace to not fail when moving dymola log…
faebe80 
…s between different harddrives
@DaJansenGit
Merge pull request #707 from BIM2SIM/639_cached_property_local
6d9aeec 
Remove cached property and use attributes instead
@DaJansenGit
Merge branch 'development' into 615-vdi-3805-mapping
b16b734
@DaJansenGit
fix naming heatpump -> heat pump in attribute descriptions [skip-ci]
44ffc7e
@DaJansenGit
Merge pull request #694 from BIM2SIM/615-vdi-3805-mapping
09638ec 
615 vdi 3805 mapping
@DaJansenGit DaJansenGit merged commit aa09c3e into main Dec 20, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veronikarichter veronikarichter veronikarichter approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DaJansenGit @veronikarichter @HoeppJ @Cudok @jgerster-wetec