Code

[Feature] Trial handling in Elephant#579

Code

Merged

Moritz-Alexander-Kern merged 94 commits intoNeuralEnsemble:masterNeuralEnsemble/elephant:masterfrom INM-6:feature/trial_classINM-6/elephant:feature/trial_classCopy head branch name to clipboardOct 31, 2023

+1,046-111

Commits

Commits on Jul 8, 2022

• basic structure,first test

  

  Moritz-Alexander-Kern

  committed
  f5d2952

  Copy full SHA for f5d2952

• get a single trial TrialsFromBlock

  

  Moritz-Alexander-Kern

  committed
  8d5427c

  Copy full SHA for 8d5427c

• implemented cut_trials method

  

  Moritz-Alexander-Kern

  committed
  67f9372

  Copy full SHA for 67f9372

• fix indents

  

  Moritz-Alexander-Kern

  committed
  f35c788

  Copy full SHA for f35c788

Commits on Jul 11, 2022

• add copyright

  

  Moritz-Alexander-Kern

  committed
  3ff9449

  Copy full SHA for 3ff9449

Commits on Aug 29, 2022

• remove 'cut_trials' method

  

  Moritz-Alexander-Kern

  committed
  456e001

  Copy full SHA for 456e001

• remove 'cut_trials' update docstring

  

  Moritz-Alexander-Kern

  committed
  91e4b8c

  Copy full SHA for 91e4b8c

• use dataset-1.nix from elephant-data

  

  Moritz-Alexander-Kern

  committed
  aa75e52

  Copy full SHA for aa75e52

• add n_trials and __get_item__ for TrialsFromLists class

  

  Moritz-Alexander-Kern

  committed
  be59631

  Copy full SHA for be59631

• clean up docstring

  

  Moritz-Alexander-Kern

  committed
  14277f3

  Copy full SHA for 14277f3

• added tests for TrialsFromLists

  

  Moritz-Alexander-Kern

  committed
  a1111ad

  Copy full SHA for a1111ad

• update descriptions

  

  Moritz-Alexander-Kern

  committed
  7979702

  Copy full SHA for 7979702

• get number of spiketrains and number of analogsignals

  

  Moritz-Alexander-Kern

  committed
  9b34bd9

  Copy full SHA for 9b34bd9

• add n_analogsignals and n_spiketrains for TrialsFromList

  

  Moritz-Alexander-Kern

  committed
  c284376

  Copy full SHA for c284376

Commits on Nov 18, 2022

• made Trials class abstract base class, added abstract methods

  

  Moritz-Alexander-Kern

  committed
  e74e252

  Copy full SHA for e74e252

• add some type hints

  

  Moritz-Alexander-Kern

  committed
  778bfe1

  Copy full SHA for 778bfe1

• remove unused quantities

  

  Moritz-Alexander-Kern

  committed
  dccd846

  Copy full SHA for dccd846

• reworked unittests

  

  Moritz-Alexander-Kern

  committed
  61df269

  Copy full SHA for 61df269

• generate test dataset for tests

  

  Moritz-Alexander-Kern

  committed
  e4de63f

  Copy full SHA for e4de63f

• ad type hints

  

  Moritz-Alexander-Kern

  committed
  146bdaf

  Copy full SHA for 146bdaf

• add docstrings

  

  Moritz-Alexander-Kern

  committed
  500f05f

  Copy full SHA for 500f05f

• set default for description

  

  Moritz-Alexander-Kern

  committed
  64d909d

  Copy full SHA for 64d909d

• refactor time_histogram

  

  Moritz-Alexander-Kern

  committed
  3d1369d

  Copy full SHA for 3d1369d

• add comments

  

  Moritz-Alexander-Kern

  committed
  41f32d1

  Copy full SHA for 41f32d1

• update type hints

  

  Moritz-Alexander-Kern

  committed
  f87c35e

  Copy full SHA for f87c35e

Commits on Nov 24, 2022

• implement decorator over_trials as a draft

  

  Moritz-Alexander-Kern

  committed
  5f9b8ef

  Copy full SHA for 5f9b8ef

• changed decorator naming

  

  Moritz-Alexander-Kern

  committed
  2f731ee

  Copy full SHA for 2f731ee

• pep8

  

  Moritz-Alexander-Kern

  committed
  577481c

  Copy full SHA for 577481c

• use functools wraps decorator

  

  Moritz-Alexander-Kern

  committed
  a102052

  Copy full SHA for a102052

Commits on Feb 1, 2023

• some refactoring

  

  Moritz-Alexander-Kern

  committed
  f43a54b

  Copy full SHA for f43a54b

• removed decorator, added get_spiketrains_list_from_trial method

  

  Moritz-Alexander-Kern

  committed
  b808f28

  Copy full SHA for b808f28

• remove longer needed imports

  

  Moritz-Alexander-Kern

  committed
  9ca362e

  Copy full SHA for 9ca362e

• add some docstrings

  

  Moritz-Alexander-Kern

  committed
  f82f70a

  Copy full SHA for f82f70a

