FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives #5283

DaveTwyman · 2024-10-11T10:59:40Z

Create Page and Select Page added to Circuit Primitives

ansys-reviewer-bot · 2024-10-11T10:59:43Z

Thanks for opening a Pull Request. If you want to perform a review write a comment saying:

@ansys-reviewer-bot review

for more information, see https://pre-commit.ci

codecov · 2024-10-11T11:30:28Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.01%. Comparing base (4ab7475) to head (70600ea).
Report is 3 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #5283   +/-   ##
=======================================
  Coverage   85.00%   85.01%           
=======================================
  Files         151      151           
  Lines       60761    60794   +33     
=======================================
+ Hits        51652    51684   +32     
- Misses       9109     9110    +1

Create Page and Select Page added to Circuit Primitives

…s' into 5282-Add-Missing-Circuit-Elements # Conflicts: # src/ansys/aedt/core/modeler/circuits/primitives_circuit.py

Create Page and Select Page added to Circuit Primitives

for more information, see https://pre-commit.ci

SMoraisAnsys

Thanks for the changes, could you address the comments and add tests ?

src/ansys/aedt/core/modeler/circuits/primitives_maxwell_circuit.py

Create Page added to Circuit Primitives

for more information, see https://pre-commit.ci

gmalinve · 2024-10-14T10:35:11Z

@DaveTwyman please install pre-commit in your venv because I see that every time you push a commit it automatically triggers the auto fixes pre-commit:

This package will automatically run all the checks specified in .pre-commit-config.yaml when you push a commit.

Also remember to update and merge main in your branch from time to time.

DaveTwyman · 2024-10-14T10:44:25Z

@DaveTwyman please install pre-commit in your venv because I see that every time you push a commit it automatically triggers the auto fixes pre-commit: This package will automatically run all the checks specified in .pre-commit-config.yaml when you push a commit.

Also remember to update and merge main in your branch from time to time.

@gmalinve Good point about the pre-commit, I see it's installed on my machine. I've just updated it too. I guess the issue is I need to start using it before each push.

I believe I'm updating main before each push from PyCharm, but let me know if you can see evidence something is wrong here. Thanks again as always

SMoraisAnsys · 2024-10-14T10:59:20Z

@DaveTwyman If it is installed on your machine then it shouldn't let you commit. The precommit should trigger the problems locally before allowing you to make any commit.

DaveTwyman · 2024-10-14T11:08:34Z

@DaveTwyman If it is installed on your machine then it shouldn't let you commit. The precommit should trigger the problems locally before allowing you to make any commit.

Ok, understood, I'm just reading up on how to set this up now

gmalinve · 2024-10-16T14:29:54Z

@DaveTwyman you need to add unit tests now :)

SMoraisAnsys

I think it would be better to add the get number pages feature as a property, could you update the code ?
Also, the added code in primitives_circuit.py is not tested, could you test it ?
I left an extra minor comment.

src/ansys/aedt/core/maxwellcircuit.py

src/ansys/aedt/core/modeler/circuits/primitives_circuit.py

tests/system/general/test_35_MaxwellCircuit.py

Unit test 12 no longer needed. Added nb_pages after each page is created in unit test 11 to catch cases where pages are not created.

…ed 'nb_pages'. Change made for circuit so implementation is the same as maxwellcircuit.

SMoraisAnsys · 2024-11-21T09:58:05Z

Hey @DaveTwyman, I'm not sure about the status of this PR. Do you want to add VSin and ISin on top of the pages features or should this be splited into two PRs and some commits got added inadvertently ?
About the pages features, can you add a test to create_page on CircuitComponents class ? Also, would it make sense to add nb_pages to this class ?

src/ansys/aedt/core/circuit.py

src/ansys/aedt/core/modeler/circuits/primitives_circuit.py

src/ansys/aedt/core/modeler/circuits/primitives_maxwell_circuit.py

tests/system/general/test_35_MaxwellCircuit.py

…ng located in maxwellcircuit.py, circuit.py and primitives_circuit.py -Added @pyaedt_function_handler() where missing in three new methods and property. -Removed unused variables from test_25 in test_21_Circuit.py -Removed self. from component in test_09 and test_10 of test_35_MaxwellCircuit.py

