Allow Multiple Logic Requests #474

GCRA101 · 2024-09-17T18:26:33Z

Issues addressed by this PR

Closes #465

ETABS Toolkit now can allow to pull objects from ETABS based on FilterRequests, SelectedRequest and multiple LogicalRequests.

Test files

Grasshopper File
https://burohappold.sharepoint.com/:u:/r/sites/BHoM/02_Current/12_Scripts/02_Pull%20Request/BHoM/ETABS_Toolkit/%23474-AllowMultipleLogicRequests/[TestScript.gh](https://burohappold.sharepoint.com/:u:/r/sites/BHoM/02_Current/12_Scripts/02_Pull%20Request/BHoM/ETABS_Toolkit/%23474-AllowMultipleLogicRequests/TestScript.gh?csf=1&web=1&e=93kD0Q)?csf=1&web=1&e=93kD0Q
ETABS File
https://burohappold.sharepoint.com/:u:/r/sites/BHoM/02_Current/12_Scripts/02_Pull%20Request/BHoM/ETABS_Toolkit/%23474-AllowMultipleLogicRequests/Test%20ETABS%20Model.EDB?csf=1&web=1&e=IRUEie

Changelog

Added Read Method for FitlerRequests
Added Read Method for LogicalRequests (And, Or and Not)
Added Dynamic Comparer class allowing to compare IBHoMObjects based on ad-hoc criteria

…hsets of IBHoMObjects

…c Comparer

… RECURSION AND REFLECTION

… adjust recursion calls

GCRA101 · 2024-09-18T10:41:26Z

@Chrisshort92 , @peterjamesnugent , @IsakNaslundBh,

I've had the chance to finish the pull request for issue #465.

Also for this one, a pull request to be reviewed in the next sprint moving forward BHoM 7.4, not now ;)

Thanks guys! ;)

Chrisshort92

Functionality tested with files provided, all working as expected. Approved for merge

Chrisshort92 · 2024-10-14T10:51:35Z

@BHoMBot Check required

bhombot-ci · 2024-10-14T10:51:39Z

@Chrisshort92 to confirm, the following actions are now queued:

check code-compliance
check documentation-compliance
check project-compliance
check core
check null-handling
check serialisation
check versioning
check installer

There are 39 requests in the queue ahead of you.

Turned the getEtabsId() method name (from the DynamicComparer private class) into GetEtabsId(), based on BHoM method's naming convention.

GCRA101 · 2024-10-14T12:03:48Z

@Chrisshort92 , I've gone through the code compliance checks above and I've modified the code as per following commit 655b110
Turned the DynamicComparer from a private class within the _Read.cs file into a public class within the Types namespace.

GCRA101 · 2024-10-14T12:05:09Z

@BHoMBot Check required

bhombot-ci · 2024-10-14T12:05:11Z

@GCRA101 to confirm, the following actions are now queued:

check code-compliance
check documentation-compliance
check project-compliance
check core
check null-handling
check serialisation
check versioning
check installer

There are 85 requests in the queue ahead of you.

bhombot-ci · 2024-10-14T13:15:28Z

The check core has already been run previously and recorded as a successful check. This check has not been run again at this time.

bhombot-ci · 2024-10-14T13:15:42Z

The check serialisation has already been run previously and recorded as a successful check. This check has not been run again at this time.

bhombot-ci · 2024-10-14T13:15:50Z

The check versioning has already been run previously and recorded as a successful check. This check has not been run again at this time.

bhombot-ci · 2024-10-14T13:15:59Z

The check installer has already been run previously and recorded as a successful check. This check has not been run again at this time.

Chrisshort92

Re-tested code changes from @GCRA101, functionality working as expected, approved for merge.

peterjamesnugent · 2024-10-23T14:29:37Z

@BHoMBot check compliance
@BHoMBot check ready-to-merge

bhombot-ci · 2024-10-23T14:29:40Z

@peterjamesnugent to confirm, the following actions are now queued:

check code-compliance
check documentation-compliance
check project-compliance
check branch-compliance
check dataset-compliance
check copyright-compliance
check ready-to-merge

There are 19 requests in the queue ahead of you.

bhombot-ci · 2024-10-23T14:35:23Z

The check code-compliance has already been run previously and recorded as a successful check. This check has not been run again at this time.

bhombot-ci · 2024-10-23T14:35:31Z

The check documentation-compliance has already been run previously and recorded as a successful check. This check has not been run again at this time.

bhombot-ci · 2024-10-23T14:35:36Z

