Skip to content

Commit

Permalink
Merge branch 'release/0.9.1'
Browse files Browse the repository at this point in the history
Adds PLS and concurrent regression.
  • Loading branch information
vnmabus committed Feb 26, 2024
2 parents 114c934 + 8e6727a commit 41c3971
Show file tree
Hide file tree
Showing 55 changed files with 3,718 additions and 554 deletions.
33 changes: 0 additions & 33 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

91 changes: 91 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Bug report
description: Create a report to help us reproduce and fix a bug
labels: [bug]

body:
- type: markdown
attributes:
value: >
#### Please check that the bug has not been previously notified before submitting, by searching through the [issues list](https://github.com/GAA-UAM/scikit-fda/issues).
- type: textarea
attributes:
label: Bug description summary
description: >
Please describe the bug in a brief paragraph(s). Be clear and concise.
validations:
required: true
- type: textarea
attributes:
label: Code to reproduce the bug
description: |
Please add a minimal code example that can reproduce the error. This will be automatically converted to a Python block.
placeholder: |
from skfda.datasets import fetch_growth
X, y = fetch_growth(return_X_y=True)
X^y
render: Python
- type: textarea
attributes:
label: Expected result
description: >
Paste or describe the result that you expected here.
validations:
required: true
- type: textarea
attributes:
label: Actual result
description: >
Paste or describe the result that you obtained here. If the code raises an error, you can past it in the next field.
validations:
required: true
- type: textarea
attributes:
label: Traceback (if an exception is raised)
description: |
If an exception is raised, copy and paste the traceback here.
placeholder: |
TypeError Traceback (most recent call last)
Cell In[5], line 1
----> 1 X ^y
File .../skfda/representation/grid.py:1393, in FDataGrid.__array_ufunc__(self, ufunc, method, *inputs, **kwargs)
1390 else:
1391 new_outputs = (None,) * ufunc.nout
-> 1393 results = getattr(ufunc, method)(*new_inputs, **kwargs)
1394 if results is NotImplemented:
1395 return NotImplemented
TypeError: ufunc 'bitwise_xor' not supported for the input types, and the inputs could not be safely coerced to any supported types according to the casting rule ''safe''
In [6]: X^y
---------------------------------------------------------------------------
TypeError Traceback (most recent call last)
Cell In[6], line 1
----> 1 X^y
File .../skfda/representation/grid.py:1393, in FDataGrid.__array_ufunc__(self, ufunc, method, *inputs, **kwargs)
1390 else:
1391 new_outputs = (None,) * ufunc.nout
-> 1393 results = getattr(ufunc, method)(*new_inputs, **kwargs)
1394 if results is NotImplemented:
1395 return NotImplemented
TypeError: ufunc 'bitwise_xor' not supported for the input types, and the inputs could not be safely coerced to any supported types according to the casting rule ''safe''
render: Python
- type: textarea
attributes:
label: Software versions
description: >
Include the version of the library used (obtained with `skfda.__version__`). If relevant, you can include here the OS version and versions of related software.
placeholder: |
scikit-fda version: 0.9
OS: Windows 10
validations:
required: true
- type: textarea
attributes:
label: Additional context
description: >
Add any other context about the problem here.
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Feature request
description: Suggest an idea for this project
labels: [enhancement]

body:
- type: markdown
attributes:
value: >
#### Please check that this idea has not been proposed previously, by searching through the [issues list](https://github.com/GAA-UAM/scikit-fda/issues).
- type: textarea
attributes:
label: Motivation
description: >
A clear and concise description of what the problem is. Ex. I am always frustrated when [...]
validations:
required: true
- type: textarea
attributes:
label: Desired functionality
description: >
A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Alternatives
description: >
A clear and concise description of any alternative solutions or features you have considered.
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: >
Add any other context about the problem here.
31 changes: 31 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!--
Thanks for your contribution! Please ensure you have taken a look at
the contribution guidelines:
https://github.com/GAA-UAM/scikit-fda/blob/develop/CONTRIBUTING.md
-->

## References to issues or other PRs
<!--
Include links to the relevant issues and PRs, using the relevant Github
keywords (e.g., Fixes) for closing automatically the issues resolved
on merge (see https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
If there is no current issue discussing the addition of this functionality, it
is recommended to create one and discuss the feature there.
Otherwise, it is possible for this functionality to be rejected, or to require
considerable changes.
Example: Fixes #42. See also #123.
-->


## Describe the proposed changes


## Additional information


## Checklist before requesting a review

- [ ] I have performed a self-review of my code
- [ ] The code conforms to the style used in this package
- [ ] The code is fully documented and typed (type-checked with [Mypy](https://mypy-lang.org/))
- [ ] I have added thorough tests for the new/changed functionality
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9']
python-version: ['3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Run tests
run: |
pip3 debug --verbose .
pip3 install numba
pip3 install mkl-devel
pip3 install ".[test]"
pytest --cov=skfda/ --cov-report=xml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,4 @@ pip-wheel-metadata/
.DS_Store
.gitignore
.vscode
.ruff_cache
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
vnmabus@gmail.com.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
27 changes: 27 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# How to contribute

Thank you for considering contributing to scikit-fda! You can contribute to rdata in several ways.

## Opening issues

Open a new issue if you find some bug or you want to propose a new feature. Please first check that nobody has asked that already!

Make sure that your proposal is clearly written, preferably in English. In case you are reporting a bug, please include all relevant information, such as the software version and machine information.

## Discussing the project

You can open a discussion for any topic related with this package. Do you have doubts about how to use the package? Open a discussion! Do you want to show related projects, recent research or some use case for this software? Open a discussion!

You are also encouraged to answer the discussions of other users and participate actively in the discussions forum.

## Improving the documentation

Do you feel that the documentation could be more clear? Did you found a typo? You can easily edit the documentation and make a pull request clicking the "Edit this page" link in the documentation.

Advanced users can also propose the addition of new pages and examples. In case you want to do that, please open an issue to discuss that first.

## Contributing software

You can improve this package by adding new functionality, solving pending bugs or implementing accepted feature requests. Please discuss that first to ensure that it will be accepted and to assign that to you and prevent duplicated efforts.

In any case, make sure that you own the rights to the software and are ok with releasing it under a BSD 3-Clause license.

0 comments on commit 41c3971

Please sign in to comment.