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

Mixed effects model to convert irregular data to basis expansion #618

Open
wants to merge 62 commits into
base: develop
Choose a base branch
from
Open

Mixed effects model to convert irregular data to basis expansion #618

wants to merge 62 commits into from

Commits on Mar 4, 2024

  1. minimize converter

    @pcuestas
    pcuestas committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    239bfd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Change 'conversion' module to 'representation' and reorganize interna… 

    …l params classes
    @pcuestas
    pcuestas committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    4b917ec View commit details
    Browse the repository at this point in the history

  2. WIP: include EM converter

    @pcuestas
    pcuestas committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    9d2a2d4 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Add EM converter

    @pcuestas
    pcuestas committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    c28f4bf View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Naming and comments

    @pcuestas
    pcuestas committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    21c7f17 View commit details
    Browse the repository at this point in the history

  2. Fix docstring

    @pcuestas
    pcuestas committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    5166b5c View commit details
    Browse the repository at this point in the history

  3. Comment and remove unused import

    @pcuestas
    pcuestas committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    2b7fd7c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Merge branch 'develop' into feature/irregular_to_basis_mixed_effects_… 

    …method
    @pcuestas
    pcuestas committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    2a63e9b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Remove space and adapt FDataIrregular.integrate to correctly override… 

    … FData.integrate
    @pcuestas
    pcuestas committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    ddadefc View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Update signature of FDataIrregular.cov to match superclass'

    @pcuestas
    pcuestas committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    9f17ff3 View commit details
    Browse the repository at this point in the history

  2. Add FDataIrregular to skfda like FDataBasis and FDataGrid

    @pcuestas
    pcuestas committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    9730d51 View commit details
    Browse the repository at this point in the history

  3. Implement scores for FDatairregular objects as described in #609 

    (testing included to assert equality with the `FDataGrid` case)
    @pcuestas
    pcuestas committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    951dea3 View commit details
    Browse the repository at this point in the history

  4. Fix ugly comment

    @pcuestas
    pcuestas committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    30c807f View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Merge branch 'develop' into feature/scoring-fdatairregular

    @vnmabus
    vnmabus committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    a5b7617 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. conversion documentation

    @pcuestas
    pcuestas committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    30e11ce View commit details
    Browse the repository at this point in the history

  2. Rename classes to make them public and add FDataIrregular.to_basis … 

    …method
    @pcuestas
    pcuestas committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    d3b26b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Fix tests

    @pcuestas
    pcuestas committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e18bc49 View commit details
    Browse the repository at this point in the history

  2. Remove global variables from tests

    @pcuestas
    pcuestas committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    5d3addc View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Replace Union and Optional

    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    e91419d View commit details
    Browse the repository at this point in the history

  2. Fix imports

    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    313a001 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/scoring-fdatairregular' into feature/irregular_… 

    …to_basis_mixed_effects_method
    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    8b0a972 View commit details
    Browse the repository at this point in the history

  4. Fix possible division by zero

    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    4bd8713 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/scoring-fdatairregular' into feature/irregular_… 

    …to_basis_mixed_effects_method
    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    bb5e1cb View commit details
    Browse the repository at this point in the history

  6. irregularly sample FData objects

    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    0bb641b View commit details
    Browse the repository at this point in the history

  7. Examples

    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    2030dd3 View commit details
    Browse the repository at this point in the history

  8. Fix irregular datasets slicing and add fetch_bone_density to document… 

    …ation
    @pcuestas
    pcuestas committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    36a8092 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. examples

    @pcuestas
    pcuestas committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2fa07cd View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. irregular_sample can receive an fdatairreuglar and a list of n_points… 

    …_per_curve
    @pcuestas
    pcuestas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    10ed91f View commit details
    Browse the repository at this point in the history

  2. example removing points from fdatairregular

    @pcuestas
    pcuestas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    7104d2a View commit details
    Browse the repository at this point in the history

  3. irregular to basis doctest example with plot

    @pcuestas
    pcuestas committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    5f58016 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. update examples

    @pcuestas
    pcuestas committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    2eff88e View commit details
    Browse the repository at this point in the history

  2. jupyter plot for to_basis

    @pcuestas
    pcuestas committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1fac99e View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. update converters

    @pcuestas
    pcuestas committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c23064d View commit details
    Browse the repository at this point in the history

  2. remove commented code from tests

    @pcuestas
    pcuestas committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f3663d8 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. design of mixed effects converters and bib references

    @pcuestas
    pcuestas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e90eac7 View commit details
    Browse the repository at this point in the history

  2. comments and remove unnecessary test

    @pcuestas
    pcuestas committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c5bd7a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. example

    @pcuestas
    pcuestas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    a9c2ee4 View commit details
    Browse the repository at this point in the history

  2. .

    @pcuestas
    pcuestas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    de2cf1e View commit details
    Browse the repository at this point in the history

  3. fix previous commit which was a mistake

    @pcuestas
    pcuestas committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    abb53aa View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Merge branch 'fix/fdatairregular_getitem' into feature/irregular_to_b… 

    …asis_mixed_effects_method
    @pcuestas
    pcuestas committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    5cb6dbb View commit details
    Browse the repository at this point in the history

  2. simple conversion with real data too in example/tutorial

    @pcuestas
    pcuestas committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    702d47a View commit details
    Browse the repository at this point in the history

  3. remove extra comment line

    @pcuestas
    pcuestas committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    e2a4466 View commit details
    Browse the repository at this point in the history

  4. isort

    @pcuestas
    pcuestas committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    e6f00da View commit details
    Browse the repository at this point in the history

  5. wip example of decimation

    @pcuestas
    pcuestas committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    ba34522 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. decimation example

    @pcuestas
    pcuestas committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    31d69f2 View commit details
    Browse the repository at this point in the history

  2. decimation example

    @pcuestas
    pcuestas committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    6c5e622 View commit details
    Browse the repository at this point in the history

  3. decimation example

    @pcuestas
    pcuestas committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    16c513a View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. remove extra example

    @pcuestas
    pcuestas committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9e1a566 View commit details
    Browse the repository at this point in the history

  2. adapting mixed effects for higher dimensions

    @pcuestas
    pcuestas committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    509acd4 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. isort

    @pcuestas
    pcuestas committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    9e4a612 View commit details
    Browse the repository at this point in the history

  2. test sample_irregular

    @pcuestas
    pcuestas committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    f442a58 View commit details
    Browse the repository at this point in the history

  3. irregular_sample for multidimensional datasets (domain and codomain)

    @pcuestas
    pcuestas committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    84e92d0 View commit details
    Browse the repository at this point in the history

  4. comment and clean the tests for irregular_sample

    @pcuestas
    pcuestas committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    704d254 View commit details
    Browse the repository at this point in the history

  5. Tests for the multidimensional case (_mixed_effects)

    @pcuestas
    pcuestas committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    c4151e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. documentation and review

    @pcuestas
    pcuestas committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4073501 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. simplify test for mixed_effets so that it runs faster

    @pcuestas
    pcuestas committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    0b9d37f View commit details
    Browse the repository at this point in the history

  2. documentation and small changes

    @pcuestas
    pcuestas committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    523a9ea View commit details
    Browse the repository at this point in the history

  3. change order of examples in documentation

    @pcuestas
    pcuestas committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    20bd812 View commit details
    Browse the repository at this point in the history

  4. remove file that should not have been commited

    @pcuestas
    pcuestas committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6ad8998 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. Merge branch 'develop' into feature/irregular_to_basis_mixed_effects_… 

    …method
    @pcuestas
    pcuestas committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    6ab190d View commit details
    Browse the repository at this point in the history

  2. Make example more visually interesting

    @pcuestas
    pcuestas committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    1d696e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge branch 'develop' into feature/irregular_to_basis_mixed_effects_… 

    …method
    @vnmabus
    vnmabus committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    9e591d0 View commit details
    Browse the repository at this point in the history