DaveTwyman · 2024-12-11T15:30:03Z

@gmalinve, @SMoraisAnsys , I've made all the requested changes to this PR.
Can you let me know what is now needed to merge it to the main.
All checks have passed apart from 2skipped (Release Project and Upload Release Documentation)

I've just pressed the Update branch button as this branch was not out of date

Thanks

DaveTwyman · 2024-12-12T11:12:11Z

@gmalinve, @SMoraisAnsys , I've made all the requested changes to this PR. Can you let me know what is now needed to merge it to the main. All checks have passed apart from 2skipped (Release Project and Upload Release Documentation)

I've just pressed the Update branch button as this branch was not out of date

Thanks

@gmalinve, @SMoraisAnsys
As per this mornings Office Hours call, creation of a new class in the Schematic.py would be needed to keep track of the page number. I've added this work to this PR

anur7 · 2024-12-12T12:35:48Z

tests/system/general/test_35_MaxwellCircuit.py

+        assert self.aedtapp.modeler.nb_pages == 3
+        assert self.aedtapp.modeler.create_page(3.14)
+        assert self.aedtapp.modeler.nb_pages == 4
+        assert not self.aedtapp.modeler.create_page(["create_page_test"])


@DaveTwyman is there any reason why are you testing create_page giving as argument different type of data types? I think the code lines 134 and 140 are enough to test create_page.

@anur7 , The other lines are there to test that passing other data types works correctly. As there is no AEDT documentation on page name data types, we've restricted it to String, Integer and Float and just test these types.

SMoraisAnsys · 2025-01-06T09:16:07Z

src/ansys/aedt/core/modeler/schematic.py

+        return True
+
+    @property
+    def nb_pages(self):


This is not tested, could you add a test ?

SMoraisAnsys · 2025-01-06T09:18:28Z

src/ansys/aedt/core/modeler/circuits/primitives_maxwell_circuit.py

-        id.set_property("Name", name)
-        return id
+        component.set_property("R", value)
+        if isinstance(name, (str, int, float)):


Just wondering, why is this change required ? Was id.set_property("Name", name) not working as expected ?

VSin, ISin Sources added to Maxwell Circuit Primitives

5aac760

Create Page and Select Page added to Circuit Primitives

DaveTwyman requested review from Samuelopez-ansys and gmalinve October 11, 2024 10:59

DaveTwyman and others added 2 commits October 11, 2024 12:01

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

f8699a5

[pre-commit.ci] auto fixes from pre-commit.com hooks

8552947

for more information, see https://pre-commit.ci

DaveTwyman changed the title ~~VSin, ISin Sources added to Maxwell Circuit Primitives~~ FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives Oct 11, 2024

DaveTwyman and others added 4 commits October 11, 2024 13:04

VSin, ISin Sources added to Maxwell Circuit Primitives

93375bd

Create Page and Select Page added to Circuit Primitives

Merge remote-tracking branch 'origin/5282-Add-Missing-Circuit-Element…

955bcf7

…s' into 5282-Add-Missing-Circuit-Elements # Conflicts: # src/ansys/aedt/core/modeler/circuits/primitives_circuit.py

VSin, ISin Sources added to Maxwell Circuit Primitives

cf6153e

Create Page and Select Page added to Circuit Primitives

[pre-commit.ci] auto fixes from pre-commit.com hooks

eb4c79e

for more information, see https://pre-commit.ci

gmalinve marked this pull request as draft October 11, 2024 12:53

SMoraisAnsys reviewed Oct 14, 2024

View reviewed changes

DaveTwyman and others added 2 commits October 14, 2024 11:22

vsin, isin Sources added to Maxwell Circuit Primitives

a07645f

Create Page added to Circuit Primitives

[pre-commit.ci] auto fixes from pre-commit.com hooks

84e4f7a

for more information, see https://pre-commit.ci

DaveTwyman marked this pull request as ready for review October 14, 2024 10:47

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

d7945da

DaveTwyman added 3 commits October 14, 2024 13:56

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

a3a2340

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

46152e2

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

bf84832

gmalinve marked this pull request as draft October 16, 2024 15:00

SMoraisAnsys and others added 2 commits October 17, 2024 08:14

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

0c4d246

Unit Tests added for vsin and isin

d180ad8