Commits on Feb 2, 2023

• add some docstrings

  

  Moritz-Alexander-Kern

  committed
  df57727

  Copy full SHA for df57727

• correct docstring

  

  Moritz-Alexander-Kern

  committed
  e2fe35c

  Copy full SHA for e2fe35c

• changed docstrings

  

  Moritz-Alexander-Kern

  committed
  05e6957

  Copy full SHA for 05e6957

Commits on May 3, 2023

• Merge branch 'master' into feature/trial_class

  Show description for fe8b9e8
  

  Moritz-Alexander-Kern

  committed
  fe8b9e8

  Copy full SHA for fe8b9e8

• add trials to init

  

  Moritz-Alexander-Kern

  committed
  8518b56

  Copy full SHA for 8518b56

• add get number of spiketrains or analog signals trial by trial

  

  Moritz-Alexander-Kern

  committed
  5ee9402

  Copy full SHA for 5ee9402

• add get number of spiketrains or analog signals trial by trial tests

  

  Moritz-Alexander-Kern

  committed
  4be82a7

  Copy full SHA for 4be82a7

• add get_spiketrains_from_trial_as_list

  

  Moritz-Alexander-Kern

  committed
  61a87ea

  Copy full SHA for 61a87ea

• add get_analogsignals_from_trial_as_list

  

  Moritz-Alexander-Kern

  committed
  c5a2c01

  Copy full SHA for c5a2c01

• add get_trial, get_trials, get_trials_as_list

  

  Moritz-Alexander-Kern

  committed
  be111f2

  Copy full SHA for be111f2

• add get_spiketrains_from_trial

  

  Moritz-Alexander-Kern

  committed
  706fc19

  Copy full SHA for 706fc19

• small corrections

  

  Moritz-Alexander-Kern

  committed
  d764063

  Copy full SHA for d764063

Commits on May 5, 2023

• added set_common_trial_start and stop methods

  

  Moritz-Alexander-Kern

  committed
  7ae0a7c

  Copy full SHA for 7ae0a7c

• added get_spiketrains_from_trial_as_segment

  

  Moritz-Alexander-Kern

  committed
  46230b1

  Copy full SHA for 46230b1

Commits on Jun 28, 2023

• add trial handling to statistics.instantaneous_rate

  

  Moritz-Alexander-Kern

  committed
  3079b46

  Copy full SHA for 3079b46

Commits on Jul 5, 2023

• implemented cross trial functionality

  

  Moritz-Alexander-Kern

  committed
  2af8fcb

  Copy full SHA for 2af8fcb

Commits on Jul 9, 2023

• implemented cross spiketrain functionality

  

  Moritz-Alexander-Kern

  committed
  f1d1603

  Copy full SHA for f1d1603

• pep8 cleanup

  

  Moritz-Alexander-Kern

  committed
  3dcddab

  Copy full SHA for 3dcddab

Commits on Jul 11, 2023

• fix pep8

  

  Moritz-Alexander-Kern

  committed
  12fc153

  Copy full SHA for 12fc153

Commits on Jul 13, 2023

• code cleanup

  

  Moritz-Alexander-Kern

  committed
  17d2646

  Copy full SHA for 17d2646

• fix pep8

  

  Moritz-Alexander-Kern

  committed
  830e355

  Copy full SHA for 830e355

• fix pep8

  

  Moritz-Alexander-Kern

  committed
  f02f603

  Copy full SHA for f02f603

• fix doctest time_histogram

  

  Moritz-Alexander-Kern

  committed
  656e8cd

  Copy full SHA for 656e8cd

Commits on Jul 17, 2023

• rename kwarg cross_spiketrains and cross_trial to pool_spiketrains and pool_trials

  

  Moritz-Alexander-Kern

  committed
  6b91fac

  Copy full SHA for 6b91fac

Commits on Sep 12, 2023

• add trials module to documentation

  

  Moritz-Alexander-Kern

  committed
  231063e

  Copy full SHA for 231063e

• fix docstyle issues

  

  Moritz-Alexander-Kern

  committed
  2c3c9bd

  Copy full SHA for 2c3c9bd

Commits on Oct 30, 2023

• refactor pool_spiketrains to pool_spike_trains

  

  Moritz-Alexander-Kern

  committed
  5f66b07

  Copy full SHA for 5f66b07

• reformat docstring, parameter spiketrains into one line

  

  Moritz-Alexander-Kern

  committed
  50b637f

  Copy full SHA for 50b637f

• update description for parameter spiketrains

  

  Moritz-Alexander-Kern

  committed
  be1c2b1

  Copy full SHA for be1c2b1

• fixed grammatical error in pool trials description

  

  Moritz-Alexander-Kern

  committed
  56f3b0d

  Copy full SHA for 56f3b0d

• added description to pool_trials parameter

  

  Moritz-Alexander-Kern

  committed
  99d3185

  Copy full SHA for 99d3185

