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

Add type annotations to Custom_Colours.py & graph.py #62

Merged
merged 36 commits into from
Oct 16, 2019
Merged

Add type annotations to Custom_Colours.py & graph.py #62

merged 36 commits into from
Oct 16, 2019

Conversation

Artyko
Copy link
Contributor

@Artyko Artyko commented Oct 12, 2019

#55

@Artyko
Copy link
Contributor Author

Artyko commented Oct 12, 2019

🐛 I found a bug in colour_cycle function with 'rainbow' parameter. It raises ValueError, beacause 'Magenta' doesn't match anything in Colours.txt.

colour_cycle(rainbow)-->colours('Magenta')-->
re.fullmatch('magenta', 'magenta / fuchsia') == None-->raise ValueError

Check it please, maybe I'm wrong?

@dalonsoa
Copy link
Collaborator

You're absolutely right, there is a bug. Thanks for pointing it out!

Please, replace line 88 in Colours.txt:

magenta / fuchsia = #FF00FF

by the following two lines:

magenta = #FF00FF
fuchsia = #FF00FF

PieceMaker and others added 28 commits October 14, 2019 21:26
@PieceMaker @Artyko
Ignore JetBrains IDE files.
bc02f58
@PieceMaker @Artyko
Pull large datasets into separate files.
8bf3e86
@PieceMaker @Artyko
Add tests of dielectric algorithms.
dc82894
@PieceMaker @Artyko
Also test dielectric constant model methods.
5ddf09d
@PieceMaker @Artyko
Add tests for State class.
3723986
@PieceMaker @Artyko
The git runner wasn't installing pytest-mock.
aab57f6
@PieceMaker @Artyko
Switch from os module to path module.
aeef08a
@NimishVerma @Artyko
Added Substrate_example Jupyter-notebook
3425f64
@NimishVerma @Artyko
Updated Cell text, removed redundant headings
80b557c
@dalonsoa @Artyko
Update badges.
5ab2ed3
@mhrownaghi @Artyko
Add Type Annotation(config_tools.py)
d648c3c
@mhrownaghi @Artyko
Add Type Annotation(crystals.py)
c759b60
@mhrownaghi @Artyko
Add Type Annotation(interpolate.py)
68e14f0
@mhrownaghi @Artyko
Add Type Annotation(science_tracker.py)
d4dcf0d
@mhrownaghi @Artyko
Edit Type Annotation (config_tools.py)
b5c2086
@mhrownaghi @Artyko
Edit Type Annotation (interpolate.py)
bcec23a
@mhrownaghi @Artyko
Add Type Annotation (singleton.py)
fd07490
@mhrownaghi @Artyko
Add Type Annotation (smooth.py)
e1b2edf
@mhrownaghi @dalonsoa @Artyko
Update solcore/singleton.py
b5e89c4 
Co-Authored-By: Diego <d.alonso-alvarez@imperial.ac.uk>
@mhrownaghi @dalonsoa @Artyko
Update solcore/singleton.py
6a87ad5 
Co-Authored-By: Diego <d.alonso-alvarez@imperial.ac.uk>
@emmanuel-carreira @Artyko
Added Absorption_profile example notebook
004bbed 
Added Absorption_profile_AlGaAs_GaAs_structure example in jupyter notebook
@emmanuel-carreira @Artyko
Changed explanation text
2486de5 
Changed the explanation text to be in the same paragraph
@phoebe-p @Artyko
fix issue which was created by 33c6890 where the depletion approximat…
4345bf1 
…ion was (correctly) amended to multiply a relative permittivity by the vacuum permittivity. However, this broke some examples, which have now been amended (including in the documentation) but setting the relative_permittivity instead of the permittivity.
@Abelarm @Artyko
Configured pre-commit with nbstripout, added pre-commit to the requir…
b0b5ae5 
…ements.txt Issue:#46
@Artyko
Created the notebook for the example kp_fit_effective_masses.py
ac087ba
@federikovi @Artyko
add jupyter example
f8b8d85
@federikovi @Artyko
add examples
c2e37c7
@federikovi @Artyko
Delete Light_sources_example.ipynb
bc5adc2
@Artyko
Copy link
Contributor Author

Artyko commented Oct 14, 2019

Oops, apparently, I did not quite understand, what I did with force-pushed

dalonsoa
dalonsoa requested changes Oct 15, 2019
View reviewed changes
Copy link
Collaborator

@dalonsoa dalonsoa left a comment

Choose a reason for hiding this comment

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

Looks cool! Just a couple of changes. The forced pushed does not seems to have caused much trouble.

solcore/graphing/Custom_Colours.py Outdated Show resolved Hide resolved
solcore/graphing/Custom_Colours.py Outdated Show resolved Hide resolved
@Artyko Artyko changed the title Add type annotations to Custom_Colours.py Add type annotations to Custom_Colours.py & graph.py Oct 15, 2019
Artyko and others added 3 commits October 15, 2019 20:13
@Artyko @dalonsoa
Update solcore/graphing/Custom_Colours.py
52ed992 
Co-Authored-By: Diego <d.alonso-alvarez@imperial.ac.uk>
@Artyko @dalonsoa
fix Cycler class annotation
7359b63 
Co-Authored-By: Diego <d.alonso-alvarez@imperial.ac.uk>
@Artyko
Merge branch 'devel' into graphing_type_annotations
ed66080
@dalonsoa dalonsoa merged commit 46e2ef1 into qpv-research-group:devel Oct 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalonsoa dalonsoa dalonsoa 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.

None yet
9 participants
@Artyko @dalonsoa @PieceMaker @NimishVerma @mhrownaghi @emmanuel-carreira @phoebe-p @Abelarm @federikovi