Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: medusabci/medusa-kernel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.3
Choose a base ref
...
head repository: medusabci/medusa-kernel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
5 contributors

Commits on Nov 21, 2023

  1. Minor fix art rejection

    @vicmarcag
    vicmarcag committed Nov 21, 2023
    Copy the full SHA
    aa76354 View commit details

Commits on Nov 22, 2023

  1. Minor changes

    @esantamariavazquez
    esantamariavazquez committed Nov 22, 2023
    Copy the full SHA
    196a5a2 View commit details

  2. Merge remote-tracking branch 'origin/developers' into developers 

    # Conflicts:
#	medusa/bci/cvep_spellers.py
    @esantamariavazquez
    esantamariavazquez committed Nov 22, 2023
    Copy the full SHA
    6e1964e View commit details

Commits on Nov 26, 2023

  1. Changed next patch version

    @esantamariavazquez
    esantamariavazquez committed Nov 26, 2023
    Copy the full SHA
    03e206f View commit details

  2. Merge pull request #24 from medusabci/developers 

    Developers
    @esantamariavazquez
    esantamariavazquez authored Nov 26, 2023
    Copy the full SHA
    212fad4 View commit details

Commits on Nov 29, 2023

  1. Minor fixes to allow channel sets without coordinates for c-vep models

    @esantamariavazquez
    esantamariavazquez committed Nov 29, 2023
    Copy the full SHA
    562f8e6 View commit details

  2. Changed patch version

    @esantamariavazquez
    esantamariavazquez committed Nov 29, 2023
    Copy the full SHA
    a61bcf9 View commit details

  3. Merge pull request #26 from medusabci/developers 

    Merge for patch update
    @esantamariavazquez
    esantamariavazquez authored Nov 29, 2023
    Copy the full SHA
    8a6db17 View commit details

Commits on Nov 30, 2023

  1. Recovering changes deleted by Eduardo

    @vicmarcag
    vicmarcag committed Nov 30, 2023
    Copy the full SHA
    e6180eb View commit details

  2. Minor fix in early stopping

    @vicmarcag
    vicmarcag committed Nov 30, 2023
    Copy the full SHA
    b3a43d2 View commit details

Commits on Dec 4, 2023

  1. CVEP now takes a larger epoch to avoid border effects

    @vicmarcag
    vicmarcag committed Dec 4, 2023
    Copy the full SHA
    aeca639 View commit details

Commits on Dec 15, 2023

  1. nondefinitive merge of cvep_spellers

    @vicmarcag
    vicmarcag committed Dec 15, 2023
    Copy the full SHA
    3909158 View commit details

Commits on Jan 5, 2024

  1. Fixed bug in time_plot

    @dmarcos97
    dmarcos97 committed Jan 5, 2024
    Copy the full SHA
    b28a166 View commit details

  2. Minor correction in timeplot

    @esantamariavazquez
    esantamariavazquez committed Jan 5, 2024
    Copy the full SHA
    868afdb View commit details

  3. Minor fixes

    @esantamariavazquez
    esantamariavazquez committed Jan 5, 2024
    Copy the full SHA
    8fe7540 View commit details

Commits on Jan 13, 2024

  1. Minor improvement in the docs

    @esantamariavazquez
    esantamariavazquez committed Jan 13, 2024
    Copy the full SHA
    9079d30 View commit details

  2. Minor fix to support different versions of pyqt/pyside in timeplot

    @esantamariavazquez
    esantamariavazquez committed Jan 13, 2024
    Copy the full SHA
    6219f98 View commit details

  3. Deleted deprecated module

    @esantamariavazquez
    esantamariavazquez committed Jan 13, 2024
    Copy the full SHA
    b83baa0 View commit details

  4. Version updated

    @esantamariavazquez
    esantamariavazquez committed Jan 13, 2024
    Copy the full SHA
    67e9f28 View commit details

  5. Merge pull request #27 from medusabci/developers 

    Merge developers
    @esantamariavazquez
    esantamariavazquez authored Jan 13, 2024
    Copy the full SHA
    ef057ed View commit details

Commits on Jul 10, 2024

  1. Resolved an issue with error communication between processes. Previou… 

    …sly, errors were communicated with both a message and error data, but the receiving class was only expecting the error. This discrepancy has been fixed to ensure proper error handling and processing.
    @Serpeve
    Serpeve committed Jul 10, 2024
    Copy the full SHA
    ca82f95 View commit details

  2. Merge pull request #28 from medusabci/solve_errors_tensorflow_integra… 

    …tion

Fix error communication in multiprocessing on tensorflow_integration
    @esantamariavazquez
    esantamariavazquez authored Jul 10, 2024
    Copy the full SHA
    868b625 View commit details

  3. Solved minor issue in string of msg for TFExtrasNotInstalled from ten… 

    …sorflow_integration.py

Added version 1.3.1 to setup.py string
    @Serpeve
    Serpeve committed Jul 10, 2024
    Copy the full SHA
    13c0a1a View commit details

  4. Adapted EEGSym model inside deep_learning_models.py and its usage on … 

    …mi_paradigms.py to be consistent with new structure of all classes of mi_paradigms.py.
    @Serpeve
    Serpeve committed Jul 10, 2024
    Copy the full SHA
    b1b63aa View commit details

Commits on Jul 11, 2024

  1. Merge pull request #29 from medusabci/solve_errors_tensorflow_integra… 

    …tion

Solved minor issue in string of msg for TFExtrasNotInstalled from tensorflow_integration.py
    @esantamariavazquez
    esantamariavazquez authored Jul 11, 2024
    Copy the full SHA
    00112a7 View commit details

Commits on Oct 24, 2024

  1. Updated neurofeedback data

    @vicmarcag
    vicmarcag committed Oct 24, 2024
    Copy the full SHA
    945a529 View commit details

  2. Minor fix

    @vicmarcag
    vicmarcag committed Oct 24, 2024
    Copy the full SHA
    324ad87 View commit details
Showing with 1,119 additions and 109 deletions.
  1. +860 −21 medusa/bci/cvep_spellers.py
  2. +0 −1 medusa/bci/erp_spellers.py
  3. +152 −42 medusa/bci/mi_paradigms.py
  4. +5 −1 medusa/bci/nft_paradigms.py
  5. +68 −26 medusa/deep_learning_models.py
  6. +10 −5 medusa/plots/timeplot.py
  7. +2 −0 medusa/spatial_filtering.py
  8. +21 −12 medusa/tensorflow_integration.py
  9. +1 −1 setup.py
Loading