DaveTwyman marked this pull request as ready for review October 17, 2024 09:57

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

44c9258

DaveTwyman requested review from SMoraisAnsys and gmalinve November 12, 2024 16:52

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

8b94bd1

DaveTwyman enabled auto-merge (squash) November 13, 2024 09:04

DaveTwyman self-assigned this Nov 13, 2024

SMoraisAnsys disabled auto-merge November 14, 2024 07:49

SMoraisAnsys requested changes Nov 14, 2024

View reviewed changes

src/ansys/aedt/core/maxwellcircuit.py Outdated Show resolved Hide resolved

src/ansys/aedt/core/modeler/circuits/primitives_circuit.py Outdated Show resolved Hide resolved

tests/system/general/test_35_MaxwellCircuit.py Outdated Show resolved Hide resolved

DaveTwyman and others added 5 commits November 19, 2024 15:45

Added property to get number of pages in schematic instead of a method.

0291fd4

Unit test 12 no longer needed. Added nb_pages after each page is created in unit test 11 to catch cases where pages are not created.

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

9496014

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

8a765fb

Changed from using a method called 'get_num_pages' to a property call…

e8bfc8f

…ed 'nb_pages'. Change made for circuit so implementation is the same as maxwellcircuit.

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

9f129ad

DaveTwyman requested a review from SMoraisAnsys November 20, 2024 15:11

gmalinve requested review from anur7 and removed request for Samuelopez-ansys and SMoraisAnsys November 25, 2024 08:37

gmalinve requested changes Nov 25, 2024

View reviewed changes

DaveTwyman and others added 3 commits December 4, 2024 11:57

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

161773c

Corrected test_11_create_page

e8431c4

DaveTwyman enabled auto-merge (squash) December 4, 2024 21:11

gmalinve mentioned this pull request Dec 5, 2024

Add support for more than one circuit schematic page #5530

Closed

Merge branch 'main' into 5282-Add-Missing-Circuit-Elements

70600ea

anur7 reviewed Dec 12, 2024

View reviewed changes

SMoraisAnsys reviewed Jan 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives #5283

FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives #5283

DaveTwyman commented Oct 11, 2024

ansys-reviewer-bot bot commented Oct 11, 2024

codecov bot commented Oct 11, 2024 •

edited

Loading

SMoraisAnsys left a comment

gmalinve commented Oct 14, 2024 •

edited

Loading

DaveTwyman commented Oct 14, 2024

SMoraisAnsys commented Oct 14, 2024

DaveTwyman commented Oct 14, 2024

gmalinve commented Oct 16, 2024

SMoraisAnsys left a comment

SMoraisAnsys commented Nov 21, 2024

DaveTwyman commented Dec 11, 2024

DaveTwyman commented Dec 12, 2024

anur7 Dec 12, 2024

DaveTwyman Dec 16, 2024

SMoraisAnsys Jan 6, 2025

SMoraisAnsys Jan 6, 2025

FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives #5283

Are you sure you want to change the base?

FEAT: VSin, ISin Sources added to Maxwell Circuit Primitives #5283

Conversation

DaveTwyman commented Oct 11, 2024

ansys-reviewer-bot bot commented Oct 11, 2024

codecov bot commented Oct 11, 2024 • edited Loading

Codecov Report

SMoraisAnsys left a comment

Choose a reason for hiding this comment

gmalinve commented Oct 14, 2024 • edited Loading

DaveTwyman commented Oct 14, 2024

SMoraisAnsys commented Oct 14, 2024

DaveTwyman commented Oct 14, 2024

gmalinve commented Oct 16, 2024

SMoraisAnsys left a comment

Choose a reason for hiding this comment

SMoraisAnsys commented Nov 21, 2024

DaveTwyman commented Dec 11, 2024

DaveTwyman commented Dec 12, 2024

anur7 Dec 12, 2024

Choose a reason for hiding this comment

DaveTwyman Dec 16, 2024

Choose a reason for hiding this comment

SMoraisAnsys Jan 6, 2025

Choose a reason for hiding this comment

SMoraisAnsys Jan 6, 2025

Choose a reason for hiding this comment

codecov bot commented Oct 11, 2024 •

edited

Loading

gmalinve commented Oct 14, 2024 •

edited

Loading