The check project-compliance has already been run previously and recorded as a successful check. This check has not been run again at this time.

GCRA101 · 2024-10-24T10:29:11Z

@peterjamesnugent,
added copyright header to DynamicComparer in latest commit.
9b081de

GCRA101 · 2024-10-28T12:21:36Z

@BHoMBot check required

bhombot-ci · 2024-10-28T12:21:39Z

@GCRA101 to confirm, the following actions are now queued:

check code-compliance
check documentation-compliance
check project-compliance
check core
check null-handling
check serialisation
check versioning
check installer

GCRA101 · 2024-10-28T13:03:41Z

@BHoMBot check copyright-compliance

bhombot-ci · 2024-10-28T13:03:43Z

@GCRA101 to confirm, the following actions are now queued:

check copyright-compliance

There are 28 requests in the queue ahead of you.

GCRA101 · 2024-10-28T14:41:38Z

@BHoMBot check required

bhombot-ci · 2024-10-28T14:41:43Z

@GCRA101 to confirm, the following actions are now queued:

check code-compliance
check documentation-compliance
check project-compliance
check core
check null-handling
check serialisation
check versioning
check installer

There are 14 requests in the queue ahead of you.

bhombot-ci · 2024-10-28T15:35:58Z

Please be advised that the check with reference 32166477143 has more than 50 annotations of notes. API limitations restrict annotations to 50. You may need to rerun this check to obtain the next set when you make changes. At the time of reporting this check, there are 1318 additional annotations waiting, made up of 1318 errors and 0 warnings.

peterjamesnugent

Recurring theme of unchanged files popping up in the PRs, can we make sure they are removed.

On the DynamicComparer I feel like we can just use the comparers defined in the adatper rather than trying to rewrite those.

Etabs_Adapter/Convert/Execute.cs

peterjamesnugent · 2024-10-31T12:17:11Z

Etabs_Adapter/Types/DynamicComparer.cs

+                // For physical objects, use Id as it is never null
+                if (objType == typeof(Node) || objType == typeof(Bar) || objType == typeof(Panel) || objType == typeof(RigidLink) || objType == typeof(FEMesh))
+                    return GetEtabsId(obj1).Id.ToString() == GetEtabsId(obj2).Id.ToString();
+                // For all other items, use Name as it is never null
+                if (objType == typeof(ISectionProperty) || objType == typeof(IMaterialFragment) || objType == typeof(ISurfaceProperty) ||
+                    objType == typeof(Loadcase) || objType == typeof(LoadCombination) || objType == typeof(ILoad) || objType == typeof(LinkConstraint) ||
+                    objType == typeof(Level) || objType == typeof(Grid))
+                    return obj1.Name.ToString() == obj2.Name.ToString();


We already have all these comparers defined in the Adapter - can we not make sure of that rather than rewriting it here:

ETABS_Toolkit/Etabs_Adapter/Types/Comparer.cs

Lines 57 to 62 in edc11e0

{typeof(Node), new BH.Engine.Structure.NodeDistanceComparer(3) },

{typeof(Bar), new BH.Engine.Structure.BarEndNodesDistanceComparer(3) },

{typeof(ISectionProperty), new NameOrDescriptionComparer() },

{typeof(IMaterialFragment), new NameOrDescriptionComparer() },

{typeof(ISurfaceProperty), new NameOrDescriptionComparer() },

{typeof(BH.oM.Adapters.ETABS.Elements.Diaphragm), new BHoMObjectNameComparer() },

@peterjamesnugent, thanks for the comment.
It would be great to reuse it yeah.
Only thing is that there are some objects that are not dealt with by the Adapter Comparer (e.g. Level, FEMesh,LoadCase...) - see screenshot below.
Can we add them in it?

Yes, I don't think that's an issue adding them to the Comparer.cs - most of them will be NameOrDescriptionComparer() anyway.

Can you add to the test script, trying to push two objects with the same name for each type you add (just to test that we are not breaking anything).

Chrisshort92 · 2024-11-25T16:48:18Z

@BHoMBot check installer

bhombot-ci · 2024-11-25T16:48:21Z

@Chrisshort92 to confirm, the following actions are now queued:

check installer

GCRA101 added 12 commits September 10, 2024 18:32

Add Read Method for pulling IRequests

1ecca7e

Add Read Method for both FilterRequests and ILogicalRequests

8961f7a

Add Reflection-based Dynamic Comparer class to allow to intersect Has…

88717a2

…hsets of IBHoMObjects

Fix bug

8840932