• added description to pool_spike_trains parameter

  

  Moritz-Alexander-Kern

  committed
  da53555

  Copy full SHA for da53555

• refactor list_of_spiketrains to spiketrains

  

  Moritz-Alexander-Kern

  committed
  82ded84

  Copy full SHA for 82ded84

• rename "Alternative Data Representations" to "Data Representations", move the docs for trials into this category.

  

  Moritz-Alexander-Kern

  committed
  558d140

  Copy full SHA for 558d140

• refactor get_trials to get_trials_as_block

  

  Moritz-Alexander-Kern

  committed
  8378569

  Copy full SHA for 8378569

• refactor get_trial to get_trial_as_segment

  

  Moritz-Alexander-Kern

  committed
  1ae48e4

  Copy full SHA for 1ae48e4

• change return of get_spiketrains_from_trial_as_list to neo SpikeTrainList

  

  Moritz-Alexander-Kern

  committed
  5b40d92

  Copy full SHA for 5b40d92

• implemented get_analogsignals_from_trial_as_segment method for TrialObject

  

  Moritz-Alexander-Kern

  committed
  1c95558

  Copy full SHA for 1c95558

• pep8

  

  Moritz-Alexander-Kern

  committed
  48d9e9d

  Copy full SHA for 48d9e9d

• fix: get_trials_xxx -> Default: Return all trials

  

  Moritz-Alexander-Kern

  committed
  fbd6f63

  Copy full SHA for fbd6f63

• fix: instantaneous_rate for trial object and pool_trials = True, pool_spike_trains = False returns one analog signal

  

  Moritz-Alexander-Kern

  committed
  cf1bf54

  Copy full SHA for cf1bf54

• sort inputs in __init__

  

  Moritz-Alexander-Kern

  committed
  536bf91

  Copy full SHA for 536bf91

• fix SpikeTrainList

  

  Moritz-Alexander-Kern

  committed
  02b741a

  Copy full SHA for 02b741a

• Added more elaborate doc string to trials module.

  mdenker

  committed
  7ceffa6

  Copy full SHA for 7ceffa6

• Merge remote-tracking branch 'origin/feature/trial_class' into feature/trial_class

  mdenker

  committed
  1de2ba7

  Copy full SHA for 1de2ba7

• Merge remote-tracking branch 'origin/feature/trial_class' into feature/trial_class

  

  Moritz-Alexander-Kern

  committed
  66306c2

  Copy full SHA for 66306c2

• fix: get_spiketrains_from_trial_as_list method from the TrialsFromLists class returns a neo SpikeTrainList

  

  Moritz-Alexander-Kern

  committed
  9489bb0

  Copy full SHA for 9489bb0

• add pool_spike_trains functionality for list of spiketrains and SpikeTrainList

  

  Moritz-Alexander-Kern

  committed
  137b2d6

  Copy full SHA for 137b2d6

• Doc string work and rename trial number -> trial id.

  mdenker

  committed
  9b0c943

  Copy full SHA for 9b0c943

• fix pep8

  

  Moritz-Alexander-Kern

  committed
  f4fc5a6

  Copy full SHA for f4fc5a6

• Doc string work and rename trial number -> trial id.

  mdenker

  committed
  b728123

  Copy full SHA for b728123

• Remove unnecessary docstring part.

  mdenker

  committed
  c77c518

  Copy full SHA for c77c518

• Merge remote-tracking branch 'origin/feature/trial_class' into feature/trial_class

  Show description for 98531a9
  

  Moritz-Alexander-Kern

  committed
  98531a9

  Copy full SHA for 98531a9

• Merge remote-tracking branch 'origin/feature/trial_class' into feature/trial_class

  

  Moritz-Alexander-Kern

  committed
  e20819f

  Copy full SHA for e20819f

• use setup class for unit tests

  

  Moritz-Alexander-Kern

  committed
  8fc63da

  Copy full SHA for 8fc63da

• Merge branch 'master' into feature/trial_class

  

  Moritz-Alexander-Kern

  committed
  3e521c6

  Copy full SHA for 3e521c6

Commits on Oct 31, 2023

• Removed unnecessary method, smaller doc fixes and dangerous parameter defaults

  mdenker

  committed
  a55e2e3

  Copy full SHA for a55e2e3

• add unit test to test behavior for lists

  

  Moritz-Alexander-Kern

  committed
  878c164

  Copy full SHA for 878c164

• Merge remote-tracking branch 'origin/feature/trial_class' into feature/trial_class

  

  Moritz-Alexander-Kern

  committed
  77ded22

  Copy full SHA for 77ded22

• return AnalogSignal, not list of AnalogSignals for pool_trials=True and pool_spike_trains=True

  

  Moritz-Alexander-Kern

  committed
  8f758fe

  Copy full SHA for 8f758fe

• fixed: return AnalogSignal with transposed dimensions for pool_trials=True and pool_spike_trains=False

  

  Moritz-Alexander-Kern

  committed
  447998a

  Copy full SHA for 447998a