Turn HashSet into List to allow for use of .Equals method from Dynami…

49e8f14

…c Comparer

Fix minor issues

5599ccb

Add code to read from LogicalNotRequests

aa5c0d6

Add comments highlighting use of GENERIC TYPES, HASH TABLES, STREAMS,…

df9fd14

… RECURSION AND REFLECTION

Remove outstanding lines of code

2210bb6

Improve Hash function for the DynamicCompararer

c420c50

Improve the Dynamic Comparer methods .Equals() and .GetHashCode() and…

f1b590e

… adjust recursion calls

Add comments

ad9919f

GCRA101 self-assigned this Sep 17, 2024

GCRA101 added this to the BHoM 7.4 β MVP milestone Sep 17, 2024

GCRA101 added the type:feature New capability or enhancement label Sep 17, 2024

GCRA101 requested review from IsakNaslundBh, peterjamesnugent and Chrisshort92 September 18, 2024 10:39

Chrisshort92 previously approved these changes Oct 14, 2024

View reviewed changes

Update _Read.cs

e821703

Turned the getEtabsId() method name (from the DynamicComparer private class) into GetEtabsId(), based on BHoM method's naming convention.

GCRA101 dismissed Chrisshort92’s stale review via e821703 October 14, 2024 11:47

Turn DynamicComparer private class into public class in Types namespace

655b110

Chrisshort92 self-requested a review October 14, 2024 13:31

Chrisshort92 previously approved these changes Oct 14, 2024

View reviewed changes

Add copyright header to DynamicComparer class

9b081de

GCRA101 dismissed Chrisshort92’s stale review via 9b081de October 24, 2024 10:27

Repaste Copyright header in DynamicComparer

8c86bfc

peterjamesnugent requested changes Oct 31, 2024

View reviewed changes

Revert Execute.cs to original

f40154d

GCRA101 requested a review from peterjamesnugent November 5, 2024 15:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow Multiple Logic Requests #474

Allow Multiple Logic Requests #474

GCRA101 commented Sep 17, 2024 •

edited

Loading

GCRA101 commented Sep 18, 2024 •

edited

Loading

Chrisshort92 left a comment

Chrisshort92 commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

GCRA101 commented Oct 14, 2024

GCRA101 commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

Chrisshort92 left a comment

peterjamesnugent commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

GCRA101 commented Oct 24, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

peterjamesnugent left a comment

peterjamesnugent Oct 31, 2024

GCRA101 Nov 5, 2024

peterjamesnugent Nov 7, 2024

Chrisshort92 commented Nov 25, 2024

bhombot-ci bot commented Nov 25, 2024

	{typeof(Node), new BH.Engine.Structure.NodeDistanceComparer(3) },
	{typeof(Bar), new BH.Engine.Structure.BarEndNodesDistanceComparer(3) },
	{typeof(ISectionProperty), new NameOrDescriptionComparer() },
	{typeof(IMaterialFragment), new NameOrDescriptionComparer() },
	{typeof(ISurfaceProperty), new NameOrDescriptionComparer() },
	{typeof(BH.oM.Adapters.ETABS.Elements.Diaphragm), new BHoMObjectNameComparer() },

Allow Multiple Logic Requests #474

Are you sure you want to change the base?

Allow Multiple Logic Requests #474

Conversation

GCRA101 commented Sep 17, 2024 • edited Loading

Issues addressed by this PR

Test files

Changelog

GCRA101 commented Sep 18, 2024 • edited Loading

Chrisshort92 left a comment

Choose a reason for hiding this comment

Chrisshort92 commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

GCRA101 commented Oct 14, 2024

GCRA101 commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

bhombot-ci bot commented Oct 14, 2024

Chrisshort92 left a comment

Choose a reason for hiding this comment

peterjamesnugent commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

bhombot-ci bot commented Oct 23, 2024

GCRA101 commented Oct 24, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

GCRA101 commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

bhombot-ci bot commented Oct 28, 2024

peterjamesnugent left a comment

Choose a reason for hiding this comment

peterjamesnugent Oct 31, 2024

Choose a reason for hiding this comment

GCRA101 Nov 5, 2024

Choose a reason for hiding this comment

peterjamesnugent Nov 7, 2024

Choose a reason for hiding this comment

Chrisshort92 commented Nov 25, 2024

bhombot-ci bot commented Nov 25, 2024

GCRA101 commented Sep 17, 2024 •

edited

Loading

GCRA101 commented Sep 18, 2024 •

edited

Loading